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

AP_OSD: use font*.bin as font name

This commit is contained in:
Andrew Tridgell 2018-07-09 18:03:04 +10:00
parent 655828d2f8
commit 4055f28bc5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_OSD/AP_OSD_MAX7456.cpp
View File

@ -155,7 +155,7 @@ bool AP_OSD_MAX7456::update_font()
{
uint32_t font_size;
uint8_t updated_chars = 0;
uint8_t *font_data = AP_ROMFS::find_decompress("osd_font.bin", font_size);
uint8_t *font_data = AP_ROMFS::find_decompress("font0.bin", font_size);
if (font_data == nullptr || font_size != NVM_RAM_SIZE * 256) {
return false;
}

2
libraries/AP_OSD/AP_OSD_SITL.cpp
View File

@ -42,7 +42,7 @@ extern const AP_HAL::HAL &hal;
void AP_OSD_SITL::load_font(void)
{
uint32_t font_size;
uint8_t *font_data = AP_ROMFS::find_decompress("osd_font.bin", font_size);
uint8_t *font_data = AP_ROMFS::find_decompress("font0.bin", font_size);
if (font_data == nullptr || font_size != 54 * 256) {
AP_HAL::panic("Bad font file");
}