Merge pull request #8 from iNavFlight/master

Merge from Master

_locales/en/messages.json

@@ -37,6 +37,9 @@
     "deviceReady": {
         "message": "Device - <span style=\"color: #37a8db\">Ready</span>"
     },
+    "fcNotConnected": {
+        "message": "Not connected"
+    },
 
     "backupFileIncompatible": {
         "message": "Backup file provided was generated for previous version of the configurator and is incompatible with this version of configurator. Sorry"
@@ -1400,6 +1403,9 @@
     "adjustmentsFunction51": {
         "message": "TPA Breakpoint Adjustment"
     },
+    "adjustmentsFunction52": {
+        "message": "Control Smoothness Adjustment"
+    },
     "adjustmentsSave": {
         "message": "Save"
     },

js/serial_backend.js

@@ -202,6 +202,8 @@ function onValidFirmware()
                 helper.defaultsDialog.init();
 
                 $('#tabs ul.mode-connected .tab_setup a').click();
+
+                updateFirmwareVersion();
             });
         });
     });
@@ -367,6 +369,8 @@ function onClosed(result) {
     $('#portsinput').show();
     $('#dataflash_wrapper_global').hide();
     $('#quad-status_wrapper').hide();
+
+    updateFirmwareVersion();
 }
 
 function read_serial(info) {

main.css

@@ -150,6 +150,20 @@ input[type="number"]::-webkit-inner-spin-button {
     margin-left: 1em;
 }
 
+.logo_text_firmware {
+    position: absolute;
+    height: 20px;
+    left: 0;
+    top: 80px;
+    color: #949494;
+    opacity: 0.5;
+}
+
+.logo_text_firmware .firmware_version {
+    float: right;
+    margin-left: 2.1em;
+}
+
 #port-picker {
     position: relative;
     width: 100%;

main.html

@@ -26,6 +26,10 @@
                     CONFIGURATOR
                     <div class="version"></div>
                 </div>
+                <div class="logo_text_firmware">
+                    FC FIRMWARE
+                    <div class="firmware_version"></div>
+                </div>
             </div>
             <a id="options" href="#" data-i18n_title="options_title"></a>
 

main.js

@@ -54,6 +54,7 @@ $(document).ready(function () {
 
     $('#status-bar .version').text(chrome.runtime.getManifest().version);
     $('#logo .version').text(chrome.runtime.getManifest().version);
+    updateFirmwareVersion();
 
     // notification messages for various operating systems
     switch (GUI.operating_system) {
@@ -524,10 +525,16 @@ String.prototype.format = function () {
     });
 };
 
-
-
 function updateActivatedTab() {
     var activeTab = $('#tabs > ul li.active');
     activeTab.removeClass('active');
     $('a', activeTab).trigger('click');
 }
+
+function updateFirmwareVersion() {
+    if (CONFIGURATOR.connectionValid) {
+        $('#logo .firmware_version').text(CONFIG.flightControllerVersion);
+    } else {
+        $('#logo .firmware_version').text(chrome.i18n.getMessage('fcNotConnected'));
+    }
+}

tabs/adjustments.html

@@ -116,6 +116,7 @@
                         <option value="49" i18n="adjustmentsFunction49"></option>
                         <option value="50" i18n="adjustmentsFunction50"></option>
                         <option value="51" i18n="adjustmentsFunction51"></option>
+                        <option value="52" i18n="adjustmentsFunction52"></option>
                 </select></td>
                 <td class="adjustmentSlot"><select class="slot">
                         <option value="0" i18n="adjustmentsSlot0"></option>

tabs/adjustments.js

@@ -64,7 +64,7 @@ TABS.adjustments.initialize = function (callback) {
 
         // update list of selected functions
         var functionListOptions = $(functionList).find('option');
-        var availableFunctionCount = 52;
+        var availableFunctionCount = 53;
 
         var functionListOptions = $(functionListOptions).slice(0,availableFunctionCount);
         functionList.empty().append(functionListOptions);

tabs/mission_control.html

@@ -95,7 +95,7 @@
                         </div>
                         <div class="point">
                             <label class="point-label" for="pointAlt">Alt (cm): </label>
-                            <input id="pointAlt" type="text" value="0" required>
+                            <input id="pointAlt" type="text" value="0" required><span id="altitudeInMeters"></span>
                         </div>
                         <div class="point">
                             <label class="point-label" for="pointSpeed">Speed (cm/s): </label>

tabs/mission_control.js

@@ -99,11 +99,11 @@ TABS.mission_control.initialize = function (callback) {
              MSP.send_message(MSPCodes.MSP_ALTITUDE, false, false, get_attitude_data);
 
         }
+
         function get_attitude_data() {
             MSP.send_message(MSPCodes.MSP_ATTITUDE, false, false, update_gpsTrack);
         }
       
-
         function update_gpsTrack() {
 
           let lat = GPS_DATA.lat / 10000000;
@@ -480,6 +480,10 @@ TABS.mission_control.initialize = function (callback) {
         };
         ol.inherits(app.Drag, ol.interaction.Pointer);
 
+        app.ConvertCentimetersToMeters = function (val) {
+            return parseInt(val) / 100;
+        };
+
         /**
          * @constructor
          * @extends {ol.control.Control}
@@ -684,6 +688,9 @@ TABS.mission_control.initialize = function (callback) {
 
                       selectedFeature.setStyle(getPointIcon(true));
 
+                      var altitudeMeters = app.ConvertCentimetersToMeters(selectedMarker.alt);
+                      
+                      $('#altitudeInMeters').text(` ${altitudeMeters}m`);
                       $('#pointLon').val(Math.round(coord[0] * 10000000) / 10000000);
                       $('#pointLat').val(Math.round(coord[1] * 10000000) / 10000000);
                       $('#pointAlt').val(selectedMarker.alt);
@@ -718,6 +725,11 @@ TABS.mission_control.initialize = function (callback) {
             map.width_ = width; map.height_ = height;
         }, 200);
 
+        $('#pointAlt').keyup(function(){
+            let altitudeMeters = app.ConvertCentimetersToMeters($(this).val());
+            $('#altitudeInMeters').text(` ${altitudeMeters}m`);
+        });
+
         $('#removeAllPoints').on('click', function () {
             if (markers.length && confirm(chrome.i18n.getMessage('confirm_delete_all_points'))) {
                 removeAllPoints();

tabs/osd.js

@@ -1546,6 +1546,11 @@ OSD.constants = {
                     id: 117,
                     preview: 'TPA    0\nBP  1500'
                 },
+                {
+                    name: 'CONTROL_SMOOTHNESS',
+                    id: 118,
+                    preview: 'CTL S 3'
+                },
             ]
         },
         {