Merge pull request #1621 from iNavFlight/MrD_Changes-for-PR-8401

Updates for PR #8401
iNavFlight · Nov 15, 2022 · e7ed9ce · e7ed9ce
2 parents 8a54665 + 91da0f6
commit e7ed9ce
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/js/fc.js b/js/fc.js
@@ -1239,7 +1239,10 @@ var FC = {
                     7: "Horizon",
                     8: "Air",
                     9: "USER 1",
-                    10: "USER 2"
+                    10: "USER 2",
+                    11: "Course Hold",
+                    12: "USER 3",
+                    13: "USER 4",
                 }
             },
             4: {

diff --git a/js/gui.js b/js/gui.js
@@ -279,11 +279,27 @@ GUI_control.prototype.renderOperandValue = function ($container, operandMetadata
                     $t.append('<option value="' + i + '">' + i + '</option>');
                 }
             } else if (operandMetadata.type == "dictionary") {
-                for (let k in operandMetadata.values) {
-                    if (operandMetadata.values.hasOwnProperty(k)) {
-                        $t.append('<option value="' + k + '">' + operandMetadata.values[k] + '</option>');
+                let operandValues = [];
+
+                for (let j in operandMetadata.values) {
+                    if (operandMetadata.values.hasOwnProperty(j)) {
+                        operandValues[parseInt(j,10)] = {
+                            id: parseInt(j, 10),
+                            name: operandMetadata.values[j],
+                        };
                     }
                 }
+
+                operandValues.sort((a, b) => {
+                    let ovAN = a.name.toLowerCase(),
+                        ovBN = b.name.toLowerCase();
+
+                    return (ovAN < ovBN) ? -1 : 1;
+                });
+
+                operandValues.forEach( val => {
+                    $t.append('<option value="' + val.id + '">' + val.name + '</option>');
+                });
             }
 
             $t.val(value);

diff --git a/tabs/auxiliary.js b/tabs/auxiliary.js
@@ -46,7 +46,7 @@ TABS.auxiliary.initialize = function (callback) {
         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"];
-        modeSections["Misc Modes"] = ["BEEPER", "LEDS OFF", "LIGHTS", "HOME RESET", "WP PLANNER", "MISSION CHANGE", "BLACKBOX", "FAILSAFE", "KILLSWITCH", "TELEMETRY", "MSP RC OVERRIDE", "USER1", "USER2"];
+        modeSections["Misc Modes"] = ["BEEPER", "LEDS OFF", "LIGHTS", "HOME RESET", "WP PLANNER", "MISSION CHANGE", "BLACKBOX", "FAILSAFE", "KILLSWITCH", "TELEMETRY", "MSP RC OVERRIDE", "USER1", "USER2", "USER3", "USER4"];
 
     function sort_modes_for_display() {
         // Sort the modes