diff --git a/resources/osd/INAV Character Map.md b/resources/osd/INAV Character Map.md index 173129b8..f123dacf 100644 --- a/resources/osd/INAV Character Map.md +++ b/resources/osd/INAV Character Map.md @@ -284,6 +284,7 @@ | ![Home distance](/resources/osd/digital/default/24x36/357.png) | SYM_HOME_DIST | | Home distance icon | 357 | 0x165 | | ![Crosshair centre](/resources/osd/digital/default/24x36/358.png) | SYM_AH_CH_CENTER | SYM.AH_CROSSHAIRS | Default crosshair centre | 358 | 0x166 | | ![Flight dist rem](/resources/osd/digital/default/24x36/359.png) | SYM_FLIGHT_DIST_REMAINING | SYM.FLIGHT_DIST_REMAINING | Flight distance remaining | 359 | 0x167 | +| ![Odometer](/resources/osd/digital/default/24x36/360.png) | SYM_ODOMETER | SYM.ODOMETER | Odometer (total aircraft distance) | 360 | 0x168 | | ![Crosshair 3](/resources/osd/digital/default/24x36/400_402.png) | SYM_AH_CH_TYPE3 | SYM.AH_CROSSHAIRS | Crosshair type 3 | 400 - 402 | 0x190 - 0x192 | | ![Crosshair 4](/resources/osd/digital/default/24x36/403_405.png) | SYM_AH_CH_TYPE4 | SYM.AH_CROSSHAIRS | Crosshair type 4 | 403 - 405 | 0x193 - 0x195 | | ![Crosshair 5](/resources/osd/digital/default/24x36/406_408.png) | SYM_AH_CH_TYPE5 | SYM.AH_CROSSHAIRS | Crosshair type 5 | 406 - 408 | 0x196 - 0x198 | diff --git a/resources/osd/analogue/bold.mcm b/resources/osd/analogue/bold.mcm index 93fb3132..2ac9b81b 100644 --- a/resources/osd/analogue/bold.mcm +++ b/resources/osd/analogue/bold.mcm @@ -23042,51 +23042,51 @@ MAX7456 01010101 01010101 01010101 +00000000 +00000000 +00000000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +00000000 +00000000 +00000000 01010101 01010101 01010101 01010101 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000101 +00000101 +01000101 +00100000 +10100000 +00100001 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00100000 +10100000 +00100001 +01000101 +00000101 +01000101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/bold.png b/resources/osd/analogue/bold.png index e2873442..0b755ae5 100644 Binary files a/resources/osd/analogue/bold.png and b/resources/osd/analogue/bold.png differ diff --git a/resources/osd/analogue/clarity.mcm b/resources/osd/analogue/clarity.mcm index f586951a..7bcec6cc 100644 --- a/resources/osd/analogue/clarity.mcm +++ b/resources/osd/analogue/clarity.mcm @@ -23042,51 +23042,51 @@ MAX7456 01010101 01010101 01010101 +00000000 +00000000 +00000000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +00000000 +00000000 +00000000 01010101 01010101 01010101 01010101 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000101 +00000101 +01000101 +00100000 +10100000 +00100001 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00100000 +10100000 +00100001 +01000101 +00000101 +01000101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/clarity.png b/resources/osd/analogue/clarity.png index 8f895657..ebfe052b 100644 Binary files a/resources/osd/analogue/clarity.png and b/resources/osd/analogue/clarity.png differ diff --git a/resources/osd/analogue/clarity_medium.mcm b/resources/osd/analogue/clarity_medium.mcm index 7ec18747..0aefa0a8 100644 --- a/resources/osd/analogue/clarity_medium.mcm +++ b/resources/osd/analogue/clarity_medium.mcm @@ -23042,51 +23042,51 @@ MAX7456 01010101 01010101 01010101 +00000000 +00000000 +00000000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +00000000 +00000000 +00000000 01010101 01010101 01010101 01010101 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000101 +00000101 +01000101 +00100000 +10100000 +00100001 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00100000 +10100000 +00100001 +01000101 +00000101 +01000101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/clarity_medium.png b/resources/osd/analogue/clarity_medium.png index 75a80720..f43c984d 100644 Binary files a/resources/osd/analogue/clarity_medium.png and b/resources/osd/analogue/clarity_medium.png differ diff --git a/resources/osd/analogue/default.mcm b/resources/osd/analogue/default.mcm index aa8ff146..d8564605 100644 --- a/resources/osd/analogue/default.mcm +++ b/resources/osd/analogue/default.mcm @@ -23042,51 +23042,51 @@ MAX7456 01010101 01010101 01010101 +00000000 +00000000 +00000000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +00000000 +00000000 +00000000 01010101 01010101 01010101 01010101 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000101 +00000101 +01000101 +00100000 +10100000 +00100001 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00100000 +10100000 +00100001 +01000101 +00000101 +01000101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/default.png b/resources/osd/analogue/default.png index 8959b220..7e216bc0 100644 Binary files a/resources/osd/analogue/default.png and b/resources/osd/analogue/default.png differ diff --git a/resources/osd/analogue/default/360.png b/resources/osd/analogue/default/360.png new file mode 100644 index 00000000..a2b4de20 Binary files /dev/null and b/resources/osd/analogue/default/360.png differ diff --git a/resources/osd/analogue/impact.mcm b/resources/osd/analogue/impact.mcm index 089048a6..88d7af51 100644 --- a/resources/osd/analogue/impact.mcm +++ b/resources/osd/analogue/impact.mcm @@ -23042,51 +23042,51 @@ MAX7456 01010101 01010101 01010101 +00000000 +00000000 +00000000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +00000000 +00000000 +00000000 01010101 01010101 01010101 01010101 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000101 +00000101 +01000101 +00100000 +10100000 +00100001 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00100000 +10100000 +00100001 +01000101 +00000101 +01000101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/impact.png b/resources/osd/analogue/impact.png index e6e0167f..14a280df 100644 Binary files a/resources/osd/analogue/impact.png and b/resources/osd/analogue/impact.png differ diff --git a/resources/osd/analogue/impact_mini.mcm b/resources/osd/analogue/impact_mini.mcm index 0503a323..51a3562b 100644 --- a/resources/osd/analogue/impact_mini.mcm +++ b/resources/osd/analogue/impact_mini.mcm @@ -23042,51 +23042,51 @@ MAX7456 01010101 01010101 01010101 +00000000 +00000000 +00000000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +00000000 +00000000 +00000000 01010101 01010101 01010101 01010101 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000101 +00000101 +01000101 +00100000 +10100000 +00100001 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00100000 +10100000 +00100001 +01000101 +00000101 +01000101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/impact_mini.png b/resources/osd/analogue/impact_mini.png index 636f150f..0a044e9d 100644 Binary files a/resources/osd/analogue/impact_mini.png and b/resources/osd/analogue/impact_mini.png differ diff --git a/resources/osd/analogue/large.mcm b/resources/osd/analogue/large.mcm index e1319e26..f9ed849c 100644 --- a/resources/osd/analogue/large.mcm +++ b/resources/osd/analogue/large.mcm @@ -23042,51 +23042,51 @@ MAX7456 01010101 01010101 01010101 +00000000 +00000000 +00000000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +00000000 +00000000 +00000000 01010101 01010101 01010101 01010101 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000101 +00000101 +01000101 +00100000 +10100000 +00100001 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00100000 +10100000 +00100001 +01000101 +00000101 +01000101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/large.png b/resources/osd/analogue/large.png index 2b714f3a..11e55789 100644 Binary files a/resources/osd/analogue/large.png and b/resources/osd/analogue/large.png differ diff --git a/resources/osd/analogue/vision.mcm b/resources/osd/analogue/vision.mcm index bcba5fdd..e8f9752f 100644 --- a/resources/osd/analogue/vision.mcm +++ b/resources/osd/analogue/vision.mcm @@ -23042,51 +23042,51 @@ MAX7456 01010101 01010101 01010101 +00000000 +00000000 +00000000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +10100010 +10001010 +00101000 +00000000 +00000000 +00000000 01010101 01010101 01010101 01010101 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01000101 +00000101 +01000101 +00100000 +10100000 +00100001 +10001000 +10001000 +10001000 +10001000 +10001000 +10001000 +00100000 +10100000 +00100001 +01000101 +00000101 +01000101 01010101 01010101 01010101 diff --git a/resources/osd/analogue/vision.png b/resources/osd/analogue/vision.png index 38e3fc30..bef422a6 100644 Binary files a/resources/osd/analogue/vision.png and b/resources/osd/analogue/vision.png differ diff --git a/resources/osd/digital/default/12x18/360.png b/resources/osd/digital/default/12x18/360.png new file mode 100644 index 00000000..3413f976 Binary files /dev/null and b/resources/osd/digital/default/12x18/360.png differ diff --git a/resources/osd/digital/default/24x36/360.png b/resources/osd/digital/default/24x36/360.png new file mode 100644 index 00000000..579d41a7 Binary files /dev/null and b/resources/osd/digital/default/24x36/360.png differ diff --git a/resources/osd/digital/default/36x54/360.png b/resources/osd/digital/default/36x54/360.png new file mode 100644 index 00000000..65f0003a Binary files /dev/null and b/resources/osd/digital/default/36x54/360.png differ diff --git a/tabs/osd.js b/tabs/osd.js index 19a35b9b..e43b4c1f 100644 --- 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.ODOMETER = 0X168; SYM.AH_AIRCRAFT0 = 0x1A2; SYM.AH_AIRCRAFT1 = 0x1A3; @@ -1551,6 +1552,22 @@ OSD.constants = { } } }, + { + name: 'ODOMETER', + id: 144, + min_version: '6.1.0', + preview: function(osd_data) { + switch (OSD.data.preferences.units) { + case 0: // Imperial + case 3: // UK + return FONT.symbol(SYM.ODOMETER) + FONT.embed_dot('0000169') + FONT.symbol(SYM.DIST_MI); + case 4: // GA + return FONT.symbol(SYM.ODOMETER) + FONT.embed_dot('0000147') + FONT.symbol(SYM.DIST_NM); + default: // Metric + return FONT.symbol(SYM.ODOMETER) + FONT.embed_dot('0000272') + FONT.symbol(SYM.DIST_KM); + } + } + }, { name: 'GPS_HDOP', id: 31,