Add Estimated Fresnel Altitude as OSD element

Initial cut
1 year ago · bf5747460e
parent d1fab85509
commit bf5747460e
22 changed files with 337 additions and 320 deletions
--- a/resources/osd/INAV
+++ b/resources/osd/INAV
@ -322,5 +322,6 @@
 | ![Pan centred](/resources/osd/digital/default/24x36/454.png)      | SYM_SERVO_PAN_IS_CENTRED   |                              | Pan servo is centred                  | 454        | 0x1C6         |
 | ![Pan Left](/resources/osd/digital/default/24x36/455.png)         | SYM_SERVO_PAN_IS_OFFSET_L  | SYM.PAN_SERVO_IS_OFFSET_L    | Pan servo is moved to the left        | 455        | 0x1C7         |
 | ![Pan Right](/resources/osd/digital/default/24x36/456.png)        | SYM_SERVO_PAN_IS_OFFSET_R  |                              | Pan servo is moved to the right       | 456        | 0x1C8         |
+| ![EFA](/resources/osd/digital/default/24x36/457.png)              | SYM_EST_FRESNEL_ALT        | SYM.EST_FRESNEL_ALT          | Estimated Fresnel Altitude            | 457        | 0x1C9         |

 _*_ Do not change the IDs of these characters
--- a/resources/osd/analogue/bold.mcm
+++ b/resources/osd/analogue/bold.mcm
@ -29250,54 +29250,54 @@ MAX7456
 01010101
 01010101
 01010101
+01000000
+01000001
+01000001
+00101010
+00101000
+00101000
+00100000
+00100000
+10000010
+00101010
+00101000
+10000010
+00100000
+00100000
+10101010
+00101010
+00100000
+10000010
+01000000
+01000101
+00010100
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000101
 01010101
+01001000
+00100001
+01010100
+00100001
+01001000
+01010010
+00100001
+01001000
+01010010
+01000101
+01010010
+00001000
 01010101
+01010100
+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
-01010101
-01010101
+00000101
 01010101
 01010101
 01010101
--- a/resources/osd/analogue/bold.png
+++ b/resources/osd/analogue/bold.png
--- a/resources/osd/analogue/clarity.mcm
+++ b/resources/osd/analogue/clarity.mcm
@ -29250,54 +29250,54 @@ MAX7456
 01010101
 01010101
 01010101
+01000000
+01000001
+01000001
+00101010
+00101000
+00101000
+00100000
+00100000
+10000010
+00101010
+00101000
+10000010
+00100000
+00100000
+10101010
+00101010
+00100000
+10000010
+01000000
+01000101
+00010100
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000101
 01010101
+01001000
+00100001
+01010100
+00100001
+01001000
+01010010
+00100001
+01001000
+01010010
+01000101
+01010010
+00001000
 01010101
+01010100
+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
-01010101
-01010101
+00000101
 01010101
 01010101
 01010101
--- a/resources/osd/analogue/clarity.png
+++ b/resources/osd/analogue/clarity.png
--- a/resources/osd/analogue/clarity_medium.mcm
+++ b/resources/osd/analogue/clarity_medium.mcm
@ -29250,54 +29250,54 @@ MAX7456
 01010101
 01010101
 01010101
+01000000
+01000001
+01000001
+00101010
+00101000
+00101000
+00100000
+00100000
+10000010
+00101010
+00101000
+10000010
+00100000
+00100000
+10101010
+00101010
+00100000
+10000010
+01000000
+01000101
+00010100
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000101
 01010101
+01001000
+00100001
+01010100
+00100001
+01001000
+01010010
+00100001
+01001000
+01010010
+01000101
+01010010
+00001000
 01010101
+01010100
+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
-01010101
-01010101
+00000101
 01010101
 01010101
 01010101
--- a/resources/osd/analogue/clarity_medium.png
+++ b/resources/osd/analogue/clarity_medium.png
--- a/resources/osd/analogue/default.mcm
+++ b/resources/osd/analogue/default.mcm
@ -29250,54 +29250,54 @@ MAX7456
 01010101
 01010101
 01010101
+01000000
+01000001
+01000001
+00101010
+00101000
+00101000
+00100000
+00100000
+10000010
+00101010
+00101000
+10000010
+00100000
+00100000
+10101010
+00101010
+00100000
+10000010
+01000000
+01000101
+00010100
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000101
 01010101
+01001000
+00100001
+01010100
+00100001
+01001000
+01010010
+00100001
+01001000
+01010010
+01000101
+01010010
+00001000
 01010101
+01010100
+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
-01010101
-01010101
+00000101
 01010101
 01010101
 01010101
--- a/resources/osd/analogue/default.png
+++ b/resources/osd/analogue/default.png
--- a/resources/osd/analogue/default/457.png
+++ b/resources/osd/analogue/default/457.png
--- a/resources/osd/analogue/impact.mcm
+++ b/resources/osd/analogue/impact.mcm
@ -29250,54 +29250,54 @@ MAX7456
 01010101
 01010101
 01010101
+01000000
+01000001
+01000001
+00101010
+00101000
+00101000
+00100000
+00100000
+10000010
+00101010
+00101000
+10000010
+00100000
+00100000
+10101010
+00101010
+00100000
+10000010
+01000000
+01000101
+00010100
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000101
 01010101
+01001000
+00100001
+01010100
+00100001
+01001000
+01010010
+00100001
+01001000
+01010010
+01000101
+01010010
+00001000
 01010101
+01010100
+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
-01010101
-01010101
+00000101
 01010101
 01010101
 01010101
--- a/resources/osd/analogue/impact.png
+++ b/resources/osd/analogue/impact.png
--- a/resources/osd/analogue/impact_mini.mcm
+++ b/resources/osd/analogue/impact_mini.mcm
@ -29250,54 +29250,54 @@ MAX7456
 01010101
 01010101
 01010101
+01000000
+01000001
+01000001
+00101010
+00101000
+00101000
+00100000
+00100000
+10000010
+00101010
+00101000
+10000010
+00100000
+00100000
+10101010
+00101010
+00100000
+10000010
+01000000
+01000101
+00010100
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000101
 01010101
+01001000
+00100001
+01010100
+00100001
+01001000
+01010010
+00100001
+01001000
+01010010
+01000101
+01010010
+00001000
 01010101
+01010100
+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
-01010101
-01010101
+00000101
 01010101
 01010101
 01010101
--- a/resources/osd/analogue/impact_mini.png
+++ b/resources/osd/analogue/impact_mini.png
--- a/resources/osd/analogue/large.mcm
+++ b/resources/osd/analogue/large.mcm
@ -29250,54 +29250,54 @@ MAX7456
 01010101
 01010101
 01010101
+01000000
+01000001
+01000001
+00101010
+00101000
+00101000
+00100000
+00100000
+10000010
+00101010
+00101000
+10000010
+00100000
+00100000
+10101010
+00101010
+00100000
+10000010
+01000000
+01000101
+00010100
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000101
 01010101
+01001000
+00100001
+01010100
+00100001
+01001000
+01010010
+00100001
+01001000
+01010010
+01000101
+01010010
+00001000
 01010101
+01010100
+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
-01010101
-01010101
+00000101
 01010101
 01010101
 01010101
--- a/resources/osd/analogue/large.png
+++ b/resources/osd/analogue/large.png
--- a/resources/osd/analogue/vision.mcm
+++ b/resources/osd/analogue/vision.mcm
@ -29250,54 +29250,54 @@ MAX7456
 01010101
 01010101
 01010101
+01000000
+01000001
+01000001
+00101010
+00101000
+00101000
+00100000
+00100000
+10000010
+00101010
+00101000
+10000010
+00100000
+00100000
+10101010
+00101010
+00100000
+10000010
+01000000
+01000101
+00010100
 01010101
 01010101
 01010101
+01010100
+00010101
 01010101
+01010010
+10000101
 01010101
+01001000
+00100001
+01010100
+00100001
+01001000
+01010010
+00100001
+01001000
+01010010
+01000101
+01010010
+00001000
 01010101
+01010100
+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
-01010101
-01010101
+00000101
 01010101
 01010101
 01010101
--- a/resources/osd/analogue/vision.png
+++ b/resources/osd/analogue/vision.png
--- a/resources/osd/digital/default/12x18/457.png
+++ b/resources/osd/digital/default/12x18/457.png
--- a/resources/osd/digital/default/24x36/457.png
+++ b/resources/osd/digital/default/24x36/457.png
--- a/resources/osd/digital/default/36x54/457.png
+++ b/resources/osd/digital/default/36x54/457.png
--- a/tabs/osd.js
+++ b/tabs/osd.js
@ -114,6 +114,7 @@ SYM.FLIGHT_DIST_REMAINING = 0x167;
 SYM.GROUND_COURSE = 0xDC;
 SYM.CROSS_TRACK_ERROR = 0xFC;
 SYM.PAN_SERVO_IS_OFFSET_L = 0x1C7;
+SYM.EST_FRESNEL_ALT = 0x1C9;

 SYM.AH_AIRCRAFT0 = 0x1A2;
 SYM.AH_AIRCRAFT1 = 0x1A3;
@ -981,6 +982,21 @@ OSD.constants = {
                    min_version: '6.0.0',
                    preview: FONT.symbol(SYM.PAN_SERVO_IS_OFFSET_L) + '120' + FONT.symbol(SYM.DEGREES)
                },
+                {
+                    name: 'ESTIMATED_FRESNEL_ALTITUDE',
+                    id: 144,
+                    min_version: '7.0.0',
+                    preview: function(osd_data) {
+                        switch (OSD.data.preferences.units) {
+                            case 0: // Imperial
+                            case 3: // UK
+                            case 4: // GA
+                                return FONT.symbol(SYM.EST_FRESNEL_ALT) + FONT.symbol(SYM.AH_DECORATION_UP) + ' 27' + FONT.symbol(SYM.ALT_FT);
+                            default: // Metric & Metric + MPH
+                                return FONT.symbol(SYM.EST_FRESNEL_ALT) + FONT.symbol(SYM.AH_DECORATION_UP) + ' 27' + FONT.symbol(SYM.ALT_M);
+                        }
+                    }
+                },
                {
                    name: 'MISSION INFO',
                    id: 129,