Add support for IMU3+

Author: haslinghuis

locales/en/messages.json

@@ -1531,6 +1531,15 @@
     "configurationSensorGyroToUseBoth": {
         "message": "Both"
     },
+    "configurationSensorGyroTitle": {
+        "message": "IMU Sensor "
+    },
+    "configurationSensorEnable": {
+        "message": "Enable Sensor"
+    },
+    "configurationSensorAlignment": {
+        "message": "Sensor Alignment"
+    },
     "configurationSensorAlignmentGyro1": {
         "message": "First GYRO"
     },

src/js/fc.js

@@ -478,9 +478,10 @@ const FC = {
             gyro_to_use: 0,
             gyro_1_align: 0,
             gyro_2_align: 0,
-            gyro_align_roll: 0,
-            gyro_align_pitch: 0,
-            gyro_align_yaw: 0,
+            gyro_align: [],
+            gyro_align_roll: [],
+            gyro_align_pitch: [],
+            gyro_align_yaw: [],
             mag_align_roll: 0,
             mag_align_pitch: 0,
             mag_align_yaw: 0,

src/js/msp/MSPHelper.js

@@ -638,18 +638,35 @@ MspHelper.prototype.process_data = function (dataHandler) {
                     FC.SENSOR_ALIGNMENT.align_acc = data.readU8();
                     FC.SENSOR_ALIGNMENT.align_mag = data.readU8();
                     FC.SENSOR_ALIGNMENT.gyro_detection_flags = data.readU8();
-                    FC.SENSOR_ALIGNMENT.gyro_to_use = data.readU8();
-                    FC.SENSOR_ALIGNMENT.gyro_1_align = data.readU8();
-                    FC.SENSOR_ALIGNMENT.gyro_2_align = data.readU8();
+
                     if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
-                        FC.SENSOR_ALIGNMENT.gyro_align_roll = data.read16() / 10;
-                        FC.SENSOR_ALIGNMENT.gyro_align_pitch = data.read16() / 10;
-                        FC.SENSOR_ALIGNMENT.gyro_align_yaw = data.read16() / 10;
+                        FC.SENSOR_ALIGNMENT.gyro_enable_mask = data.readU8(); // replacing gyro_to_use
+
+                        // Initialize arrays for gyro alignment
+                        FC.SENSOR_ALIGNMENT.gyro_align = [];
+                        FC.SENSOR_ALIGNMENT.gyro_align_roll = [];
+                        FC.SENSOR_ALIGNMENT.gyro_align_pitch = [];
+                        FC.SENSOR_ALIGNMENT.gyro_align_yaw = [];
+
+                        for (let i = 0; i < 8; i++) {
+                            FC.SENSOR_ALIGNMENT.gyro_align[i] = data.readU8();
+                        }
+
+                        for (let i = 0; i < 8; i++) {
+                            FC.SENSOR_ALIGNMENT.gyro_align_roll[i] = data.read16() / 10;
+                            FC.SENSOR_ALIGNMENT.gyro_align_pitch[i] = data.read16() / 10;
+                            FC.SENSOR_ALIGNMENT.gyro_align_yaw[i] = data.read16() / 10;
+                        }
 
                         FC.SENSOR_ALIGNMENT.mag_align_roll = data.read16() / 10;
                         FC.SENSOR_ALIGNMENT.mag_align_pitch = data.read16() / 10;
                         FC.SENSOR_ALIGNMENT.mag_align_yaw = data.read16() / 10;
+                    } else {
+                        FC.SENSOR_ALIGNMENT.gyro_to_use = data.readU8();
+                        FC.SENSOR_ALIGNMENT.gyro_1_align = data.readU8();
+                        FC.SENSOR_ALIGNMENT.gyro_2_align = data.readU8();
                     }
+
                     break;
                 case MSPCodes.MSP_DISPLAYPORT:
                     break;
@@ -2079,19 +2096,33 @@ MspHelper.prototype.crunch = function (code, modifierCode = undefined) {
             buffer
                 .push8(FC.SENSOR_ALIGNMENT.align_gyro)
                 .push8(FC.SENSOR_ALIGNMENT.align_acc)
-                .push8(FC.SENSOR_ALIGNMENT.align_mag)
-                .push8(FC.SENSOR_ALIGNMENT.gyro_to_use)
-                .push8(FC.SENSOR_ALIGNMENT.gyro_1_align)
-                .push8(FC.SENSOR_ALIGNMENT.gyro_2_align);
+                .push8(FC.SENSOR_ALIGNMENT.align_mag);
+
             if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
-                buffer.push16(FC.SENSOR_ALIGNMENT.gyro_align_roll * 10);
-                buffer.push16(FC.SENSOR_ALIGNMENT.gyro_align_pitch * 10);
-                buffer.push16(FC.SENSOR_ALIGNMENT.gyro_align_yaw * 10);
+                buffer.push8(FC.SENSOR_ALIGNMENT.gyro_enable_mask); // replacing gyro_to_use
 
-                buffer.push16(FC.SENSOR_ALIGNMENT.mag_align_roll * 10);
-                buffer.push16(FC.SENSOR_ALIGNMENT.mag_align_pitch * 10);
-                buffer.push16(FC.SENSOR_ALIGNMENT.mag_align_yaw * 10);
+                for (let i = 0; i < 8; i++) {
+                    buffer.push8(FC.SENSOR_ALIGNMENT.gyro_align[i]);
+                }
+
+                for (let i = 0; i < 8; i++) {
+                    buffer
+                        .push16(FC.SENSOR_ALIGNMENT.gyro_align_roll[i] * 10)
+                        .push16(FC.SENSOR_ALIGNMENT.gyro_align_pitch[i] * 10)
+                        .push16(FC.SENSOR_ALIGNMENT.gyro_align_yaw[i] * 10);
+                }
+
+                buffer
+                    .push16(FC.SENSOR_ALIGNMENT.mag_align_roll * 10)
+                    .push16(FC.SENSOR_ALIGNMENT.mag_align_pitch * 10)
+                    .push16(FC.SENSOR_ALIGNMENT.mag_align_yaw * 10);
+            } else {
+                buffer
+                    .push8(FC.SENSOR_ALIGNMENT.gyro_to_use)
+                    .push8(FC.SENSOR_ALIGNMENT.gyro_1_align)
+                    .push8(FC.SENSOR_ALIGNMENT.gyro_2_align);
             }
+
             break;
         case MSPCodes.MSP_SET_ADVANCED_CONFIG:
             buffer