Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 09:45:37 +03:00
Code Issues Wiki Activity

Add new symbols to max7456_symbols.h (#8138)

Browse source 
Add new symbols to max7456_symbols.h
This commit is contained in:
Michael Keller 2019-05-04 13:54:34 +12:00 • committed by GitHub
commit 95544151f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/drivers/max7456_symbols.h
View file

@ -25,6 +25,14 @@
#define SYM_END_OF_FONT 0xFF #define SYM_END_OF_FONT 0xFF
#define SYM_BLANK 0x20 #define SYM_BLANK 0x20
#define SYM_COLON 0x2D #define SYM_COLON 0x2D
#define SYM_BBLOG 0x10
//#define SYM_HOMEFLAG 0x11
//#define SYM_RPM 0x12
#define SYM_ROLL 0x14
#define SYM_PITCH 0x15
#define SYM_TEMPERATURE 0x7A
#define SYM_LAT 0x89
#define SYM_LON 0x98
// RSSI // RSSI
#define SYM_RSSI 0x01 #define SYM_RSSI 0x01
@ -54,8 +62,8 @@
#define SYM_HEADING_LINE 0x1D #define SYM_HEADING_LINE 0x1D
// AH Center screen Graphics // AH Center screen Graphics
#define SYM_AH_CENTER_LINE 0x26 #define SYM_AH_CENTER_LINE 0x7B
#define SYM_AH_CENTER_LINE_RIGHT 0x27 #define SYM_AH_CENTER_LINE_RIGHT 0x7D
#define SYM_AH_CENTER 0x7E #define SYM_AH_CENTER 0x7E
#define SYM_AH_RIGHT 0x02 #define SYM_AH_RIGHT 0x02
#define SYM_AH_LEFT 0x03 #define SYM_AH_LEFT 0x03
@ -118,15 +126,15 @@
#define SYM_VOLT 0x06 #define SYM_VOLT 0x06
#define SYM_AMP 0x9A #define SYM_AMP 0x9A
#define SYM_MAH 0x07 #define SYM_MAH 0x07
#define SYM_WATT 0x57 #define SYM_WATT 0x57 // 0x57 is 'W'
// Time // Time
#define SYM_ON_M 0x9B #define SYM_ON_M 0x9B
#define SYM_FLY_M 0x9C #define SYM_FLY_M 0x9C
// Speed // Speed
#define SYM_KPH 0x4B // we don't have a KPH symbol so use 'K' #define SYM_KPH 0x9E
#define SYM_MPH 0x4D // we don't have a MPH symbol so use 'M' #define SYM_MPH 0x9D
// Menu cursor // Menu cursor
#define SYM_CURSOR SYM_AH_LEFT #define SYM_CURSOR SYM_AH_LEFT

16
src/main/osd/osd_elements.c
View file

@ -476,7 +476,7 @@ static void osdElementAltitude(osdElementParms_t *element)
static void osdElementAngleRollPitch(osdElementParms_t *element) static void osdElementAngleRollPitch(osdElementParms_t *element)
{ {
const int angle = (element->item == OSD_PITCH_ANGLE) ? attitude.values.pitch : attitude.values.roll; const int angle = (element->item == OSD_PITCH_ANGLE) ? attitude.values.pitch : attitude.values.roll;
tfp_sprintf(element->buff, "%c%02d.%01d", angle < 0 ? '-' : ' ', abs(angle / 10), abs(angle % 10)); tfp_sprintf(element->buff, "%c%c%02d.%01d", (element->item == OSD_PITCH_ANGLE) ? SYM_PITCH : SYM_ROLL , angle < 0 ? '-' : ' ', abs(angle / 10), abs(angle % 10));
} }
#endif #endif
@ -530,7 +530,7 @@ static void osdElementCompassBar(osdElementParms_t *element)
#ifdef USE_ADC_INTERNAL #ifdef USE_ADC_INTERNAL
static void osdElementCoreTemperature(osdElementParms_t *element) static void osdElementCoreTemperature(osdElementParms_t *element)
{ {
tfp_sprintf(element->buff, "%3d%c", osdConvertTemperatureToSelectedUnit(getCoreTemperatureCelsius()), osdGetTemperatureSymbolForSelectedUnit()); tfp_sprintf(element->buff, "%c%3d%c", SYM_TEMPERATURE, osdConvertTemperatureToSelectedUnit(getCoreTemperatureCelsius()), osdGetTemperatureSymbolForSelectedUnit());
} }
#endif // USE_ADC_INTERNAL #endif // USE_ADC_INTERNAL
@ -754,14 +754,12 @@ static void osdElementGpsHomeDistance(osdElementParms_t *element)
static void osdElementGpsLatitude(osdElementParms_t *element) static void osdElementGpsLatitude(osdElementParms_t *element)
{ {
// The SYM_LAT symbol in the actual font contains only blank, so we use the SYM_ARROW_NORTH osdFormatCoordinate(element->buff, SYM_LAT, gpsSol.llh.lat);
osdFormatCoordinate(element->buff, SYM_ARROW_NORTH, gpsSol.llh.lat);
} }
static void osdElementGpsLongitude(osdElementParms_t *element) static void osdElementGpsLongitude(osdElementParms_t *element)
{ {
// The SYM_LON symbol in the actual font contains only blank, so we use the SYM_ARROW_EAST osdFormatCoordinate(element->buff, SYM_LON, gpsSol.llh.lon);
osdFormatCoordinate(element->buff, SYM_ARROW_EAST, gpsSol.llh.lon);
} }
static void osdElementGpsSats(osdElementParms_t *element) static void osdElementGpsSats(osdElementParms_t *element)
@ -810,11 +808,11 @@ static void osdElementLogStatus(osdElementParms_t *element)
{ {
if (IS_RC_MODE_ACTIVE(BOXBLACKBOX)) { if (IS_RC_MODE_ACTIVE(BOXBLACKBOX)) {
if (!isBlackboxDeviceWorking()) { if (!isBlackboxDeviceWorking()) {
tfp_sprintf(element->buff, "L-"); tfp_sprintf(element->buff, "%c!", SYM_BBLOG);
} else if (isBlackboxDeviceFull()) { } else if (isBlackboxDeviceFull()) {
tfp_sprintf(element->buff, "L>"); tfp_sprintf(element->buff, "%c>", SYM_BBLOG);
} else { } else {
tfp_sprintf(element->buff, "L%d", blackboxGetLogNumber()); tfp_sprintf(element->buff, "%c%d", SYM_BBLOG, blackboxGetLogNumber());
} }
} }
} }

6
src/test/unit/osd_unittest.cc
View file

@ -826,7 +826,7 @@ TEST(OsdTest, TestElementCoreTemperature)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 8, " 0%c", SYM_C); displayPortTestBufferSubstring(1, 8, "%c 0%c", SYM_TEMPERATURE, SYM_C);
// given // given
simulationCoreTemperature = 33; simulationCoreTemperature = 33;
@ -836,7 +836,7 @@ TEST(OsdTest, TestElementCoreTemperature)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 8, " 33%c", SYM_C); displayPortTestBufferSubstring(1, 8, "%c 33%c", SYM_TEMPERATURE, SYM_C);
// given // given
osdConfigMutable()->units = OSD_UNIT_IMPERIAL; osdConfigMutable()->units = OSD_UNIT_IMPERIAL;
@ -846,7 +846,7 @@ TEST(OsdTest, TestElementCoreTemperature)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 8, " 91%c", SYM_F); displayPortTestBufferSubstring(1, 8, "%c 91%c", SYM_TEMPERATURE, SYM_F);
} }
/* /*