Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-26 01:35:23 +03:00
Code Wiki Activity

Add Odometer to OSD

Browse source 
First cut
This commit is contained in:
Darren Lines 2023-04-15 22:08:33 +01:00
parent f3c58244bb
commit ddea431bee
22 changed files with 330 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/osd/INAV Character Map.md
View file

@ -284,6 +284,7 @@
| ![Home distance](/resources/osd/digital/default/24x36/357.png) | SYM_HOME_DIST | | Home distance icon | 357 | 0x165 | | ![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 | | ![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 | | ![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 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 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 | | ![Crosshair 5](/resources/osd/digital/default/24x36/406_408.png) | SYM_AH_CH_TYPE5 | SYM.AH_CROSSHAIRS | Crosshair type 5 | 406 - 408 | 0x196 - 0x198 |

78
resources/osd/analogue/bold.mcm
View file

@ -23042,51 +23042,51 @@ MAX7456
01010101 01010101
01010101 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 01000101
01010101 00000101
01010101 01000101
01010101 00100000
01010101 10100000
01010101 00100001
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 00100000
01010101 10100000
01010101 00100001
01010101 01000101
01010101 00000101
01010101 01000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101 01010101
01010101 01010101
01010101 01010101

BIN
resources/osd/analogue/bold.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

78
resources/osd/analogue/clarity.mcm
View file

@ -23042,51 +23042,51 @@ MAX7456
01010101 01010101
01010101 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 01000101
01010101 00000101
01010101 01000101
01010101 00100000
01010101 10100000
01010101 00100001
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 00100000
01010101 10100000
01010101 00100001
01010101 01000101
01010101 00000101
01010101 01000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101 01010101
01010101 01010101
01010101 01010101

BIN
resources/osd/analogue/clarity.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

78
resources/osd/analogue/clarity_medium.mcm
View file

@ -23042,51 +23042,51 @@ MAX7456
01010101 01010101
01010101 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 01000101
01010101 00000101
01010101 01000101
01010101 00100000
01010101 10100000
01010101 00100001
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 00100000
01010101 10100000
01010101 00100001
01010101 01000101
01010101 00000101
01010101 01000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101 01010101
01010101 01010101
01010101 01010101

BIN
resources/osd/analogue/clarity_medium.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

78
resources/osd/analogue/default.mcm
View file

@ -23042,51 +23042,51 @@ MAX7456
01010101 01010101
01010101 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 01000101
01010101 00000101
01010101 01000101
01010101 00100000
01010101 10100000
01010101 00100001
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 00100000
01010101 10100000
01010101 00100001
01010101 01000101
01010101 00000101
01010101 01000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101 01010101
01010101 01010101
01010101 01010101

BIN
resources/osd/analogue/default.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

BIN
resources/osd/analogue/default/360.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

78
resources/osd/analogue/impact.mcm
View file

@ -23042,51 +23042,51 @@ MAX7456
01010101 01010101
01010101 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 01000101
01010101 00000101
01010101 01000101
01010101 00100000
01010101 10100000
01010101 00100001
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 00100000
01010101 10100000
01010101 00100001
01010101 01000101
01010101 00000101
01010101 01000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101 01010101
01010101 01010101
01010101 01010101

BIN
resources/osd/analogue/impact.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

78
resources/osd/analogue/impact_mini.mcm
View file

@ -23042,51 +23042,51 @@ MAX7456
01010101 01010101
01010101 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 01000101
01010101 00000101
01010101 01000101
01010101 00100000
01010101 10100000
01010101 00100001
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 00100000
01010101 10100000
01010101 00100001
01010101 01000101
01010101 00000101
01010101 01000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101 01010101
01010101 01010101
01010101 01010101

BIN
resources/osd/analogue/impact_mini.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

78
resources/osd/analogue/large.mcm
View file

@ -23042,51 +23042,51 @@ MAX7456
01010101 01010101
01010101 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 01000101
01010101 00000101
01010101 01000101
01010101 00100000
01010101 10100000
01010101 00100001
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 00100000
01010101 10100000
01010101 00100001
01010101 01000101
01010101 00000101
01010101 01000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101 01010101
01010101 01010101
01010101 01010101

BIN
resources/osd/analogue/large.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

78
resources/osd/analogue/vision.mcm
View file

@ -23042,51 +23042,51 @@ MAX7456
01010101 01010101
01010101 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 01000101
01010101 00000101
01010101 01000101
01010101 00100000
01010101 10100000
01010101 00100001
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 10001000
01010101 00100000
01010101 10100000
01010101 00100001
01010101 01000101
01010101 00000101
01010101 01000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101 01010101
01010101 01010101
01010101 01010101

BIN
resources/osd/analogue/vision.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

BIN
resources/osd/digital/default/12x18/360.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
resources/osd/digital/default/24x36/360.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
resources/osd/digital/default/36x54/360.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

17
tabs/osd.js
View file

@ -114,6 +114,7 @@ SYM.FLIGHT_DIST_REMAINING = 0x167;
SYM.GROUND_COURSE = 0xDC; SYM.GROUND_COURSE = 0xDC;
SYM.CROSS_TRACK_ERROR = 0xFC; SYM.CROSS_TRACK_ERROR = 0xFC;
SYM.PAN_SERVO_IS_OFFSET_L = 0x1C7; SYM.PAN_SERVO_IS_OFFSET_L = 0x1C7;
SYM.ODOMETER = 0X168;
SYM.AH_AIRCRAFT0 = 0x1A2; SYM.AH_AIRCRAFT0 = 0x1A2;
SYM.AH_AIRCRAFT1 = 0x1A3; 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', name: 'GPS_HDOP',
id: 31, id: 31,