Reverse can be applied to multiple channels - display for now

Author: haslinghuis

src/js/msp/MSPHelper.js

@@ -604,6 +604,20 @@ MspHelper.prototype.process_data = function (dataHandler) {
                     }
                     break;
                 case MSPCodes.MSP_SERVO_MIX_RULES:
+                    FC.SERVO_RULES = []; // empty the array as new data is coming in
+                    const MAX_SERVO_RULES = 8 * 2;
+                    for (let i = 0; i < MAX_SERVO_RULES; i++) {
+                        const array = {
+                            targetChannel: data.readU8(),
+                            inputSource: data.readU8(),
+                            rate: data.readU8(),
+                            speed: data.readU8(),
+                            min: data.readU8(),
+                            max: data.readU8(),
+                            box: data.readU8(),
+                        };
+                        FC.SERVO_RULES.push(array);
+                    }
                     break;
 
                 case MSPCodes.MSP_SERVO_CONFIGURATIONS:
@@ -2521,6 +2535,7 @@ MspHelper.prototype.sendServoConfigurations = function (onCompleteCallback) {
         if (out == undefined) {
             out = 255; // Cleanflight defines "CHANNEL_FORWARDING_DISABLED" as "(uint8_t)0xFF"
         }
+
         buffer.push8(out).push32(servoConfiguration.reversedInputSources);
 
         // prepare for next iteration

src/js/tabs/servos.js

@@ -8,6 +8,12 @@ import { gui_log } from "../gui_log";
 import $ from "jquery";
 
 const servos = {};
+
+// Add clamp function to Number prototype
+Number.prototype.clamp = function (min, max) {
+    return Math.min(Math.max(this, min), max);
+};
+
 servos.initialize = function (callback) {
     if (GUI.active_tab !== "servos") {
         GUI.active_tab = "servos";
@@ -42,20 +48,22 @@ servos.initialize = function (callback) {
 
         $(".tab-servos").addClass("supported");
 
-        let servoCheckbox = "";
+        // setup header
         let servoHeader = "";
         for (let i = 0; i < FC.RC.active_channels - 4; i++) {
             servoHeader += `<th>A${i + 1}</th>`;
         }
+
         servoHeader += '<th style="width: 110px" i18n="servosRateAndDirection"></th>';
-        servoHeader += '<th style="width: 110px" i18n="servosReverse"></th>';
 
+        $("div.tab-servos table.fields tr.main").append(servoHeader);
+
+        // setup checkboxes
+        let servoCheckbox = "";
         for (let i = 0; i < FC.RC.active_channels; i++) {
-            servoCheckbox += `<td class="channel"><input type="checkbox"/></td>`;
+            servoCheckbox += `<td class="channel" id="channel${i}"><input type="checkbox"/></td>`;
         }
 
-        $("div.tab-servos table.fields tr.main").append(servoHeader);
-
         /*
          *  function: void process_servos(string, object)
          */
@@ -69,8 +77,7 @@ servos.initialize = function (callback) {
             element += `<td class="min">${subElement}${FC.SERVO_CONFIG[obj].min}" /></td>`;
             element += `<td class="middle">${subElement}${FC.SERVO_CONFIG[obj].middle}" /></td>`;
             element += `<td class="max">${subElement}${FC.SERVO_CONFIG[obj].max}" /></td>`;
-            element += `${servoCheckbox}<td class="direction"></td>`;
-            element += `<td class="reverse"></td></tr>`;
+            element += `${servoCheckbox}<td class="direction"></td></tr>`;
 
             $("div.tab-servos table.fields").append(element);
 
@@ -95,17 +102,18 @@ servos.initialize = function (callback) {
 
             $("div.tab-servos table.fields tr:last").data("info", { obj: obj });
 
-            // adding select box for servo reverse
-            $("div.tab-servos table.fields tr:last td.reverse").append(
-                '<select class="reverse" name="reverse"></select>',
-            );
-
-            const reverse = $("div.tab-servos table.fields tr:last td.reverse select");
-
-            reverse.append(`<option value="0">${i18n.getMessage("servosNormal")}</option>`);
-            reverse.append(`<option value="1">${i18n.getMessage("servosReverse")}</option>`);
-
-            reverse.val(FC.SERVO_CONFIG[obj].reversedInputSources);
+            // check if input sources are reversed
+            for (let i = 0; i < FC.SERVO_RULES.length; i++) {
+                const inputSource = FC.SERVO_RULES[i].inputSource;
+                const reversed = FC.SERVO_CONFIG[obj].reversedInputSources & (1 << inputSource);
+                if (reversed) {
+                    FC.SERVO_CONFIG[obj].reversedInputSources |= 1 << inputSource;
+                    const inputSourceElement = $(`#channel${inputSource}`).find("input");
+                    if (inputSourceElement) {
+                        inputSourceElement.prop("checked", true).parent().css("background-color", "red");
+                    }
+                }
+            }
 
             // UI hooks
 
@@ -138,7 +146,6 @@ servos.initialize = function (callback) {
                 FC.SERVO_CONFIG[info.obj].max = parseInt($(".max input", this).val());
 
                 FC.SERVO_CONFIG[info.obj].rate = parseInt($(".direction select", this).val());
-                FC.SERVO_CONFIG[info.obj].reversedInputSources = parseInt($(".reverse select", this).val());
             });
 
             //