Merge pull request #1451 from iNavFlight/MrD-Enhance-and-extend-conversions

Enhance and extend units conversion

Author: MrD-RC

_locales/en/messages.json

@@ -2126,7 +2126,7 @@
         "message": "<strong>Note:</strong> When Stage 2 is DISABLED, the fallback setting <strong>Auto</strong> is used instead of the user settings for all flightchannels (Roll, Pitch, Yaw and Throttle)."
     },
     "failsafeDelayItem": {
-        "message": "Guard time for activation after signal lost [1 = 0.1 sec.]"
+        "message": "Guard time for activation after signal lost [For deciseconds (ds): 1 = 0.1 sec.]"
     },
     "failsafeDelayHelp": {
         "message": "Time for stage 1 to wait for recovery"
@@ -2135,7 +2135,7 @@
         "message": "Throttle value used while landing"
     },
     "failsafeOffDelayItem": {
-        "message": "Delay for turning off the Motors during Failsafe [1 = 0.1 sec.]"
+        "message": "Delay for turning off the Motors during Failsafe [For deciseconds (ds):1 = 0.1 sec.]"
     },
     "failsafeOffDelayHelp": {
         "message": "Time to stay in landing mode untill the motors are turned off and the craft is disarmed"
@@ -2894,16 +2894,16 @@
         "message": "Fly Time (minutes)"
     },
     "osd_alt_alarm": {
-        "message": "Altitude (meters)"
+        "message": "Altitude"
     },
     "osd_dist_alarm": {
-        "message": "Distance (meters)"
+        "message": "Distance"
     },
     "osdAlarmDIST_HELP": {
         "message": "The distance to home indicator will flash when the distance is greater than this value. Zero disables this alarm."
     },
     "osd_neg_alt_alarm": {
-        "message": "Negative Altitude (meters)"
+        "message": "Negative Altitude"
     },
     "osdAlarmMAX_NEG_ALTITUDE_HELP": {
         "message": "The altitude indicator will flash when altitude is negative and its absolute value is greater than this alarm. Useful when taking off from elevated places. Zero disables this alarm."

js/settings.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const GulpClient = require("gulp");
+
 var Settings = (function () {
     let self = {};
 
@@ -28,6 +30,8 @@ var Settings = (function () {
                 }
                 parent.show();
 
+                input.prop('title', 'CLI: ' + input.data('setting'));
+
                 if (input.prop('tagName') == 'SELECT' || s.setting.table) {
                     if (input.attr('type') == 'checkbox') {
                         input.prop('checked', s.value > 0);
@@ -69,9 +73,9 @@ var Settings = (function () {
                     input.val(s.value.toFixed(2));
                 } else {
                     var multiplier = parseFloat(input.data('setting-multiplier') || 1);
-                    input.attr('type', 'number');
-                    input.val((s.value / multiplier).toFixed(Math.log10(multiplier)));
 
+                    input.val((s.value / multiplier).toFixed(Math.log10(multiplier)));
+                    input.attr('type', 'number');
                     if (typeof s.setting.min !== 'undefined' && s.setting.min !== null) {
                         input.attr('min', (s.setting.min / multiplier).toFixed(Math.log10(multiplier)));
                     }
@@ -136,22 +140,39 @@ var Settings = (function () {
 
         //display names for the units
         const unitDisplayDames = {
+            // Misc
             'us' : "uS",
-            'deg' : '°',
-            'cdeg' : 'centi°',
+            'cw' : 'cW',
+            'percent' : '%',
             'cmss' : 'cm/s/s',
-            'cm' : 'cm',
+            // Time
+            'msec' : 'ms',
+            'dsec' : 'ds',
+            'sec' : 's',
+            // Angles
+            'deg' : '°',
+            'decideg' : 'deci°',
+            // Temperature
+            'decidegc' : 'deci°C',
+            'degc' : '°C',
+            'degf' : '°F',
+            // Speed
             'cms' : 'cm/s',
-            'm' : 'm',
-            'ms' : 'ms',
-            'mps' : 'm/s',
+            'v-cms' : 'cm/s',
+            'ms' : 'm/s',
             'kmh' : 'Km/h',
-            'sec' : 's',
+            'mph' : 'mph',
+            'hftmin' : 'x100 ft/min',
+            'fts' : 'ft/s',
             'kt' : 'Kt',
+            // Distance
+            'cm' : 'cm',
+            'm' : 'm',
+            'km' : 'Km',
+            'm-lrg' : 'm', // Metres, but converted to larger units
             'ft' : 'ft',
-            'mph' : 'mph',
-            'cw' : 'cW',
-            'percent' : '%'
+            'mi' : 'mi',
+            'nm' : 'NM'
         }
 
 
@@ -169,51 +190,97 @@ var Settings = (function () {
                 'm' : 100, 
                 'ft' : 30.48
             },
-            'cms' : {
+            'm' : {
+                'm' : 1,
+                'ft' : 0.3048
+            },
+            'm-lrg' : {
+                'km' : 1000,
+                'mi' : 1609.344,
+                'nm' : 1852
+            },
+            'cms' : { // Horizontal speed
                 'kmh' : 27.77777777777778, 
                 'kt': 51.44444444444457, 
                 'mph' : 44.704,
-                'mps' : 100
+                'ms' : 100
+            },
+            'v-cms' : { // Vertical speed
+                'ms' : 100,
+                'hftmin' : 50.8,
+                'fts' : 30.48
             },
-            'ms' : {
+            'msec' : {
                 'sec' : 1000
             },
-            'cdeg' : {
+            'dsec' : {
+                'sec' : 10
+            },
+            'decideg' : {
                 'deg' : 10
             },
+            'decidegc' : {
+                'degc' : 10,
+                'degf' : 'FAHREN'
+            },
         };
 
         //this holds which units get converted in which unit systems
         const conversionTable = {
             0: { //imperial
                 'cm' : 'ft',
+                'm' : 'ft',
+                'm-lrg' : 'mi',
                 'cms' : 'mph',
-                'cdeg' : 'deg',
-                'ms' : 'sec'
+                'v-cms' : 'fts',
+                'msec' : 'sec',
+                'dsec' : 'sec',
+                'decideg' : 'deg',
+                'decidegc' : 'degf',
             },
-            1: {//metric
+            1: { //metric
                 'cm': 'm',
+                'm' : 'm',
+                'm-lrg' : 'km',
                 'cms' : 'kmh',
-                'ms' : 'sec',
-                'cdeg' : 'deg'
+                'v-cms' : 'ms',
+                'msec' : 'sec',
+                'dsec' : 'sec',
+                'decideg' : 'deg',
+                'decidegc' : 'degc',
             },
             2: { //metric with MPH
                 'cm': 'm',
+                'm' : 'm',
+                'm-lrg' : 'km',
                 'cms' : 'mph',
-                'cdeg' : 'deg',
-                'ms' : 'sec'
+                'v-cms' : 'ms',
+                'decideg' : 'deg',
+                'msec' : 'sec',
+                'dsec' : 'sec',
+                'decidegc' : 'degc',
             },
             3:{ //UK
                 'cm' : 'ft',
+                'm' : 'ft',
+                'm-lrg' : 'mi',
                 'cms' : 'mph',
-                'cdeg' : 'deg',
-                'ms' : 'sec'
+                'v-cms' : 'fts',
+                'decideg' : 'deg',
+                'msec' : 'sec',
+                'dsec' : 'sec',
+                'decidegc' : 'degc',
             },
             4: { //General aviation
                 'cm' : 'ft',
+                'm' : 'ft',
+                'm-lrg' : 'nm',
                 'cms': 'kt',
-                'cdeg' : 'deg',
-                'ms' : 'sec'
+                'v-cms' : 'hftmin',
+                'decideg' : 'deg',
+                'msec' : 'sec',
+                'dsec' : 'sec',
+                'decidegc' : 'degc',
             },
             default:{}//show base units
         };
@@ -239,18 +306,31 @@ var Settings = (function () {
         // Update the step, min, and max; as we have the multiplier here.
         if (element.attr('type') == 'number') {
             element.attr('step', ((multiplier != 1) ? '0.01' : '1'));
-            element.attr('min', (element.attr('min') / multiplier).toFixed(2));
-            element.attr('max', (element.attr('max') / multiplier).toFixed(2));
+            if (multiplier != 'FAHREN') {
+                element.attr('min', (element.attr('min') / multiplier).toFixed(2));
+                element.attr('max', (element.attr('max') / multiplier).toFixed(2));
+            }
         }
 
         // Update the input with a new formatted unit
-        const convertedValue = Number((oldValue / multiplier).toFixed(2));
-        const newValue = Number.isInteger(convertedValue) ? Math.round(convertedValue) : convertedValue;
+        let newValue = "";
+        if (multiplier == 'FAHREN') {
+            element.attr('min', toFahrenheit(element.attr('min')).toFixed(2));
+            element.attr('max', toFahrenheit(element.attr('max')).toFixed(2));
+            newValue = toFahrenheit(oldValue).toFixed(2);
+        } else {
+            const convertedValue = Number((oldValue / multiplier).toFixed(2));
+            newValue = Number.isInteger(convertedValue) ? Math.round(convertedValue) : convertedValue;
+        }
         element.val(newValue);
         element.data('setting-multiplier', multiplier);
 
         // Now wrap the input in a display that shows the unit
         element.wrap(`<div data-unit="${unitDisplayDames[unitName]}" class="unit_wrapper unit"></div>`);
+
+        function toFahrenheit(decidegC) {
+            return (decidegC / 10) * 1.8 + 32;
+        };
     }
 
     self.saveInput = function(input) {
@@ -271,8 +351,13 @@ var Settings = (function () {
         } else if(setting.type == 'string') {
             value = input.val();
         } else {
-            var multiplier = parseFloat(input.data('setting-multiplier') || 1);
-            value = parseFloat(input.val()) * multiplier;
+            var multiplier = input.data('setting-multiplier') || 1;
+            if (multiplier == 'FAHREN') {
+                value = Math.round(((parseFloat(input.val())-32) / 1.8) * 10);
+            } else {
+                multiplier = parseFloat(multiplier);
+                value = Math.round(parseFloat(input.val()) * multiplier);
+            }
         }
         return mspHelper.setSetting(settingName, value);
     };

main.css

@@ -2221,25 +2221,33 @@ ol li {
     position: relative;
 }
 
+.unit_wrapper input {
+    margin-right: 0 !important;
+}
+
+.unit_wrapper ~ label, select ~ label, input ~ label {
+    margin-left: 10px;
+}
+
 /* Position the unit to the right of the wrapper */
 .unit_wrapper::after {
     position: absolute;
     top: 2px;
-    right: .7em;
+    right: .5em;
     transition: all .05s ease-in-out;
 }
 
 /* Move unit more to the left on hover or focus within
      for arrow buttons will appear to the right of number inputs */
 .unit_wrapper:hover::after,
 .unit_wrapper:focus-within::after {
-    right: 1.3em;
+    right: 1.0em;
 }
 
 /* Handle Firefox (arrows always shown) */
 @supports (-moz-appearance:none) {
     .unit_wrapper::after {
-        right: 1.3em;
+        right: 1.0em;
     }
 }
 

src/css/tabs/configuration.css

@@ -28,12 +28,12 @@
     text-align: left;
     border: 1px solid silver;
     border-radius: 3px;
-    margin-right: 11px;
     font-size: 12px;
     font-weight: normal;
 }
 
 .config-section .number input,
+.config-section .checkbox input,
 .tab-configuration .number input {
     width: 106px;
 }
@@ -221,7 +221,7 @@ hr {
 
 .config-section label {
     position: absolute;
-    left: 118px;
+    left: 108px;
 }
 
 .config-section .radio label {

src/css/tabs/failsafe.css

@@ -26,7 +26,6 @@
     text-align: left;
     border: 1px solid silver;
     border-radius: 3px;
-    margin-right: 11px;
     font-size: 12px;
     font-weight: normal;
 }
@@ -253,10 +252,12 @@
     height: 90px;
 }
 
-.tab-failsafe .minimumDistance {
-    width: 100px !important;
-    padding-left: 3px;
-    margin-right: 11px;
+.tab-failsafe input {
+   width: 75px !important;
+}
+
+.tab-failsafe select {
+    width: 79px;
 }
 
 @media only screen and (max-width: 1055px) , only screen and (max-device-width: 1055px) {

src/css/tabs/firmware_flasher.css

@@ -271,7 +271,6 @@
     text-align: left;
     border: 1px solid silver;
     border-radius: 3px;
-    margin-right: 11px;
     margin-bottom: 5px;
     font-size: 12px;
     font-weight: normal;

src/css/tabs/osd.css

@@ -477,21 +477,19 @@ button {
 }
 
 .tab-osd .settings input {
-    width: 55px;
+    width: 75px;
     padding-left: 3px;
     height: 18px;
     line-height: 20px;
     text-align: left;
     border: 1px solid silver;
     border-radius: 3px;
-    margin-right: 11px;
     font-size: 11px;
     font-weight: normal;
 }
 
 .tab-osd .settings select {
     width: 75px;
-    margin-right: 11px;
 }
 
 .tab-osd .settings .switchery {