From 4604de2ac0c9e55ed8c623e7a1a13ba8faeae60d Mon Sep 17 00:00:00 2001 From: Hydra Date: Sat, 22 Oct 2016 21:23:53 +0200 Subject: [PATCH] Update OSD elements to use new font symbols to reduce clutter. --- media/cleanflight-font.mcm | 184 ++++++++++++++++---------------- src/main/osd/fonts/font.h | 28 +++++ src/main/osd/fonts/font_max7456_12x18.c | 8 +- src/main/osd/fonts/font_max7456_12x18.h | 2 +- src/main/osd/osd_element.c | 15 ++- src/main/osd/osd_element_render.c | 21 +++- src/main/osd/osd_element_render.h | 2 + src/main/osd/osd_screen.c | 18 +++- src/test/unit/osd_screen_unittest.cc | 49 ++++++--- 9 files changed, 206 insertions(+), 121 deletions(-) create mode 100644 src/main/osd/fonts/font.h diff --git a/media/cleanflight-font.mcm b/media/cleanflight-font.mcm index 09a0f1aec..086a14b16 100644 --- a/media/cleanflight-font.mcm +++ b/media/cleanflight-font.mcm @@ -1856,7 +1856,56 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01010100 +10101010 +00010101 +01010010 +00000000 +10000101 +01001000 +00101000 +00100001 +01010000 +10000010 +00000101 +01010100 +00000000 +00010101 +01000010 +00101000 +10000001 +00100010 +00000000 +10001000 +01001010 +10101010 +10100001 +00100000 +00000000 +00001000 +00100000 +00000000 +00001000 +00100010 +00000000 +10001000 +00101000 +10000010 +00101000 +00100010 +00000000 +10001000 +00100000 +00000000 +00001000 +01001010 +10101010 +10100001 +01010000 +00000000 +00000101 01010101 01010101 01010101 @@ -1874,99 +1923,50 @@ MAX7456 01010101 01010101 01010101 +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 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +01010000 +10101010 +00000101 +01001010 +10101010 +10100001 +01001010 +10101010 +10100001 +01001010 +00000000 +10100001 +01001010 +00010100 +10100001 +01001010 +00010100 +10100001 +01001010 +00010100 +10100001 +01001010 +00010100 +10100001 +01001010 +00010100 +10100001 +01001010 +00010100 +10100001 +01001010 +00000000 +10100001 +01001010 +10101010 +10100001 +01001010 +10101010 +10100001 +01010000 +00000000 +00000101 01010101 01010101 01010101 diff --git a/src/main/osd/fonts/font.h b/src/main/osd/fonts/font.h new file mode 100644 index 000000000..a700ee263 --- /dev/null +++ b/src/main/osd/fonts/font.h @@ -0,0 +1,28 @@ +/* + * This file is part of Cleanflight. + * + * Cleanflight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Cleanflight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Cleanflight. If not, see . + */ + +#define FONT_CHARACTER_12V 0x14 +#define FONT_CHARACTER_5V 0x15 +#define FONT_CHARACTER_MAH 0x16 +#define FONT_CHARACTER_AMP 0x17 +#define FONT_CHARACTER_ACRO 0x18 +#define FONT_CHARACTER_HRZN 0x19 +#define FONT_CHARACTER_ANGL 0x1a +#define FONT_CHARACTER_MAG 0x1b +#define FONT_CHARACTER_BARO 0x1c +#define FONT_CHARACTER_RSSI 0x1d +#define FONT_CHARACTER_BATTERY 0x1e diff --git a/src/main/osd/fonts/font_max7456_12x18.c b/src/main/osd/fonts/font_max7456_12x18.c index 4ff307c34..0544c5776 100644 --- a/src/main/osd/fonts/font_max7456_12x18.c +++ b/src/main/osd/fonts/font_max7456_12x18.c @@ -101,10 +101,10 @@ const uint8_t font_max7456_12x18[16384] = { 0x15,0x54,0x00,0x55,0x52,0xaa,0x15,0x52,0x00,0x15,0x52,0x0a,0x15,0x52,0xaa,0x15,0x54,0x00,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, 0x55,0x55,0x55,0x40,0x54,0x05,0x2a,0x12,0xa1,0x20,0x88,0x08,0x2a,0x0a,0xa8,0x20,0x88,0x08,0x2a,0x08,0x48,0x40,0x51,0x51,0x40,0x54,0x05,0x2a,0x12,0xa1,0x20,0x88, 0x08,0x2a,0x08,0x48,0x20,0x88,0x08,0x20,0x82,0xa1,0x40,0x14,0x05,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, - 0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, - 0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, - 0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, - 0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, + 0x55,0x00,0x55,0x54,0xaa,0x15,0x52,0x00,0x85,0x48,0x28,0x21,0x50,0x82,0x05,0x54,0x00,0x15,0x42,0x28,0x81,0x22,0x00,0x88,0x4a,0xaa,0xa1,0x20,0x00,0x08,0x20,0x00, + 0x08,0x22,0x00,0x88,0x28,0x82,0x28,0x22,0x00,0x88,0x20,0x00,0x08,0x4a,0xaa,0xa1,0x50,0x00,0x05,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, + 0x55,0x55,0x55,0x55,0x00,0x55,0x50,0xaa,0x05,0x4a,0xaa,0xa1,0x4a,0xaa,0xa1,0x4a,0x00,0xa1,0x4a,0x14,0xa1,0x4a,0x14,0xa1,0x4a,0x14,0xa1,0x4a,0x14,0xa1,0x4a,0x14, + 0xa1,0x4a,0x14,0xa1,0x4a,0x00,0xa1,0x4a,0xaa,0xa1,0x4a,0xaa,0xa1,0x50,0x00,0x05,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, 0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, 0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, 0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55, diff --git a/src/main/osd/fonts/font_max7456_12x18.h b/src/main/osd/fonts/font_max7456_12x18.h index e70d32641..b194f6167 100644 --- a/src/main/osd/fonts/font_max7456_12x18.h +++ b/src/main/osd/fonts/font_max7456_12x18.h @@ -44,4 +44,4 @@ const uint8_t font_max7456_12x18_asciiToFontMapping[128]; #define FONT_CHARACTER_MOTOR_OFF 0x0d // circle outline -#define FONT_VERSION 2 +#define FONT_VERSION 1 diff --git a/src/main/osd/osd_element.c b/src/main/osd/osd_element.c index 0db405f04..a94d8c46d 100644 --- a/src/main/osd/osd_element.c +++ b/src/main/osd/osd_element.c @@ -41,8 +41,9 @@ #include "osd/osd_element.h" +#include "osd/fonts/font.h" -#include "../sensors/amperage.h" // only required for data providers +#include "sensors/amperage.h" // only required for data providers #include "osd/osd_element_render.h" intptr_t osdElementData_onDuration(void) @@ -72,6 +73,7 @@ intptr_t osdElementData_voltage5V(void) voltageAndName = (voltageAndName_t){ .name = "5V", + .symbol = FONT_CHARACTER_5V, .voltage = getVoltageForADCChannel(ADC_POWER_5V) }; return (intptr_t) &voltageAndName; @@ -81,6 +83,7 @@ intptr_t osdElementData_voltage12V(void) { voltageAndName = (voltageAndName_t){ .name = "12V", + .symbol = FONT_CHARACTER_12V, .voltage = getVoltageForADCChannel(ADC_POWER_12V) }; return (intptr_t) &voltageAndName; @@ -90,6 +93,7 @@ intptr_t osdElementData_voltageBattery(void) { voltageAndName = (voltageAndName_t){ .name = "BAT", + .symbol = FONT_CHARACTER_BATTERY, .voltage = vbat }; return (intptr_t) &voltageAndName; @@ -100,6 +104,7 @@ intptr_t osdElementData_voltageBatteryFC(void) { voltageAndName = (voltageAndName_t){ .name = "FC", + .symbol = FONT_CHARACTER_BATTERY, .voltage = fcStatus.vbat }; return (intptr_t) &voltageAndName; @@ -154,10 +159,10 @@ elementHandlerConfig_t elementHandlers[] = { {OSD_ELEMENT_ARMED_DURATION, osdElementRender_duration, osdElementData_armedDuration}, {OSD_ELEMENT_MAH_DRAWN, osdElementRender_mahDrawn, osdElementData_mAhDrawn}, {OSD_ELEMENT_AMPERAGE, osdElementRender_amperage, osdElementData_amperage}, - {OSD_ELEMENT_VOLTAGE_5V, osdElementRender_voltage, osdElementData_voltage5V}, - {OSD_ELEMENT_VOLTAGE_12V, osdElementRender_voltage, osdElementData_voltage12V}, - {OSD_ELEMENT_VOLTAGE_BATTERY, osdElementRender_voltage, osdElementData_voltageBattery}, - {OSD_ELEMENT_VOLTAGE_BATTERY_FC, osdElementRender_voltage, osdElementData_voltageBatteryFC}, + {OSD_ELEMENT_VOLTAGE_5V, osdElementRender_voltageBattery, osdElementData_voltage5V}, + {OSD_ELEMENT_VOLTAGE_12V, osdElementRender_voltageBattery, osdElementData_voltage12V}, + {OSD_ELEMENT_VOLTAGE_BATTERY, osdElementRender_voltageBattery, osdElementData_voltageBattery}, + {OSD_ELEMENT_VOLTAGE_BATTERY_FC, osdElementRender_voltageBattery, osdElementData_voltageBatteryFC}, {OSD_ELEMENT_FLIGHT_MODE, osdElementRender_flightMode, osdElementData_flightModeFC}, {OSD_ELEMENT_INDICATOR_MAG, osdElementRender_indicatorMag, osdElementData_indicatorMagFC}, {OSD_ELEMENT_INDICATOR_BARO, osdElementRender_indicatorBaro, osdElementData_indicatorBaroFC}, diff --git a/src/main/osd/osd_element_render.c b/src/main/osd/osd_element_render.c index 76a3e59d2..6d27c4fdb 100644 --- a/src/main/osd/osd_element_render.c +++ b/src/main/osd/osd_element_render.c @@ -33,6 +33,7 @@ #include "osd/osd_element.h" #include "osd/osd_element_render.h" #include "osd/osd_screen.h" +#include "osd/fonts/font.h" // from osd hardware implementation void osdHardwareDisplayMotor(uint8_t x, uint8_t y, uint8_t percent); @@ -55,26 +56,37 @@ void osdElementRender_mahDrawn(const element_t *element, elementDataProviderFn d { int32_t mAhDrawn = (int32_t) dataFn(); - tfp_sprintf(elementAsciiBuffer, "mAh: %5d", mAhDrawn); + tfp_sprintf(elementAsciiBuffer, "%5d", mAhDrawn); osdPrintAt(element->x, element->y, elementAsciiBuffer); + osdSetRawCharacterAtPosition(element->x + 5, element->y, FONT_CHARACTER_MAH); } void osdElementRender_amperage(const element_t *element, elementDataProviderFn dataFn) { int32_t amperage = (int32_t) dataFn(); - tfp_sprintf(elementAsciiBuffer, "AMP:%2d.%02dA", amperage / 100, amperage % 100); + tfp_sprintf(elementAsciiBuffer, "%2d.%02dA", amperage / 100, amperage % 100); osdPrintAt(element->x, element->y, elementAsciiBuffer); + osdSetRawCharacterAtPosition(element->x + 5, element->y, FONT_CHARACTER_AMP); } void osdElementRender_voltage(const element_t *element, elementDataProviderFn dataFn) { voltageAndName_t *voltageAndName= (voltageAndName_t *) dataFn(); - tfp_sprintf(elementAsciiBuffer, "%s:%3d.%dV", voltageAndName->name, voltageAndName->voltage / 10, voltageAndName->voltage % 10); + tfp_sprintf(elementAsciiBuffer, "%s:%2d.%dV", voltageAndName->name, voltageAndName->voltage / 10, voltageAndName->voltage % 10); osdPrintAt(element->x, element->y, elementAsciiBuffer); } +void osdElementRender_voltageBattery(const element_t *element, elementDataProviderFn dataFn) +{ + voltageAndName_t *voltageAndName= (voltageAndName_t *) dataFn(); + + tfp_sprintf(elementAsciiBuffer, "%2d.%dV", voltageAndName->voltage / 10, voltageAndName->voltage % 10); + osdPrintAt(element->x +1, element->y, elementAsciiBuffer); + osdSetRawCharacterAtPosition(element->x, element->y, voltageAndName->symbol); +} + void osdElementRender_indicatorMag(const element_t *element, elementDataProviderFn dataFn) { bool on = (bool) dataFn(); @@ -113,8 +125,9 @@ void osdElementRender_rssi(const element_t *element, elementDataProviderFn dataF { uint16_t rssi = (uint16_t) dataFn(); - tfp_sprintf(elementAsciiBuffer, "RSSI:%3d%%", rssi / 10); + tfp_sprintf(elementAsciiBuffer, "%3d", rssi / 10); osdPrintAt(element->x, element->y, elementAsciiBuffer); + osdSetRawCharacterAtPosition(element->x + 3, element->y, FONT_CHARACTER_RSSI); } void osdElementRender_callsign(const element_t *element, elementDataProviderFn dataFn) diff --git a/src/main/osd/osd_element_render.h b/src/main/osd/osd_element_render.h index 835293d97..467ae5f59 100644 --- a/src/main/osd/osd_element_render.h +++ b/src/main/osd/osd_element_render.h @@ -21,6 +21,7 @@ typedef struct voltageAndName_s { char *name; + uint8_t symbol; int16_t voltage; } voltageAndName_t; @@ -28,6 +29,7 @@ void osdElementRender_duration(const element_t *element, elementDataProviderFn d void osdElementRender_mahDrawn(const element_t *element, elementDataProviderFn dataFn); void osdElementRender_amperage(const element_t *element, elementDataProviderFn dataFn); void osdElementRender_voltage(const element_t *element, elementDataProviderFn dataFn); +void osdElementRender_voltageBattery(const element_t *element, elementDataProviderFn dataFn); void osdElementRender_flightMode(const element_t *element, elementDataProviderFn dataFn); void osdElementRender_indicatorMag(const element_t *element, elementDataProviderFn dataFn); void osdElementRender_indicatorBaro(const element_t *element, elementDataProviderFn dataFn); diff --git a/src/main/osd/osd_screen.c b/src/main/osd/osd_screen.c index 278041d76..edf57e584 100644 --- a/src/main/osd/osd_screen.c +++ b/src/main/osd/osd_screen.c @@ -100,10 +100,22 @@ static void osdAdvanceCursor(void) void osdPrint(char *message) { - char *charPtr = message; - + uint8_t *charPtr = (uint8_t *)message; + bool escape = false; while(*charPtr) { - osdSetCharacterAtPosition(cursor.x, cursor.y, *charPtr); + if (!escape) { + if (*charPtr == 0xff) { + escape = true; + charPtr++; + continue; + } + } + if (escape) { + osdSetRawCharacterAtPosition(cursor.x, cursor.y, *charPtr); + escape = false; + } else { + osdSetCharacterAtPosition(cursor.x, cursor.y, *charPtr); + } osdAdvanceCursor(); charPtr++; diff --git a/src/test/unit/osd_screen_unittest.cc b/src/test/unit/osd_screen_unittest.cc index a45839a26..2a0f207ae 100644 --- a/src/test/unit/osd_screen_unittest.cc +++ b/src/test/unit/osd_screen_unittest.cc @@ -23,6 +23,18 @@ #define TEST_SCREEN_CHARACTER_COUNT (TEST_ROW_COUNT * TEST_COLUMN_COUNT) +#define TEST_FONT_CHARACTER_12V 0x14 +#define TEST_FONT_CHARACTER_5V 0x15 +#define TEST_FONT_CHARACTER_MAH 0x16 +#define TEST_FONT_CHARACTER_AMP 0x17 +#define TEST_FONT_CHARACTER_ACRO 0x18 +#define TEST_FONT_CHARACTER_HRZN 0x19 +#define TEST_FONT_CHARACTER_ANGL 0x1a +#define TEST_FONT_CHARACTER_MAG 0x1b +#define TEST_FONT_CHARACTER_BARO 0x1c +#define TEST_FONT_CHARACTER_RSSI 0x1d +#define TEST_FONT_CHARACTER_BATTERY 0x1e + extern "C" { #include "build/build_config.h" @@ -157,6 +169,12 @@ void compareScreen(uint8_t x, uint8_t y, uint8_t *content, uint8_t contentLength } } +void compareScreenCharacterAtPosition(uint8_t x, uint8_t y, uint8_t content) +{ + int offset = SCREEN_BUFFER_OFFSET(x, y); + EXPECT_EQ(content, textScreenBuffer[offset]); +} + void expectUnmodifiedScreen(void) { for (int y = 0; y < TEST_ROW_COUNT; y++) { @@ -221,10 +239,11 @@ TEST_F(OsdScreenTest, TestOsdElement_MahDrawn) osdDrawTextElement(&element); // then - char expectedAscii[] = "MAH: 99999"; + char expectedAscii[] = "99999"; uint8_t *expectedContent = asciiToFontMap(expectedAscii); compareScreen(0, 0, expectedContent, strlen(expectedAscii)); + compareScreenCharacterAtPosition(5, 0, TEST_FONT_CHARACTER_MAH); } @@ -241,10 +260,11 @@ TEST_F(OsdScreenTest, TestOsdElement_Amperage) osdDrawTextElement(&element); // then - char expectedAscii[] = "AMP:98.76A"; + char expectedAscii[] = "98.76"; uint8_t *expectedContent = asciiToFontMap(expectedAscii); compareScreen(0, 0, expectedContent, strlen(expectedAscii)); + compareScreenCharacterAtPosition(5, 0, TEST_FONT_CHARACTER_AMP); } @@ -261,10 +281,11 @@ TEST_F(OsdScreenTest, TestOsdElement_Voltage5V) osdDrawTextElement(&element); // then - char expectedAscii[] = "5V: 5.1V"; + char expectedAscii[] = " 5.1V"; uint8_t *expectedContent = asciiToFontMap(expectedAscii); - compareScreen(0, 0, expectedContent, strlen(expectedAscii)); + compareScreenCharacterAtPosition(0, 0, TEST_FONT_CHARACTER_5V); + compareScreen(1, 0, expectedContent, strlen(expectedAscii)); } TEST_F(OsdScreenTest, TestOsdElement_Voltage12V) @@ -280,13 +301,14 @@ TEST_F(OsdScreenTest, TestOsdElement_Voltage12V) osdDrawTextElement(&element); // then - char expectedAscii[] = "12V: 12.6V"; + char expectedAscii[] = "12.6V"; uint8_t *expectedContent = asciiToFontMap(expectedAscii); - compareScreen(0, 0, expectedContent, strlen(expectedAscii)); + compareScreenCharacterAtPosition(0, 0, TEST_FONT_CHARACTER_12V); + compareScreen(1, 0, expectedContent, strlen(expectedAscii)); } -TEST_F(OsdScreenTest, TestOsdElement_VoltagBattery_FC) +TEST_F(OsdScreenTest, TestOsdElement_VoltageBattery_FC) { // given fcStatus.vbat = 168; @@ -299,10 +321,11 @@ TEST_F(OsdScreenTest, TestOsdElement_VoltagBattery_FC) osdDrawTextElement(&element); // then - char expectedAscii[] = "FC: 16.8V"; + char expectedAscii[] = "16.8V"; uint8_t *expectedContent = asciiToFontMap(expectedAscii); - compareScreen(0, 0, expectedContent, strlen(expectedAscii)); + compareScreenCharacterAtPosition(0, 0, TEST_FONT_CHARACTER_BATTERY); + compareScreen(1, 0, expectedContent, strlen(expectedAscii)); } TEST_F(OsdScreenTest, TestOsdElement_VoltageBattery) @@ -318,10 +341,11 @@ TEST_F(OsdScreenTest, TestOsdElement_VoltageBattery) osdDrawTextElement(&element); // then - char expectedAscii[] = "BAT: 16.8V"; + char expectedAscii[] = "16.8V"; uint8_t *expectedContent = asciiToFontMap(expectedAscii); - compareScreen(0, 0, expectedContent, strlen(expectedAscii)); + compareScreenCharacterAtPosition(0, 0, TEST_FONT_CHARACTER_BATTERY); + compareScreen(1, 0, expectedContent, strlen(expectedAscii)); } TEST_F(OsdScreenTest, TestOsdElement_FlightMode_Horizon) @@ -464,10 +488,11 @@ TEST_F(OsdScreenTest, TestOsdElement_RSSIFC) osdDrawTextElement(&element); // then - char expectedAscii[] = "RSSI:100"; + char expectedAscii[] = "100"; uint8_t *expectedContent = asciiToFontMap(expectedAscii); compareScreen(0, 0, expectedContent, strlen(expectedAscii)); + compareScreenCharacterAtPosition(3, 0, TEST_FONT_CHARACTER_RSSI); } -- 2.11.4.GIT