Fix backwards compatibility for sensor info (#4464)

Author: haslinghuis

src/js/tabs/setup.js

@@ -304,50 +304,42 @@ setup.initialize = function (callback) {
                 }
             }
 
-            if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
-                MSP.send_message(MSPCodes.MSP2_SENSOR_CONFIG_ACTIVE, false, false, function () {
-                    addSensorInfo(
-                        FC.SENSOR_CONFIG_ACTIVE.gyro_hardware,
-                        sensor_gyro_e,
-                        "gyro",
-                        sensorTypes().gyro.elements,
-                    );
-                    addSensorInfo(
-                        FC.SENSOR_CONFIG_ACTIVE.acc_hardware,
-                        sensor_acc_e,
-                        "acc",
-                        sensorTypes().acc.elements,
-                    );
-                    addSensorInfo(
-                        FC.SENSOR_CONFIG_ACTIVE.baro_hardware,
-                        sensor_baro_e,
-                        "baro",
-                        sensorTypes().baro.elements,
-                    );
-                    addSensorInfo(
-                        FC.SENSOR_CONFIG_ACTIVE.mag_hardware,
-                        sensor_mag_e,
-                        "mag",
-                        sensorTypes().mag.elements,
-                    );
+            MSP.send_message(MSPCodes.MSP2_SENSOR_CONFIG_ACTIVE, false, false, function () {
+                addSensorInfo(
+                    FC.SENSOR_CONFIG_ACTIVE.gyro_hardware,
+                    sensor_gyro_e,
+                    "gyro",
+                    sensorTypes().gyro.elements,
+                );
+                addSensorInfo(FC.SENSOR_CONFIG_ACTIVE.acc_hardware, sensor_acc_e, "acc", sensorTypes().acc.elements);
+                addSensorInfo(
+                    FC.SENSOR_CONFIG_ACTIVE.baro_hardware,
+                    sensor_baro_e,
+                    "baro",
+                    sensorTypes().baro.elements,
+                );
+                addSensorInfo(FC.SENSOR_CONFIG_ACTIVE.mag_hardware, sensor_mag_e, "mag", sensorTypes().mag.elements);
+                addSensorInfo(
+                    FC.SENSOR_CONFIG_ACTIVE.sonar_hardware,
+                    sensor_sonar_e,
+                    "sonar",
+                    sensorTypes().sonar.elements,
+                );
+
+                // opticalflow sensor is available since 1.47
+                if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
                     addSensorInfo(
-                        FC.SENSOR_CONFIG_ACTIVE.sonar_hardware,
-                        sensor_sonar_e,
-                        "sonar",
-                        sensorTypes().sonar.elements,
+                        FC.SENSOR_CONFIG_ACTIVE.opticalflow_hardware,
+                        sensor_opticalflow_e,
+                        "opticalflow",
+                        sensorTypes().opticalflow.elements,
                     );
+                }
+            });
+        };
 
-                    // opticalflow sensor is available since 1.47
-                    if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
-                        addSensorInfo(
-                            FC.SENSOR_CONFIG_ACTIVE.opticalflow_hardware,
-                            sensor_opticalflow_e,
-                            "opticalflow",
-                            sensorTypes().opticalflow.elements,
-                        );
-                    }
-                });
-            }
+        const hideSensorInfo = function () {
+            $("#sensorInfoBox").hide();
         };
 
         // Fills in the "Build type" part of the "Firmware info" box
@@ -524,7 +516,11 @@ setup.initialize = function (callback) {
         }
 
         prepareDisarmFlags();
-        showSensorInfo();
+        if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
+            showSensorInfo();
+        } else {
+            hideSensorInfo();
+        }
         showFirmwareInfo();
         showNetworkStatus();
 

src/tabs/setup.html

@@ -178,7 +178,7 @@
                         </table>
                     </div>
                 </div>
-                <div class="gui_box grey">
+                <div class="gui_box grey" id="sensorInfoBox">
                     <div class="gui_box_titlebar">
                         <div class="spacer_box_title" i18n="initialSensorInfoHead"></div>
                         <div class="helpicon cf_tip" i18n_title="initialSensorInfoHeadHelp"></div>