Merge pull request #211 from iNavFlight/sonar-support

Rangefinder setting is back

_locales/en/messages.json

@@ -1862,6 +1862,9 @@
     "sensorPitot": {
         "message": "Pitot tube"
     },
+    "sensorRangefinder": {
+        "message": "Rangefinder"
+    },
     "manualEnablingTemplate": {
         "message": "To enable via CLI use <strong>feature {name}</strong> command"
     },

build/script.js

@@ -11556,6 +11556,7 @@ var FC = {
             'JJRC H8_3D',
             'iNav Reference protocol',
             'eLeReS'
+            
         ];
     },
     getSensorAlignments: function () {
@@ -15570,7 +15571,8 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
             var $sensorAcc = $('#sensor-acc'),
                 $sensorMag = $('#sensor-mag'),
                 $sensorBaro = $('#sensor-baro'),
-                $sensorPitot = $('#sensor-pitot');
+                $sensorPitot = $('#sensor-pitot'),
+                $sensorRangefinder = $('#sensor-rangefinder');
 
             GUI.fillSelect($sensorAcc, FC.getAccelerometerNames());
             $sensorAcc.val(SENSOR_CONFIG.accelerometer);
@@ -15597,11 +15599,23 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
                 SENSOR_CONFIG.pitot = $sensorPitot.val();
             });
 
+            GUI.fillSelect($sensorRangefinder, FC.getRangefinderNames());
+            $sensorRangefinder.val(SENSOR_CONFIG.rangefinder);
+            $sensorRangefinder.change(function () {
+                SENSOR_CONFIG.rangefinder = $sensorRangefinder.val();
+            });
+
             $(".requires-v1_5").show();
         } else {
             $(".requires-v1_5").hide();
         }
 
+        if (semver.gte(CONFIG.flightControllerVersion, "1.7.0")) {
+            $(".requires-v1_7").show();
+        } else {
+            $(".requires-v1_7").hide();
+        }
+
         $('#3ddeadbandlow').val(_3D.deadband3d_low);
         $('#3ddeadbandhigh').val(_3D.deadband3d_high);
         $('#3dneutral').val(_3D.neutral3d);

tabs/configuration.html

@@ -50,6 +50,11 @@
                         <select id="sensor-pitot"></select>
                         <label for="sensor-pitot"> <span data-i18n="sensorPitot"></span></label>
                     </div>
+
+                    <div class="select requires-v1_7">
+                        <select id="sensor-rangefinder"></select>
+                        <label for="sensor-rangefinder"> <span data-i18n="sensorRangefinder"></span></label>
+                    </div>
                 </div>
             </div>
             <div class="board gui_box grey">

tabs/configuration.js

@@ -471,7 +471,8 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
             var $sensorAcc = $('#sensor-acc'),
                 $sensorMag = $('#sensor-mag'),
                 $sensorBaro = $('#sensor-baro'),
-                $sensorPitot = $('#sensor-pitot');
+                $sensorPitot = $('#sensor-pitot'),
+                $sensorRangefinder = $('#sensor-rangefinder');
 
             GUI.fillSelect($sensorAcc, FC.getAccelerometerNames());
             $sensorAcc.val(SENSOR_CONFIG.accelerometer);
@@ -498,11 +499,23 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
                 SENSOR_CONFIG.pitot = $sensorPitot.val();
             });
 
+            GUI.fillSelect($sensorRangefinder, FC.getRangefinderNames());
+            $sensorRangefinder.val(SENSOR_CONFIG.rangefinder);
+            $sensorRangefinder.change(function () {
+                SENSOR_CONFIG.rangefinder = $sensorRangefinder.val();
+            });
+
             $(".requires-v1_5").show();
         } else {
             $(".requires-v1_5").hide();
         }
 
+        if (semver.gte(CONFIG.flightControllerVersion, "1.7.0")) {
+            $(".requires-v1_7").show();
+        } else {
+            $(".requires-v1_7").hide();
+        }
+
         $('#3ddeadbandlow').val(_3D.deadband3d_low);
         $('#3ddeadbandhigh').val(_3D.deadband3d_high);
         $('#3dneutral').val(_3D.neutral3d);