Change mixer

Author: haslinghuis

locales/en/messages.json

@@ -2559,7 +2559,7 @@
         "message": "<strong>I understand the risks</strong>, the propellers are removed - enable motor control and arming, and disable Runaway Takeoff Prevention."
     },
     "motorsDialogMixerReset": {
-        "message": "<strong>Invalid mixer mode selected.</strong><br /><br />The {{mixerName}} model needs {{mixerMotors}} motor resources.<br /><br />If using a custom mixer mode you need to define a custom mmix before changing mixer mode. If you come back to the motor tab after setting a mmix for your mode it won't reset the mode anymore. Please see the wiki for more information how to set this up.<br /><br />You are not able to test any motors or fly because firmware has {{outputs}} outputs for the selected mode.<br /><br />Resetting to default mixer mode"
+        "message": "<strong>Mixer mode problem detected</strong><br /><br />The {{mixerName}} model needs <strong class=\"message-positive\">{{mixerMotors}}</strong> motor resources and the current configuration of the firmware provides <strong class=\"message-positive\">{{outputs}}</strong> usable output(s) for the selected mode.<br /><br />If using a custom mixer mode you need to define a custom mmix before changing mixer mode.<br /><br />Please check your configuration and add the required motor resources."
     },
     "motorsDialogSettingsChanged": {
         "message": "Configuration changes have been detected.<br /><br /><strong class=\"message-negative-italic\">Motor Test Mode is disabled until the settings have seen saved.</strong>"

src/js/tabs/motors.js

@@ -330,6 +330,8 @@ TABS.motors.initialize = function (callback) {
             });
         }
 
+        sortElement('select.mixerList');
+
         function refreshMixerPreview() {
             const mixer = FC.MIXER_CONFIG.mixer;
             const reverse = FC.MIXER_CONFIG.reverseMotorDir ? "_reversed" : "";
@@ -643,6 +645,8 @@ TABS.motors.initialize = function (callback) {
             escProtocolElement.append(`<option value="${j + 1}">${escProtocols[j]}</option>`);
         }
 
+        sortElement('select.escprotocol');
+
         const unsyncedPWMSwitchElement = $("input[id='unsyncedPWMSwitch']");
         const divUnsyncedPWMFreq = $('div.unsyncedpwmfreq');
 
@@ -743,7 +747,7 @@ TABS.motors.initialize = function (callback) {
         }
 
         escProtocolElement.val(FC.PID_ADVANCED_CONFIG.fast_pwm_protocol + 1);
-        console.log(FC.PID_ADVANCED_CONFIG.fast_pwm_protocol);
+
         escProtocolElement.on("change", function () {
             const escProtocolValue = parseInt($(this).val()) - 1;
 
@@ -1116,12 +1120,6 @@ TABS.motors.initialize = function (callback) {
             dialogMixerReset.showModal();
             $('#dialog-mixer-reset-confirmbtn').click(function() {
                 dialogMixerReset.close();
-
-                FC.MIXER_CONFIG.mixer = 3;
-
-                MSP.promise(MSPCodes.MSP_SET_MIXER_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_MIXER_CONFIG))
-                .then(() => MSP.promise(MSPCodes.MSP_EEPROM_WRITE))
-                .then(() => reboot());
             });
         }
     }

src/js/utils/common.js

@@ -94,10 +94,26 @@ export function getTextWidth(text) {
     return Math.ceil(context.measureText(text).width);
 }
 
+export function sortElement(element, keepDown = "DISABLED") {
+    const list = document.querySelector(element);
+    [...list.children]
+        .sort((a, b) => {
+            if (a.innerText === keepDown) {
+                return 1;
+            } else if (b.innerText === keepDown) {
+                return -1;
+            } else {
+                return a.innerText > b.innerText ? 1 : -1;
+            }
+        })
+        .forEach(node => list.appendChild(node));
+}
+
 // TODO: these are temp binding while transition to module happens
 window.degToRad = degToRad;
 window.bytesToSize = bytesToSize;
 window.checkChromeRuntimeError = checkChromeRuntimeError;
 window.generateVirtualApiVersions = generateVirtualApiVersions;
 window.getMixerImageSrc = getMixerImageSrc;
 window.getTextWidth = getTextWidth;
+window.sortElement = sortElement;