Merge branch 'master' of https://github.com/iNavFlight/inav-configurator

into Geozones-RC2-Fixes
iNavFlight · Nov 16, 2024 · 33888c9 · 33888c9
2 parents f7cf010 + 1a291dc
commit 33888c9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/js/wizard_save_framework.js b/js/wizard_save_framework.js
@@ -31,7 +31,7 @@ var wizardSaveFramework = (function () {
 
                 serialPortHelper.set(config.value.port, 'GPS', config.value.baud);
                 mspHelper.saveSerialPorts(function () {
-                    features.execute(callback);
+                    features.execute(self.enableVirtulaPitot(config, callback));
                 });
                 break;
             case 'gpsProtocol':
@@ -43,6 +43,14 @@ var wizardSaveFramework = (function () {
         }
     };
 
+    self.enableVirtulaPitot = function (config, callback) {
+        if (config.value.port != '-1') {
+            mspHelper.setSetting('pitot_hardware', "VIRTUAL", callback);
+        } else {
+            callback();
+        }
+    };
+
     self.handleSetting = function (configs, finalCallback) {
 
         if (configs.length > 0) {

diff --git a/locale/en/messages.json b/locale/en/messages.json
@@ -1771,6 +1771,9 @@
     "receiverRssiChannel": {
         "message": "RSSI Channel"
     },
+    "receiverRssiSource": {
+        "message": "RSSI Source"
+    },
     "receiverRefreshRateTitle": {
         "message": "Graph refresh rate"
     },

diff --git a/src/css/tabs/receiver.css b/src/css/tabs/receiver.css
@@ -225,7 +225,7 @@
     float: right;
     margin: 0px 0px 20px 0;
     border-left: 0;
-    width: 30%;
+    width: 25%;
     border-top-right-radius: 5px;
     border-bottom-right-radius: 5px;
     background-color: #DEDEDE;
@@ -261,7 +261,7 @@
     float: right;
     position: relative;
     margin: 0px 0px 20px 0;
-    width: calc(70% - 0px);
+    width: calc(50% - 0px);
     border-top-left-radius: 5px;
     border-bottom-left-radius: 5px;
     background-color: #DEDEDE;

diff --git a/tabs/receiver.html b/tabs/receiver.html
@@ -14,6 +14,10 @@
                     <!-- list generated here -->
                 </select>
             </div>
+            <div class="rssi_channel_wrapper">
+                <div class="head" data-i18n="receiverRssiSource"></div>
+                <select name="rssi_source" data-setting="rssi_source"></select>
+            </div>
             <div class="rcmap_wrapper">
                 <div class="head">
                     <span data-i18n="receiverChannelMap" data-i18n_title="receiverChannelMapTitle"></span>