Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_OSD: add icon for terrain alt panel and font editor

This commit is contained in:
Hwurzburg 2021-04-07 16:07:18 -05:00 committed by Andrew Tridgell
parent 9513bbe85f
commit cc4fe29d8f
18 changed files with 210 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_OSD/AP_OSD_Screen.cpp
View File

@ -1056,6 +1056,8 @@ AP_OSD_Screen::AP_OSD_Screen()
#define SYM_MW 0xF4
#define SYM_CLK 0xBC
#define SYM_KILO 0x4B
#define SYM_TERALT 0xEF
void AP_OSD_AbstractScreen::set_backend(AP_OSD_Backend *_backend)
{
@ -1939,9 +1941,9 @@ void AP_OSD_Screen::draw_hgt_abvterr(uint8_t x, uint8_t y)
float terrain_altitude;
if (terrain != nullptr && terrain->height_above_terrain(terrain_altitude,true)) {
backend->write(x, y, terrain_altitude < osd->warn_terr, "%4d%c", (int)u_scale(ALTITUDE, terrain_altitude), u_icon(ALTITUDE));
backend->write(x, y, terrain_altitude < osd->warn_terr, "%4d%c%c", (int)u_scale(ALTITUDE, terrain_altitude), u_icon(ALTITUDE), SYM_TERALT);
} else {
backend->write(x, y, false, " ---%c", u_icon(ALTITUDE));
backend->write(x, y, false, " ---%c%c", u_icon(ALTITUDE),SYM_TERALT);
}
}
#endif

BIN
libraries/AP_OSD/fonts/MAX7456Charwizard.jar Executable file
View File

Binary file not shown.

2
libraries/AP_OSD/fonts/README.md
View File

@ -29,7 +29,7 @@ Available styles and respective OSD_FONT numbers are:
## Adding font styles ##
Charsets can be edited or built form scratch using [MAX7456charwizard](https://github.com/diydrones/MinimOSD-Extra/blob/master/Tools/MAX7456Charwizard.jar). Added charsets need to be converted to a binary file named fontN.bin prior to building the code. Files within this namespace will be automatically included in the build, so you can modify and replace existing .bin files or add your individual styles.
Charsets can be edited or built form scratch using MAX7456Charwizard.jar included in this directory. Added charsets need to be converted to a binary file named fontN.bin prior to building the code. Files within this namespace will be automatically included in the build, so you can modify and replace existing .bin files or add your individual styles.
To do that, navigate to:
```

82
libraries/AP_OSD/fonts/bfstyle.mcm
View File

@ -15296,59 +15296,59 @@ MAX7456
01010101
01010101
01010101
01010100
01010101
01010101
01010010
00010101
01010101
01001010
10000101
01010101
00100010
00100001
01010101
01010010
00010101
01010101
01010010
00010101
01010101
01010010
00010101
01010101
00100010
00100001
01010101
01001010
10000101
01010100
01010010
00010101
01010010
00010100
01010101
01010010
00010101
01010101
01001010
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
01010101
01001010
10000101
01000101
00101010
10000001
00100001
00101010
10101000
00100001
00101010
10101010
10101000
00000000
00000000
00000000
01010101
01010101
01010101

BIN
libraries/AP_OSD/fonts/bfstyle.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 12 KiB

82
libraries/AP_OSD/fonts/bold.mcm
View File

@ -15296,59 +15296,59 @@ MAX7456
01010101
01010101
01010101
01010100
01010101
01010101
01010010
00010101
01010101
01001010
10000101
01010101
00100010
00100001
01010101
01010010
00010101
01010101
01010010
00010101
01010101
01010010
00010101
01010101
00100010
00100001
01010101
01001010
10000101
01010100
01010010
00010101
01010010
00010100
01010101
01010010
00010101
01010101
01001010
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
01010101
01001010
10000101
01000101
00101010
10000001
00100001
00101010
10101000
00100001
00101010
10101010
10101000
00000000
00000000
00000000
01010101
01010101
01010101

BIN
libraries/AP_OSD/fonts/bold.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 12 KiB

82
libraries/AP_OSD/fonts/clarity.mcm Executable file → Normal file
View File

@ -15296,59 +15296,59 @@ MAX7456
01010101
01010101
01010101
01010100
01010101
01010101
01010010
00010101
01010101
01001010
10000101
01010101
00100010
00100001
01010101
01010010
00010101
01010101
01010010
00010101
01010101
01010010
00010101
01010101
00100010
00100001
01010101
01001010
10000101
01010100
01010010
00010101
01010010
00010100
01010101
01010010
00010101
01010101
01001010
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
01010101
01001010
10000101
01000101
00101010
10000001
00100001
00101010
10101000
00100001
00101010
10101010
10101000
00000000
00000000
00000000
01010101
01010101
01010101

BIN
libraries/AP_OSD/fonts/clarity.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 12 KiB

82
libraries/AP_OSD/fonts/clarity_medium.mcm
View File

@ -15296,59 +15296,59 @@ MAX7456
01010101
01010101
01010101
01010100
01010101
01010101
01010010
00010101
01010101
01001010
10000101
01010101
00100010
00100001
01010101
01010010
00010101
01010101
01010010
00010101
01010101
01010010
00010101
01010101
00100010
00100001
01010101
01001010
10000101
01010100
01010010
00010101
01010010
00010100
01010101
01010010
00010101
01010101
01001010
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
01010101
01001010
10000101
01000101
00101010
10000001
00100001
00101010
10101000
00100001
00101010
10101010
10101000
00000000
00000000
00000000
01010101
01010101
01010101

BIN
libraries/AP_OSD/fonts/clarity_medium.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 12 KiB

82
libraries/AP_OSD/fonts/digital.mcm
View File

@ -15296,59 +15296,59 @@ MAX7456
01010101
01010101
01010101
01010100
01010101
01010101
01010010
00010101
01010101
01001010
10000101
01010101
00100010
00100001
01010101
01010010
00010101
01010101
01010010
00010101
01010101
01010010
00010101
01010101
00100010
00100001
01010101
01001010
10000101
01010100
01010010
00010101
01010010
00010100
01010101
01010010
00010101
01010101
01001010
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
01010101
01001010
10000101
01000101
00101010
10000001
00100001
00101010
10101000
00100001
00101010
10101010
10101000
00000000
00000000
00000000
01010101
01010101
01010101

BIN
libraries/AP_OSD/fonts/digital.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
libraries/AP_OSD/fonts/font0.bin
View File

Binary file not shown.

BIN
libraries/AP_OSD/fonts/font1.bin
View File

Binary file not shown.

BIN
libraries/AP_OSD/fonts/font2.bin
View File

Binary file not shown.

BIN
libraries/AP_OSD/fonts/font3.bin
View File

Binary file not shown.

BIN
libraries/AP_OSD/fonts/font4.bin
View File

Binary file not shown.