From 2ab1b999951558bc1dcfd629c82b1019c0f74584 Mon Sep 17 00:00:00 2001 From: Matthieu Nelmes Date: Fri, 11 Dec 2020 22:37:51 +0000 Subject: [PATCH 01/17] Enables map to scale to 100% height of users window --- package-lock.json | 50 +++++++++++---------------------------- tabs/gps.html | 2 +- tabs/mission_control.html | 2 +- 3 files changed, 16 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b9ff52b..587b74dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "inav-configurator", - "version": "2.6.0", + "version": "2.7.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -44,7 +44,6 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -55,7 +54,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -2199,8 +2197,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -2218,13 +2215,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2237,18 +2232,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -2351,8 +2343,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -2362,7 +2353,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2375,20 +2365,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2405,7 +2392,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -2478,8 +2464,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -2489,7 +2474,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -2565,8 +2549,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -2596,7 +2579,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2614,7 +2596,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2653,13 +2634,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -3937,8 +3916,7 @@ "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "optional": true + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, "lowercase-keys": { "version": "1.0.1", @@ -4403,7 +4381,7 @@ "semver": "^5.5.0", "simple-glob": "~0.2.0", "tar-fs": "^1.13.0", - "temp": "github:adam-lynch/node-temp#remove_tmpdir_dep", + "temp": "github:adam-lynch/node-temp#279c1350cb7e4f02515d91da9e35d39a40774016", "thenify": "^3.3.0", "update-notifier": "^2.4.0", "winresourcer": "^0.9.0" diff --git a/tabs/gps.html b/tabs/gps.html index fcf63036..03db5254 100644 --- a/tabs/gps.html +++ b/tabs/gps.html @@ -86,7 +86,7 @@
-
+
diff --git a/tabs/mission_control.html b/tabs/mission_control.html index 0a9b6f3a..f707fade 100644 --- a/tabs/mission_control.html +++ b/tabs/mission_control.html @@ -114,7 +114,7 @@
-
+
From 64f25979c8581aa34affc4b60defdbfa537dcb1a Mon Sep 17 00:00:00 2001 From: Darren Lines Date: Sat, 26 Dec 2020 17:03:20 +0000 Subject: [PATCH 02/17] Fixed min/max values The min and max values were incorrect for accZero and accGain --- tabs/calibration.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tabs/calibration.html b/tabs/calibration.html index f9a08aef..8f2df330 100755 --- a/tabs/calibration.html +++ b/tabs/calibration.html @@ -54,15 +54,15 @@ - - - + + + - - - + + +
From d6ac97e80db5e356696b3180dc98ce6c27b146ee Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Mon, 28 Dec 2020 15:53:15 +0100 Subject: [PATCH 03/17] Fix syntax error in messages.json --- _locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 1f7c9672..fb410f5b 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2565,7 +2565,7 @@ }, "pitchToThrottleThresholdHelp": { "message": "The autopilot will instantly adjust the throttle level according to pitch to throttle if the pitch angle is more this many centidegrees from the filtered value." - } + }, "loiterRadius": { "message": "Loiter radius [cm]" }, From 646d7ef8356083a8baaccdd861aaf43c182da2cb Mon Sep 17 00:00:00 2001 From: Alexander van Saase Date: Sun, 3 Jan 2021 12:56:03 +0100 Subject: [PATCH 04/17] plus code type selection --- tabs/osd.html | 3 +++ tabs/osd.js | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tabs/osd.html b/tabs/osd.html index 0321e129..3b16a0be 100644 --- a/tabs/osd.html +++ b/tabs/osd.html @@ -71,6 +71,9 @@ + diff --git a/tabs/osd.js b/tabs/osd.js index 72916f93..8bb88790 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -1190,9 +1190,15 @@ OSD.constants = { name: 'PLUS_CODE', id: 97, preview: function() { + var pluscodeformat; let digits = parseInt(Settings.getInputValue('osd_plus_code_digits')) + 1; console.log("DITIS", digits); - return '9547X6PM+VWCCC'.substr(0, digits); + if (Settings.getInputValue('osd_plus_code_type') == 0) { + pluscodeformat = '9547X6PM+VWCCC'.substr(0, digits); + } else { + pluscodeformat = 'X6PM+VWCCC'.substr(0, digits-4); + } + return pluscodeformat; } }, { From 7a2da444b20a76f75859931cf1e37356ef093340 Mon Sep 17 00:00:00 2001 From: Alexander van Saase Date: Sun, 3 Jan 2021 13:13:35 +0100 Subject: [PATCH 05/17] Fix bug --- _locales/en/messages.json | 4 ++-- tabs/advanced_tuning.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index fb410f5b..61385d1c 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2561,10 +2561,10 @@ "message": "How smoothly the autopilot adjusts the throttle level in response to pitch angle changes [0-9]." }, "pitchToThrottleThreshold": { - "message": "Instantaneous pitch adjustment threshold [centidegrees]" + "message": "Instantaneous throttle adjustment threshold [centidegrees]" }, "pitchToThrottleThresholdHelp": { - "message": "The autopilot will instantly adjust the throttle level according to pitch to throttle if the pitch angle is more this many centidegrees from the filtered value." + "message": "The autopilot will instantly adjust the throttle level without smoothing according to pitch to throttle if the pitch angle is more this many centidegrees from the filtered value." }, "loiterRadius": { "message": "Loiter radius [cm]" diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html index 035c9130..cf3ab5af 100644 --- a/tabs/advanced_tuning.html +++ b/tabs/advanced_tuning.html @@ -388,7 +388,7 @@
- + @@ -396,7 +396,7 @@
- + From ea6844ef0c463c074f5dd95e03a8c0b6cb8b5d55 Mon Sep 17 00:00:00 2001 From: Alexander van Saase Date: Sun, 3 Jan 2021 14:07:51 +0100 Subject: [PATCH 06/17] Reorganize settings --- _locales/en/messages.json | 18 ++++++---- tabs/configuration.html | 69 +++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 41 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index fb410f5b..1affcc46 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -698,8 +698,8 @@ "configurationThrottleMinimumCommand": { "message": "Minimum Command" }, - "configurationBatteryVoltage": { - "message": "Battery Voltage" + "configurationVoltageCurrentSensor": { + "message": "Voltage and Current Sensors" }, "configurationBatteryCurrent": { "message": "Battery Current" @@ -734,10 +734,13 @@ "configurationBatteryScale": { "message": "Voltage Scale" }, - "configurationCurrent": { - "message": "Current Sensor" + "configurationBatteryVoltage": { + "message": "Battery Voltage" }, "configurationCurrentScale": { + "message": "Current Meter Scale" + }, + "configurationCurrentScaleHelp": { "message": "Scale the output voltage to milliamps [1/10th mV/A]" }, "configurationCurrentOffset": { @@ -746,8 +749,11 @@ "configurationBatteryMultiwiiCurrent": { "message": "Enable support for legacy Multiwii MSP current output" }, - "configurationBatteryCapacity": { - "message": "Battery Capacity" + "configurationBatterySettings": { + "message": "Battery Settings" + }, + "configurationBatterySettingsHelp": { + "message": "These settings apply to the currently selected battery profile " }, "configurationBatteryCapacityValue": { "message": "Capacity" diff --git a/tabs/configuration.html b/tabs/configuration.html index 29eec03f..5f45cf0c 100644 --- a/tabs/configuration.html +++ b/tabs/configuration.html @@ -253,7 +253,7 @@
-
+
@@ -273,32 +273,7 @@
-
- - -
-
-
- - -
-
-
- - -
-
- - -
-
- - -
+
-
-
-
-
-
-
-
@@ -347,14 +316,44 @@
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
From bcf5af7a5709d40fc41196ea10221645eda597bc Mon Sep 17 00:00:00 2001 From: Alexander van Saase Date: Mon, 4 Jan 2021 20:54:50 +0100 Subject: [PATCH 07/17] Added options for COUNTRY (2 digits trimmed) and FIELD (6 digits trimmed) --- tabs/osd.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tabs/osd.js b/tabs/osd.js index 8bb88790..4664bf36 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -1190,15 +1190,10 @@ OSD.constants = { name: 'PLUS_CODE', id: 97, preview: function() { - var pluscodeformat; let digits = parseInt(Settings.getInputValue('osd_plus_code_digits')) + 1; + let digitsRemoved = parseInt(Settings.getInputValue('osd_plus_code_type')) * 2; console.log("DITIS", digits); - if (Settings.getInputValue('osd_plus_code_type') == 0) { - pluscodeformat = '9547X6PM+VWCCC'.substr(0, digits); - } else { - pluscodeformat = 'X6PM+VWCCC'.substr(0, digits-4); - } - return pluscodeformat; + return '9547X6PM+VWCCC'.substr(digitsRemoved, digits-digitsRemoved); } }, { From a6859fee9bf61b35d9e589b543c4482227d51c04 Mon Sep 17 00:00:00 2001 From: Alexander van Saase Date: Mon, 4 Jan 2021 21:22:39 +0100 Subject: [PATCH 08/17] Rename type to format --- _locales/en/messages.json | 3 +++ tabs/osd.html | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index fb410f5b..5f39ac5c 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -3064,6 +3064,9 @@ "osdSettingMainVoltageDecimals": { "message": "Main voltage decimals" }, + "osdSettingPLUS_CODE_FORMAT_HELP": { + "message": "COUNTRY, LOCAL and FIELD require a reference location within respectively ~800km, ~40km and ~2km to recover the original coordinates." + }, "osdSettingCRSF_LQ_FORMAT_HELP": { "message": "TYPE1 shows LQ% as used by TBS hardware. TYPE2 shows RF Profile Modes (2=150Hz, 1=50Hz, 0=4Hz update rates) and LQ % [0..100%]. Tracer shows RFMode 1 (1=250Hz) and LQ % [0..100%]." }, diff --git a/tabs/osd.html b/tabs/osd.html index 3b16a0be..5a29c3cc 100644 --- a/tabs/osd.html +++ b/tabs/osd.html @@ -71,8 +71,9 @@ +
From 27d29354b6df0c92da4d145b954342ca1d34b3e3 Mon Sep 17 00:00:00 2001 From: Alexander van Saase Date: Tue, 5 Jan 2021 19:35:34 +0100 Subject: [PATCH 11/17] Change CLI command --- tabs/osd.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabs/osd.html b/tabs/osd.html index 4dd582a3..862175a1 100644 --- a/tabs/osd.html +++ b/tabs/osd.html @@ -88,7 +88,7 @@ Sidebar Scroll Arrows
From 8bf8ed2c5ddfb6838ba9af179216da77e532d7b5 Mon Sep 17 00:00:00 2001 From: Alexander van Saase Date: Wed, 6 Jan 2021 12:02:22 +0100 Subject: [PATCH 12/17] update for fw compatibility --- _locales/en/messages.json | 7 +++++-- tabs/osd.html | 5 +++-- tabs/osd.js | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 5f39ac5c..8c87dfec 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -3064,8 +3064,11 @@ "osdSettingMainVoltageDecimals": { "message": "Main voltage decimals" }, - "osdSettingPLUS_CODE_FORMAT_HELP": { - "message": "COUNTRY, LOCAL and FIELD require a reference location within respectively ~800km, ~40km and ~2km to recover the original coordinates." + "osdSettingPLUS_CODE_DIGITS_HELP": { + "message": "Precision at the equator: 10=13.9x13.9m; 11=2.8x3.5m; 12=56x87cm; 13=11x22cm." + }, + "osdSettingPLUS_CODE_SHORT_HELP": { + "message": "Removing 2, 4 and 6 leading digits requires a reference location within, respectively, ~800km, ~40km and ~2km to recover the original coordinates." }, "osdSettingCRSF_LQ_FORMAT_HELP": { "message": "TYPE1 shows LQ% as used by TBS hardware. TYPE2 shows RF Profile Modes (2=150Hz, 1=50Hz, 0=4Hz update rates) and LQ % [0..100%]. Tracer shows RFMode 1 (1=250Hz) and LQ % [0..100%]." diff --git a/tabs/osd.html b/tabs/osd.html index 5a29c3cc..371fbdc9 100644 --- a/tabs/osd.html +++ b/tabs/osd.html @@ -68,12 +68,13 @@ +
-
+