remove 40

Author: raphaelscholle

qml/ui/configpopup/openhd_settings/MavlinkParamEditor.qml

@@ -164,13 +164,18 @@ Rectangle{
                 const values=instanceMavlinkSettingsModel.int_param_get_enum_values(parameterId);
                 intEnumDynamicListModel.clear()
                 var currently_selected_index=-1;
+                var list_index=-1;
                 for (var i = 0; i < keys.length; i++) {
                     var key=keys[i];
                     var value=values[i];
+                    if(parameterId==="WB_CHANNEL_W" && !settings.dev_allow_40mhz && value===40){
+                        continue;
+                    }
                     //console.log(key,value);
                     intEnumDynamicListModel.append({title: key, value: value})
+                    list_index=intEnumDynamicListModel.count-1
                     if(value===paramValueInt){
-                        currently_selected_index=i;
+                        currently_selected_index=list_index;
                     }
                 }
                 if(currently_selected_index==-1){
@@ -430,14 +435,18 @@ Rectangle{
                     var res="";
                     if(paramValueType==0){
                         var value_int;
-                        if(intEnumDynamicComboBox.visible){
-                            value_int=intEnumDynamicListModel.get(intEnumDynamicComboBox.currentIndex).value
-                        }else{
-                            value_int=spinBoxInputParamtypeInt.value
-                        }
-                        //var value_int_as_string=spinBoxInputParamtypeInt.text
-                        //var value_int = parseInt(value_int_as_string)
-                        //console.log("UI set int:{"+value_int_as_string+"}={"+value_int+"}")
+                    if(intEnumDynamicComboBox.visible){
+                        value_int=intEnumDynamicListModel.get(intEnumDynamicComboBox.currentIndex).value
+                    }else{
+                        value_int=spinBoxInputParamtypeInt.value
+                    }
+                    if(parameterId==="WB_CHANNEL_W" && value_int===40 && !settings.dev_allow_40mhz){
+                        _qopenhd.show_toast(qsTr("40 MHz is disabled (enable in Advanced Settings)"),true);
+                        return;
+                    }
+                    //var value_int_as_string=spinBoxInputParamtypeInt.text
+                    //var value_int = parseInt(value_int_as_string)
+                    //console.log("UI set int:{"+value_int_as_string+"}={"+value_int+"}")
                         console.log("UI set int:{"+value_int+"}")
                         //res=instanceMavlinkSettingsModel.try_update_parameter_int(parameterId,value_int)
                         instanceMavlinkSettingsModel.try_set_param_int_async(parameterId,value_int,true);

qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml

@@ -178,7 +178,9 @@ PopupBigGeneric{
                         frequencies_to_analyze=_frequencyHelper.get_frequencies(1);
                     }else{
                         frequencies_to_analyze=_frequencyHelper.get_frequencies(2);
-                        frequencies_to_analyze=_frequencyHelper.filter_frequencies_40mhz_ht40plus_only(frequencies_to_analyze);
+                        if(settings.dev_allow_40mhz){
+                            frequencies_to_analyze=_frequencyHelper.filter_frequencies_40mhz_ht40plus_only(frequencies_to_analyze);
+                        }
                     }
                     var categories = _pollutionHelper.pollution_frequencies_int_to_qstringlist(frequencies_to_analyze);
                     var values = _pollutionHelper.pollution_frequencies_int_get_pollution(frequencies_to_analyze,m_normalize_data);

qml/ui/configpopup/openhd_settings/PopupScanChannels.qml

@@ -61,7 +61,7 @@ PopupBigGeneric{
                 enabled: _ohdSystemGround.is_alive && _ohdSystemGround.wb_gnd_operating_mode==0
                 onClicked: {
                     var how_many_freq_bands=comboBoxWhichFrequencyToScan.currentIndex
-                    var how_many_bandwidths = 2;
+                    var how_many_bandwidths = settings.dev_allow_40mhz ? 2 : 1;
                     console.log("Initate channel scan "+how_many_freq_bands+","+how_many_bandwidths)
                     var result = _wbLinkSettingsHelper.start_scan_channels(how_many_freq_bands,how_many_bandwidths)
                     if(result){

qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml

@@ -70,6 +70,19 @@ ScrollView {
                     onCheckedChanged: settings.dev_show_5180mhz_lowband = checked
                 }
             }
+            SettingBaseElement{
+                m_short_description: qsTr("Allow 40 MHz channel width")
+                Switch {
+                    width: 32
+                    height: elementHeight
+                    anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
+
+                    anchors.right: parent.right
+                    anchors.verticalCenter: parent.verticalCenter
+                    checked: settings.dev_allow_40mhz
+                    onCheckedChanged: settings.dev_allow_40mhz = checked
+                }
+            }
             SettingBaseElement{
                 m_short_description: qsTr("Disable auto fetch")
                 Switch {

qml/ui/elements/AppSettings.qml

@@ -93,6 +93,7 @@ Settings {
     property bool dev_show_advanced_button: false
     property bool dev_allow_freq_change_when_armed: false
     property bool dev_show_5180mhz_lowband: false
+    property bool dev_allow_40mhz: false
     property bool dev_disable_autofetch: false
     // WARNING END
     //WARNING: THIS makes the RC panel visible

qml/ui/sidebar/MappedMavlinkChoices.qml

@@ -176,6 +176,11 @@ Item {
         id: elements_model_channel_width
         ListElement {value: 10; verbose:"10Mhz"}
         ListElement {value: 20; verbose:"20Mhz"}
+    }
+    ListModel{
+        id: elements_model_channel_width_with_40
+        ListElement {value: 10; verbose:"10Mhz"}
+        ListElement {value: 20; verbose:"20Mhz"}
         ListElement {value: 40; verbose:"40Mhz\n(HIGH BW)"}
     }
     ListModel{
@@ -220,6 +225,9 @@ Item {
             }
             return frequencies_model;
         }else if(param_id=="CHANNEL_WIDTH"){
+            if(settings.dev_allow_40mhz){
+                return elements_model_channel_width_with_40;
+            }
             return elements_model_channel_width;
         }else if(param_id=="RATE"){
             return elements_model_rate;

qml/ui/sidebar/Panel8FindAirUnit.qml

@@ -98,7 +98,7 @@ Button {
 
     function startScan(){
         var how_many_freq_bands = bandSelection.currentIndex;
-        var how_many_bandwidths = 2;
+        var how_many_bandwidths = settings.dev_allow_40mhz ? 2 : 1;
         var result = _wbLinkSettingsHelper.start_scan_channels(how_many_freq_bands, how_many_bandwidths);
         if(result){
             _qopenhd.show_toast("Channel scan started, please wait", true);