Merge branch 'master' into MrD-Add-OSD-elements-for-gliders

author: Darren Lines <darren@darrenlines.uk> 2022-05-08 00:07:49 +0300
committer: Darren Lines <darren@darrenlines.uk> 2022-05-08 00:07:49 +0300
commit: dc506f7424d99ea9188cbb736704b4211d4c91b0 (patch)
tree: 1c77bd889cc49949951152d9f990a726729272d7
parent: bdb3bf5c8c373395851656adc38e9cd9a4524194 (diff)
parent: 611b5895ecd99e0520d0a4a6c931be3c09a56675 (diff)
30 files changed, 224 insertions, 186 deletions
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 0d31e2ce..42299e07 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -932,6 +932,12 @@
     "configurationLaunchIdleThrHelp": {
         "message": "Idle throttle - throttle to be set before launch sequence is initiated. If set below minimum throttle it will force motor stop or at idle throttle (depending if the MOTOR_STOP is enabled). If set above minimum throttle it will force throttle to this value (if MOTOR_STOP is enabled it will be handled according to throttle stick position). Default: 1000 [1000-2000]"
     },
+    "configurationLaunchIdleDelay": {
+        "message": "Idle Throttle Delay"
+    },
+    "configurationLaunchIdleDelayHelp": {
+        "message": "Set a time delay between raising the throttle for the launch, and the motor starting at idle throttle. Default: 0 [0-60000]"
+    },
     "configurationLaunchMotorDelay": {
         "message": "Motor Delay"
     },
@@ -2967,6 +2973,9 @@
     "osd_main_voltage_decimals": {
         "message" : "Voltage Decimals"
     },
+    "osd_mah_used_precision": {
+        "message" : "mAh Used Precision"
+    },
     "osd_coordinate_digits": {
         "message" : "Coordinate Digits"
     },
diff --git a/js/fc.js b/js/fc.js
index a90fc256..5ad7275a 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -1223,6 +1223,9 @@ var FC = {
                     35: "Loiter Radius [cm]",
                     36: "Active Profile",
                     37: "Battery cells",
+                    38: "AGL status [0/1]",
+                    39: "AGL [cm]",
+                    40: "Rangefinder [cm]",
                 }
             },
             3: {
diff --git a/resources/osd/bold.mcm b/resources/osd/bold.mcm
index 6e6758ff..a68866ba 100644
--- a/resources/osd/bold.mcm
+++ b/resources/osd/bold.mcm
@@ -13521,30 +13521,30 @@ MAX7456
 01010101
 01010101
 01010101
+01010100
+00010100
 01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01010010
+10000010
+00010101
+01001000
+00100010
+00000101
+01001000
+00100010
+00100001
+01001010
+10100010
+10001000
+01001000
+00100010
+00001000
+01001000
+00100010
+00001000
+01010001
+01000100
+01010001
 01010101
 01010101
 01010101
diff --git a/resources/osd/bold.png b/resources/osd/bold.png
index 48f13fc3..367ce3d6 100644
--- a/resources/osd/bold.png
+++ b/resources/osd/bold.png
diff --git a/resources/osd/bold/211.png b/resources/osd/bold/211.png
new file mode 100644
index 00000000..80890954
--- /dev/null
+++ b/resources/osd/bold/211.png
diff --git a/resources/osd/clarity.mcm b/resources/osd/clarity.mcm
index d18efa91..b439f533 100644
--- a/resources/osd/clarity.mcm
+++ b/resources/osd/clarity.mcm
@@ -13521,33 +13521,33 @@ MAX7456
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000100
 01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01001000
+00100010
+00010101
+01001000
+00100010
+00000101
+01001010
+10100010
+00100001
+01001000
+00100010
+10001000
+01001000
+00100010
+00001000
+01001000
+00100010
+00001000
+01010001
+01000100
+01010001
 01010101
 01010101
 01010101
diff --git a/resources/osd/clarity.png b/resources/osd/clarity.png
index 373358ae..d2de5017 100644
--- a/resources/osd/clarity.png
+++ b/resources/osd/clarity.png
diff --git a/resources/osd/clarity/211.png b/resources/osd/clarity/211.png
new file mode 100644
index 00000000..22e5a92a
--- /dev/null
+++ b/resources/osd/clarity/211.png
diff --git a/resources/osd/clarity_medium.mcm b/resources/osd/clarity_medium.mcm
index 94cdde0e..378bf516 100644
--- a/resources/osd/clarity_medium.mcm
+++ b/resources/osd/clarity_medium.mcm
@@ -13530,30 +13530,30 @@ MAX7456
 01010101
 01010101
 01010101
+01010100
+00010100
 01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01010010
+10000010
+00010101
+01001000
+00100010
+00000101
+01001000
+00100010
+00100001
+01001010
+10100010
+10001000
+01001000
+00100010
+00001000
+01001000
+00100010
+00001000
+01010001
+01000100
+01010001
 01010101
 01010101
 01010101
diff --git a/resources/osd/clarity_medium.png b/resources/osd/clarity_medium.png
index ba096c7c..bfdf710e 100644
--- a/resources/osd/clarity_medium.png
+++ b/resources/osd/clarity_medium.png
diff --git a/resources/osd/clarity_medium/211.png b/resources/osd/clarity_medium/211.png
new file mode 100644
index 00000000..84af31be
--- /dev/null
+++ b/resources/osd/clarity_medium/211.png
diff --git a/resources/osd/default.mcm b/resources/osd/default.mcm
index bdad543f..8ffc16fe 100644
--- a/resources/osd/default.mcm
+++ b/resources/osd/default.mcm
@@ -13521,30 +13521,30 @@ MAX7456
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000100
 01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01001000
+00100010
+00010101
+01001000
+00100010
+00000101
+01001010
+10100010
+10100001
+01001000
+00100010
+00001000
+01001000
+00100010
+00001000
+01010001
+01000100
+01010001
 01010101
 01010101
 01010101
diff --git a/resources/osd/default.png b/resources/osd/default.png
index 948ea155..30c4333e 100644
--- a/resources/osd/default.png
+++ b/resources/osd/default.png
diff --git a/resources/osd/default/211.png b/resources/osd/default/211.png
new file mode 100644
index 00000000..eea24933
--- /dev/null
+++ b/resources/osd/default/211.png
diff --git a/resources/osd/iNav character map.md b/resources/osd/iNav character map.md
index 43aa4f14..5164a743 100644
--- a/resources/osd/iNav character map.md
+++ b/resources/osd/iNav character map.md
@@ -126,8 +126,16 @@ SYM_HEADING_DIVIDED_LINE   | SYM.HEADING_DIVIDED_LINE     | Heading graphic
 SYM_HEADING_LINE           | SYM.HEADING_LINE             | Heading graphic                       | 205        | 0xCD
 SYM_MAX                    | SYM.MAX                      | Max icon                              | 206	       | 0xCE
 SYM_PROFILE		           | SYM.PROFILE		          | Profile icon			              | 207	       | 0xCF
-SYM_GLIDE_DIST		       | SYM.GLIDE_DIST				  | Glide Distance                        | 208        | 0xD0
-SYM_GLIDE_MINS		       | SYM.GLIDE_MINS				  | Glide Time Mins                       | 209        | 0xD1
+SYM_SWITCH_INDICATOR_LOW   | N/A        		          | Switch: down                          | 208	       | 0xD0
+SYM_SWITCH_INDICATOR_LOW   | N/A        		          | Switch: middle                        | 209	       | 0xD1
+SYM_SWITCH_INDICATOR_LOW   | SYM.SWITCH_INDICATOR_HIGH    | Switch: up                            | 210	       | 0xD2
+SYM_AH  		   		   | SYM.AHI    		  		  | Amp Hours icon			              | 211	       | 0xD3
+SYM_GLIDE_DIST		       | SYM.GLIDE_DIST				  | Glide Distance                        | 212        | 0xD4
+SYM_GLIDE_MINS		       | SYM.GLIDE_MINS				  | Glide Time Mins                       | 213        | 0xD5
+SYM_AH_V_FT_0              | SYM.AH_V_FT_0                | Climb efficiency: imperial L side     | 214        | 0xD6
+SYM_AH_V_FT_1              | SYM.AH_V_FT_1                | Climb efficiency: imperial R side     | 215        | 0xD7
+SYM_AH_V_M_0               | SYM.AH_V_M_0                 | Climb efficiency: metric L side       | 216        | 0xD8
+SYM_AH_V_M_1               | SYM.AH_V_M_1                 | Climb efficiency: metric R side       | 217        | 0xD9
  | | | | 
 SYM_LOGO_START             |                              | INAV Logo                             | 257 - 280  | 0x101 - 0x118
 SYM_AH_LEFT                | SYM.AH_LEFT                  | AHI Arrow left                        | 300        | 0x12C
diff --git a/resources/osd/impact.mcm b/resources/osd/impact.mcm
index 9b8c49c5..01d9ead9 100644
--- a/resources/osd/impact.mcm
+++ b/resources/osd/impact.mcm
@@ -13527,30 +13527,30 @@ MAX7456
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01010010
+10000100
+01000101
+01001000
+00100010
+00100001
+01001000
+00100010
+00100001
+01001010
+10100010
+10100001
+01001000
+00100010
+00100001
+01001000
+00100010
+00100001
+01010001
+01000100
+01000101
 01010101
 01010101
 01010101
diff --git a/resources/osd/impact.png b/resources/osd/impact.png
index 131ad2bd..d71fa38e 100644
--- a/resources/osd/impact.png
+++ b/resources/osd/impact.png
diff --git a/resources/osd/impact/211.png b/resources/osd/impact/211.png
new file mode 100644
index 00000000..78a002ef
--- /dev/null
+++ b/resources/osd/impact/211.png
diff --git a/resources/osd/impact_mini.mcm b/resources/osd/impact_mini.mcm
index afc7f3cb..7fda43a0 100644
--- a/resources/osd/impact_mini.mcm
+++ b/resources/osd/impact_mini.mcm
@@ -13524,30 +13524,30 @@ MAX7456
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01010010
+10000100
+01000101
+01001000
+00100010
+00100001
+01001000
+00100010
+00100001
+01001010
+10100010
+10100001
+01001000
+00100010
+00100001
+01001000
+00100010
+00100001
+01010001
+01000100
+01000101
 01010101
 01010101
 01010101
diff --git a/resources/osd/impact_mini.png b/resources/osd/impact_mini.png
index d87fd6e2..9b884d55 100644
--- a/resources/osd/impact_mini.png
+++ b/resources/osd/impact_mini.png
diff --git a/resources/osd/impact_mini/211.png b/resources/osd/impact_mini/211.png
new file mode 100644
index 00000000..133773a8
--- /dev/null
+++ b/resources/osd/impact_mini/211.png
diff --git a/resources/osd/large.mcm b/resources/osd/large.mcm
index 4fe33386..8f5335ef 100644
--- a/resources/osd/large.mcm
+++ b/resources/osd/large.mcm
@@ -13521,33 +13521,33 @@ MAX7456
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000100
 01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01001000
+00100010
+00010101
+01001000
+00100010
+00000101
+01001010
+10100010
+00100001
+01001000
+00100010
+10001000
+01001000
+00100010
+00001000
+01001000
+00100010
+00001000
+01010001
+01000100
+01010001
 01010101
 01010101
 01010101
diff --git a/resources/osd/large.png b/resources/osd/large.png
index a6d1d7f0..71f0e827 100644
--- a/resources/osd/large.png
+++ b/resources/osd/large.png
diff --git a/resources/osd/large/211.png b/resources/osd/large/211.png
new file mode 100644
index 00000000..25a8ea30
--- /dev/null
+++ b/resources/osd/large/211.png
diff --git a/resources/osd/vision.mcm b/resources/osd/vision.mcm
index d53cc13e..117a9c6b 100644
--- a/resources/osd/vision.mcm
+++ b/resources/osd/vision.mcm
@@ -13531,26 +13531,26 @@ MAX7456
 01010101
 01010101
 01010101
+00010101
 01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01010100
+10000100
+01000101
+01010010
+00100010
+00100001
+01010010
+10100010
+00100001
+01010010
+00100010
+10100001
+01010010
+00100010
+00100001
+01010100
+01000100
+01000101
 01010101
 01010101
 01010101
diff --git a/resources/osd/vision.png b/resources/osd/vision.png
index fe2ba791..ee013a7e 100644
--- a/resources/osd/vision.png
+++ b/resources/osd/vision.png
diff --git a/resources/osd/vision/211.png b/resources/osd/vision/211.png
new file mode 100644
index 00000000..3e564f87
--- /dev/null
+++ b/resources/osd/vision/211.png
diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html
index ce531bb0..cb86bdfe 100644
--- a/tabs/advanced_tuning.html
+++ b/tabs/advanced_tuning.html
@@ -15,6 +15,13 @@
                             <label for="launchIdleThr"><span data-i18n="configurationLaunchIdleThr"></span></label>
                             <div class="helpicon cf_tip" data-i18n_title="configurationLaunchIdleThrHelp"></div>
                         </div>
+
+                        <div class="number">
+                            <input type="number" id="launchIdleDelay" data-unit="ms" data-setting="nav_fw_launch_idle_motor_delay" data-setting-multiplier="1" step="1" min="0" max="60000" />
+                            <label for="launchIdleDelay"><span data-i18n="configurationLaunchIdleDelay"></span></label>
+                            <div class="helpicon cf_tip" data-i18n_title="configurationLaunchIdleDelayHelp"></div>
+                        </div>
+
                         <div class="number">
                             <input type="number" id="launchMaxAngle" data-unit="deg" data-setting="nav_fw_launch_max_angle" data-setting-multiplier="1" step="1" min="5" max="180" />
                             <label for="launchMaxAngle"><span data-i18n="configurationLaunchMaxAngle"></span></label>
diff --git a/tabs/osd.html b/tabs/osd.html
index 45ae0687..774aaff6 100644
--- a/tabs/osd.html
+++ b/tabs/osd.html
@@ -67,6 +67,10 @@
                                 <span data-i18n="osd_main_voltage_decimals"></span>
                             </label>
                             <label>
+                                <select class="update_preview" data-setting="osd_mah_used_precision" data-live="true"></select>
+                                <span data-i18n="osd_mah_used_precision"></span>
+                            </label>
+                            <label>
                                 <select class="update_preview" data-setting="osd_coordinate_digits" data-live="true"></select>
                                 <span data-i18n="osd_coordinate_digits"></span>
                             </label>
diff --git a/tabs/osd.js b/tabs/osd.js
index 2682c242..a87a1489 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -410,6 +410,13 @@ function osdMainBatteryPreview() {
     return FONT.symbol(SYM.BATT) + FONT.embed_dot(s);
 }
 
+function osdmAhdrawnPreview() {
+    let precision = Settings.getInputValue('osd_mah_used_precision');
+    let preview = "1215075".substring(0, precision);
+
+    return preview + FONT.symbol(SYM.MAH);
+}
+
 function osdCoordinatePreview(symbol, coordinate) {
     return function() {
         var digits = Settings.getInputValue('osd_coordinate_digits');
@@ -1247,7 +1254,7 @@ OSD.constants = {
                     name: 'MAH_DRAWN',
                     id: 12,
                     preview: function() {
-                        return '1034' + FONT.symbol(SYM.MAH); // 4 chars
+                        return osdmAhdrawnPreview();
                     }
                 },
                 {
author	Darren Lines <darren@darrenlines.uk>	2022-05-08 00:07:49 +0300
committer	Darren Lines <darren@darrenlines.uk>	2022-05-08 00:07:49 +0300
commit	dc506f7424d99ea9188cbb736704b4211d4c91b0 (patch)
tree	1c77bd889cc49949951152d9f990a726729272d7
parent	bdb3bf5c8c373395851656adc38e9cd9a4524194 (diff)
parent	611b5895ecd99e0520d0a4a6c931be3c09a56675 (diff)