Merge pull request #1475 from iNavFlight/MrD_Add-precision-to-mAh-use…

…d-for-9999mAh Enhance mAh Used OSD Element
iNavFlight · May 7, 2022 · 91b58c8 · 91b58c8
2 parents aa21987 + 86da1cb
commit 91b58c8
Show file tree

Hide file tree

Showing 28 changed files with 201 additions and 186 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -2967,6 +2967,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/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
diff --git a/resources/osd/bold/211.png b/resources/osd/bold/211.png
diff --git 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
diff --git a/resources/osd/clarity/211.png b/resources/osd/clarity/211.png
diff --git 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
diff --git a/resources/osd/clarity_medium/211.png b/resources/osd/clarity_medium/211.png
diff --git 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
diff --git a/resources/osd/default/211.png b/resources/osd/default/211.png
diff --git a/resources/osd/iNav character map.md b/resources/osd/iNav character map.md
@@ -124,8 +124,9 @@ SYM_HEADING_E              | SYM.HEADING_E                | Heading graph East
 SYM_HEADING_W              | SYM.HEADING_W                | Heading graph West                    | 203        | 0xCB
 SYM_HEADING_DIVIDED_LINE   | SYM.HEADING_DIVIDED_LINE     | Heading graphic                       | 204        | 0xCC
 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_MAX			   		   | SYM.MAX			  		  | Max icon				  			  | 206	       | 0xCE
+SYM_PROFILE		   		   | SYM.PROFILE		  		  | Profile icon			              | 207	       | 0xCF
+SYM_AH  		   		   | SYM.AHI    		  		  | Amp Hours icon			              | 211	       | 0xD3
  | | | | 
 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
@@ -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
diff --git a/resources/osd/impact/211.png b/resources/osd/impact/211.png
diff --git 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
diff --git a/resources/osd/impact_mini/211.png b/resources/osd/impact_mini/211.png