Merge pull request #676 from OpenHD/consti-dev

Audio fixes and more
OpenHD · Mar 20, 2024 · 3b462eb · 3b462eb
2 parents 8bf300c + a1e1290
commit 3b462eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/qml/ui/HUDOverlayGrid.qml b/qml/ui/HUDOverlayGrid.qml
@@ -283,6 +283,7 @@ Item {
             onClicked: {
                 sidebar.notify_sidebar_user_clicked_outside();
             }
+            enabled: sidebar.visible
         }
 
         // By default on top row

diff --git a/qml/ui/sidebar/MavlinkChoiceElement2.qml b/qml/ui/sidebar/MavlinkChoiceElement2.qml
@@ -189,6 +189,16 @@ BaseJoyEditElement2{
 
     function user_selected_value(value_new){
         // A few need to be handled specially
+         if(m_param_id==mPARAM_ID_FREQUENCY){
+            if(_fcMavlinkSystem.armed){
+                if(settings.dev_allow_freq_change_when_armed){
+                    // okay
+                }else{
+                    _qopenhd.show_toast("ARMED, change not possible");
+                    return;
+                }
+            }
+        }
         if(m_param_id==mPARAM_ID_FREQUENCY){
             const new_frequency=value_new;
             _qopenhd.set_busy_for_milliseconds(2000,"CHANGING FREQUENCY");