Merge pull request #1331 from MrD-RC/add-icon-for-VTX-power

Add icon for vtx power
3 years ago · 91983b88de
parent 14de77e5dc f3fba95c0a
commit 91983b88de
26 changed files with 310 additions and 309 deletions
--- a/resources/osd/bold.mcm
+++ b/resources/osd/bold.mcm
@ -2498,48 +2498,48 @@ MAX7456
 01010101
 01010101
 01010101
+01000100
+01000000
 01010101
+00100010
+00101010
+00010101
+00100010
+00001000
 01010101
+00100010
+00001000
+00010001
+00100010
+00001000
+10001000
+01001000
+01001000
+00100001
+01001000
+01001000
+10001000
+01010001
+01010001
+00000001
 01010101
+01010100
+00100001
 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
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01000010
+00100001
+01010100
+00100010
+00100001
+01000010
+00100010
+00100001
+00100010
+00100010
+00100001
+00000000
+00000000
+00000001
 01010101
 01010101
 01010101
--- a/resources/osd/bold.png
+++ b/resources/osd/bold.png
--- a/resources/osd/bold/039.png
+++ b/resources/osd/bold/039.png
--- a/resources/osd/clarity.mcm
+++ b/resources/osd/clarity.mcm
@ -2504,48 +2504,48 @@ MAX7456
 01010101
 01010101
 01010101
+01000100
+01000000
+01000100
+00100010
+00101010
+00100010
+00100010
+00001000
+00100010
+00100010
+00001000
+01001000
+01001000
+01001000
+00100010
+01001000
+01001000
+00100010
+01010001
+01010001
+01000100
 01010101
 01010101
+01000101
 01010101
+01010100
+00100001
 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
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01000010
+00100001
+01010100
+00100010
+00100001
+01000010
+00100010
+00100001
+00100010
+00100010
+00100001
+00000000
+00000000
+00000001
 01010101
 01010101
 01010101
--- a/resources/osd/clarity.png
+++ b/resources/osd/clarity.png
--- a/resources/osd/clarity/039.png
+++ b/resources/osd/clarity/039.png
--- a/resources/osd/clarity_medium.mcm
+++ b/resources/osd/clarity_medium.mcm
@ -2504,48 +2504,48 @@ MAX7456
 01010101
 01010101
 01010101
+01000100
+01000000
+01000100
+00100010
+00101010
+00100010
+00100010
+00001000
+00100010
+00100010
+00001000
+01001000
+01001000
+01001000
+00100010
+01001000
+01001000
+00100010
+01010001
+01010001
+01000100
 01010101
 01010101
+01000101
 01010101
+01010100
+00100001
 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
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01000010
+00100001
+01010100
+00100010
+00100001
+01000010
+00100010
+00100001
+00100010
+00100010
+00100001
+00000000
+00000000
+00000001
 01010101
 01010101
 01010101
--- a/resources/osd/clarity_medium.png
+++ b/resources/osd/clarity_medium.png
--- a/resources/osd/clarity_medium/039.png
+++ b/resources/osd/clarity_medium/039.png
--- a/resources/osd/default.mcm
+++ b/resources/osd/default.mcm
@ -2501,48 +2501,48 @@ MAX7456
 01010101
 01010101
 01010101
+01000100
+01000000
 01010101
+00100010
+00101010
+00010101
+00100010
+00001000
+00010001
+00100010
+00001000
+10001000
+01001000
+01001000
+00100001
+01001000
+01001000
+10001000
+01010001
+01010001
+00000001
 01010101
 01010101
+01000101
 01010101
+01010100
+00100001
 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
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01000010
+00100001
+01010100
+00100010
+00100001
+01000010
+00100010
+00100001
+00100010
+00100010
+00100001
+00000000
+00000000
+00000001
 01010101
 01010101
 01010101
--- a/resources/osd/default.png
+++ b/resources/osd/default.png
--- a/resources/osd/default/039.png
+++ b/resources/osd/default/039.png
--- a/resources/osd/iNav
+++ b/resources/osd/iNav
@ -33,7 +33,7 @@ _ASCII_ _*_                |                              | #
 SYM_AH_MI                  |                              | Ah per Mile                           | 036        | 0x24
 _ASCII_ _*_                |                              | %                                     | 037        | 0x25
 _ASCII_ _*_                |                              | &                                     | 038        | 0x26
---                        | ---                          | ---                                   | 039        | 0x27
+SYM_VTX_POWER              | SYM.VTX_POWER                | VTx Power                             | 039        | 0x27
 _ASCII_ _*_                |                              | Symbols and numbers                   | 040 - 062  | 0x28 - 0x3E
 SYM_AH_NM                  | SYM.AH_NM                    | Ah per Nautical Mile                  | 063        | 0x3F
 _ASCII_ _*_                |                              | Alphabet and symbols                  | 064 - 095  | 0x40 - 0x5F
--- a/resources/osd/impact.mcm
+++ b/resources/osd/impact.mcm
@ -2501,51 +2501,51 @@ MAX7456
 01010101
 01010101
 01010101
+01000100
+01000000
 01010101
+00100010
+00101010
+00010101
+00100010
+00001000
+00010001
+00100010
+00001000
+10001000
+01001000
+01001000
+00100001
+01001000
+01001000
+10001000
+01010001
+01010001
+00000001
 01010101
 01010101
+00000101
 01010101
+01010100
+10100001
 01010101
+01000000
+10100001
 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
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+00101000
+10100001
+01010000
+00101000
+10100001
+01001010
+00101000
+10100001
+01001010
+00101000
+10100001
+01010000
+00000000
+00000101
 01010101
 01010101
 01010101
--- a/resources/osd/impact.png
+++ b/resources/osd/impact.png
--- a/resources/osd/impact/039.png
+++ b/resources/osd/impact/039.png
--- a/resources/osd/impact_mini.mcm
+++ b/resources/osd/impact_mini.mcm
@ -2501,51 +2501,51 @@ MAX7456
 01010101
 01010101
 01010101
+01000100
+01000000
 01010101
+00100010
+00101010
+00010101
+00100010
+00001000
+00010001
+00100010
+00001000
+10001000
+01001000
+01001000
+00100001
+01001000
+01001000
+10001000
+01010001
+01010000
+00000001
 01010101
 01010101
+00000101
 01010101
+01010100
+10100001
 01010101
+01000000
+10100001
 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
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+00101000
+10100001
+01010000
+00101000
+10100001
+01001010
+00101000
+10100001
+01001010
+00101000
+10100001
+01010000
+00000000
+00000101
 01010101
 01010101
 01010101
--- a/resources/osd/impact_mini.png
+++ b/resources/osd/impact_mini.png
--- a/resources/osd/impact_mini/039.png
+++ b/resources/osd/impact_mini/039.png
--- a/resources/osd/large.mcm
+++ b/resources/osd/large.mcm
@ -2501,48 +2501,48 @@ MAX7456
 01010101
 01010101
 01010101
+01000100
+01000000
+01000100
+00100010
+00101010
+00100010
+00100010
+00001000
+00100010
+00100010
+00001000
+00001000
+00100010
+00001000
+00100010
+01001000
+01001000
+00100010
+01010001
+01010001
+01000100
 01010101
 01010101
+01000101
 01010101
+01010100
+00100001
 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
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01000010
+00100001
+01010100
+00100010
+00100001
+01000010
+00100010
+00100001
+00100010
+00100010
+00100001
+00000000
+00000000
+00000001
 01010101
 01010101
 01010101
--- a/resources/osd/large.png
+++ b/resources/osd/large.png
--- a/resources/osd/large/039.png
+++ b/resources/osd/large/039.png
--- a/resources/osd/vision.mcm
+++ b/resources/osd/vision.mcm
@ -2501,51 +2501,51 @@ MAX7456
 01010101
 01010101
 01010101
+01000100
+01000000
+01000100
+00100010
+00101010
+00100010
+00100010
+00001000
+00100010
+00100010
+00001000
+00001000
+00100010
+00001000
+00100010
+01001000
+01001000
+00100010
+01010001
+01010001
+01000100
 01010101
+01010100
+00010101
 01010101
+01010010
+10000101
 01010101
+01010010
+10000101
 01010101
+00000010
+10000101
+01010100
+10100010
+10000101
+01010100
+10100010
+10000101
+01010100
+10100010
+10000101
 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
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+00000000
+00010101
 01010101
 01010101
 01010101
--- a/resources/osd/vision.png
+++ b/resources/osd/vision.png
--- a/resources/osd/vision/039.png
+++ b/resources/osd/vision/039.png
--- a/tabs/osd.js
+++ b/tabs/osd.js
@ -98,6 +98,7 @@ SYM.MAH_NM_0 = 0x60;
 SYM.MAH_NM_1 = 0x61;
 SYM.AH_NM = 0x3F;
 SYM.WH_NM = 0x70;
+SYM.VTX_POWER = 0x27;
 SYM.MAX = 0xCE;

 SYM.AH_AIRCRAFT0 = 0x1A2;
@ -1636,7 +1637,7 @@ OSD.constants = {
                {
                    name: 'VTX_POWER',
                    id: 105,
-                    preview: '1'
+                    preview: FONT.symbol(SYM.VTX_POWER) + '1'
                },
            ]
        },