Merge branch 'release_5.1.0' into MrD-_Fix-rounding-errorMrD-_Fix-rounding-error

5 files changed, 20 insertions, 10 deletions

diff --git a/js/peripherals.js b/js/peripherals.js
index 2c340fb5..3029fdfd 100644
--- a/js/peripherals.js
+++ b/js/peripherals.js
@@ -25,8 +25,7 @@ function adjustBoxNameIfPeripheralWithModeID(modeId, defaultName) {
             default:
                 return defaultName;
         }
-    } 
-    
-    return defaultName;
+    }
     
+    return defaultName;  
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index fc4e7194..b22eff2c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "minimum_chrome_version": "38",
-    "version": "6.0.0",
+    "version": "5.1.0",
     "author": "Several",
     "name": "INAV - Configurator",
     "short_name": "INAV",
diff --git a/package-lock.json b/package-lock.json
index 1b5f47d4..81e4810a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "inav-configurator",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/src/css/tabs/auxiliary.css b/src/css/tabs/auxiliary.css
index 86ff9acf..724f6758 100644
--- a/src/css/tabs/auxiliary.css
+++ b/src/css/tabs/auxiliary.css
@@ -81,18 +81,22 @@
     background-color: #e4e4e4;
     border-bottom: 5px solid white;
     color: grey;
-    min-width: 100px;
+    height: 85px;
+    width: 130px;
+    padding: 0px 5px;
 }
 
 .tab-auxiliary .mode .info .name {
     font-weight: bold;
     font-size: 1.0em;
+    padding-bottom: 5px;
 }
 
 .tab-auxiliary .mode .info .buttons {
     position: absolute;
     bottom: 14px;
     width: 100%;
+    margin-left:-5px;
 }
 
 .tab-auxiliary .mode .info .buttons a {
diff --git a/tabs/auxiliary.js b/tabs/auxiliary.js
index 55dbe25f..adb4dc61 100644
--- a/tabs/auxiliary.js
+++ b/tabs/auxiliary.js
@@ -18,7 +18,15 @@ TABS.auxiliary.initialize = function (callback) {
     }
 
     function get_rc_data() {
-        MSP.send_message(MSPCodes.MSP_RC, false, false, load_html);
+        if (SERIAL_CONFIG.ports.length == 0) {
+            MSP.send_message(MSPCodes.MSP_RC, false, false, get_ports_data);
+        } else {
+            MSP.send_message(MSPCodes.MSP_RC, false, false, load_html);
+        }
+    }
+
+    function get_ports_data() {
+        MSP.send_message(MSPCodes.MSP2_CF_SERIAL_CONFIG, false, false, load_html);
     }
 
     function load_html() {
@@ -33,8 +41,8 @@ TABS.auxiliary.initialize = function (callback) {
         modeSections["Arming"] = ["ARM", "PREARM"];
         modeSections["Flight Modes"] = ["ANGLE", "HORIZON", "MANUAL"];
         modeSections["Navigation Modes"] = ["NAV COURSE HOLD", "NAV CRUISE", "NAV POSHOLD", "NAV RTH", "NAV WP", "GCS NAV"];
-        modeSections["Flight Mode Modifiers"] = ["NAV ALTHOLD", "HEADING HOLD", "AIR MODE", "SOARING", "SURFACE"];
-        modeSections["Fixed Wing"] = ["AUTO TUNE", "SERVO AUTOTRIM", "AUTO LEVEL", "NAV LAUNCH", "LOITER CHANGE", "FLAPERON", "TURN ASSIST"];
+        modeSections["Flight Mode Modifiers"] = ["NAV ALTHOLD", "HEADING HOLD", "AIR MODE", "SOARING", "SURFACE", "TURN ASSIST"];
+        modeSections["Fixed Wing"] = ["AUTO TUNE", "SERVO AUTOTRIM", "AUTO LEVEL", "NAV LAUNCH", "LOITER CHANGE", "FLAPERON"];
         modeSections["Multi-rotor"] = ["FPV ANGLE MIX", "TURTLE", "MC BRAKING", "HEADFREE", "HEADADJ"];
         modeSections["OSD Modes"] = ["OSD OFF", "OSD ALT 1", "OSD ALT 2", "OSD ALT 3"];
         modeSections["FPV Camera Modes"] = ["CAMSTAB", "CAMERA CONTROL 1", "CAMERA CONTROL 2", "CAMERA CONTROL 3"];
@@ -201,7 +209,6 @@ TABS.auxiliary.initialize = function (callback) {
         let modeSelectionRange = "";
 
         for (var modeIndex = 0; modeIndex < AUX_CONFIG.length; modeIndex++) {
-
             // Get current mode category
             for (modeSelectionRange in modeSections) {
                 if (modeSections[modeSelectionRange].indexOf(AUX_CONFIG[modeIndex]) != -1) {