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

Improve formatting of some numerical OSD elements

Browse source 
- Moved units to the right of the number
- Added adequate left padding
This commit is contained in:
Dan Nixon 2017-07-26 12:54:17 +01:00
parent ad334113e2
commit 28fb930c1f
2 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/main/io/osd.c
View file

@ -206,6 +206,16 @@ static int32_t osdGetMetersToSelectedUnit(int32_t meters)
} }
} }
static void osdFormatAltitudeString(char * buff, int altitude, bool pad)
{
const int alt = osdGetMetersToSelectedUnit(altitude);
int altitudeIntergerPart = abs(alt / 100);
if (alt < 0) {
altitudeIntergerPart *= -1;
}
tfp_sprintf(buff, pad ? "%4d.%01d%c" : "%d.%01d%c", altitudeIntergerPart, abs((alt % 100) / 10), osdGetMetersToSelectedUnitSymbol());
}
static void osdFormatPID(char * buff, const char * label, const pid8_t * pid) static void osdFormatPID(char * buff, const char * label, const pid8_t * pid)
{ {
tfp_sprintf(buff, "%s %3d %3d %3d", label, pid->P, pid->I, pid->D); tfp_sprintf(buff, "%s %3d %3d %3d", label, pid->P, pid->I, pid->D);
@ -309,8 +319,7 @@ static void osdDrawSingleElement(uint8_t item)
if (osdRssi >= 100) if (osdRssi >= 100)
osdRssi = 99; osdRssi = 99;
buff[0] = SYM_RSSI; tfp_sprintf(buff, "%c%d", SYM_RSSI, osdRssi);
tfp_sprintf(buff + 1, "%d", osdRssi);
break; break;
} }
@ -322,20 +331,17 @@ static void osdDrawSingleElement(uint8_t item)
case OSD_CURRENT_DRAW: case OSD_CURRENT_DRAW:
{ {
const int32_t amperage = getAmperage(); const int32_t amperage = getAmperage();
buff[0] = SYM_AMP; tfp_sprintf(buff, "%3d.%02d%c", abs(amperage) / 100, abs(amperage) % 100, SYM_AMP);
tfp_sprintf(buff + 1, "%d.%02d", abs(amperage) / 100, abs(amperage) % 100);
break; break;
} }
case OSD_MAH_DRAWN: case OSD_MAH_DRAWN:
buff[0] = SYM_MAH; tfp_sprintf(buff, "%4d%c", getMAhDrawn(), SYM_MAH);
tfp_sprintf(buff + 1, "%d", getMAhDrawn());
break; break;
#ifdef GPS #ifdef GPS
case OSD_GPS_SATS: case OSD_GPS_SATS:
buff[0] = 0x1f; tfp_sprintf(buff, "%c%d", 0x1f, gpsSol.numSat);
tfp_sprintf(buff + 1, "%d", gpsSol.numSat);
break; break;
case OSD_GPS_SPEED: case OSD_GPS_SPEED:
@ -410,8 +416,7 @@ static void osdDrawSingleElement(uint8_t item)
case OSD_ALTITUDE: case OSD_ALTITUDE:
{ {
const int32_t alt = osdGetMetersToSelectedUnit(getEstimatedAltitude()); osdFormatAltitudeString(buff, getEstimatedAltitude(), true);
tfp_sprintf(buff, "%c%d.%01d%c", alt < 0 ? '-' : ' ', abs(alt / 100), abs((alt % 100) / 10), osdGetMetersToSelectedUnitSymbol());
break; break;
} }
@ -682,8 +687,7 @@ static void osdDrawSingleElement(uint8_t item)
} }
#ifdef USE_ESC_SENSOR #ifdef USE_ESC_SENSOR
case OSD_ESC_TMP: case OSD_ESC_TMP:
buff[0] = SYM_TEMP_C; tfp_sprintf(buff, "%d%c", escData == NULL ? 0 : escData->temperature, SYM_TEMP_C);
tfp_sprintf(buff + 1, "%d", escData == NULL ? 0 : escData->temperature);
break; break;
case OSD_ESC_RPM: case OSD_ESC_RPM:
@ -1078,8 +1082,7 @@ static void osdShowStats(void)
} }
if (osdConfig()->enabled_stats[OSD_STAT_MAX_ALTITUDE]) { if (osdConfig()->enabled_stats[OSD_STAT_MAX_ALTITUDE]) {
int32_t alt = osdGetMetersToSelectedUnit(stats.max_altitude); osdFormatAltitudeString(buff, stats.max_altitude, false);
tfp_sprintf(buff, "%c%d.%01d%c", alt < 0 ? '-' : ' ', abs(alt / 100), abs((alt % 100) / 10), osdGetMetersToSelectedUnitSymbol());
osdDisplayStatisticLabel(top++, "MAX ALTITUDE", buff); osdDisplayStatisticLabel(top++, "MAX ALTITUDE", buff);
} }

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

@ -535,7 +535,7 @@ TEST(OsdTest, TestElementAmperage)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 12, "%c0.00", SYM_AMP); displayPortTestBufferSubstring(1, 12, " 0.00%c", SYM_AMP);
// when // when
simulationBatteryAmperage = 2156; simulationBatteryAmperage = 2156;
@ -543,7 +543,7 @@ TEST(OsdTest, TestElementAmperage)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 12, "%c21.56", SYM_AMP); displayPortTestBufferSubstring(1, 12, " 21.56%c", SYM_AMP);
// when // when
simulationBatteryAmperage = 12345; simulationBatteryAmperage = 12345;
@ -551,7 +551,7 @@ TEST(OsdTest, TestElementAmperage)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 12, "%c123.45", SYM_AMP); displayPortTestBufferSubstring(1, 12, "123.45%c", SYM_AMP);
} }
/* /*
@ -568,7 +568,7 @@ TEST(OsdTest, TestElementMahDrawn)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 11, "%c0", SYM_MAH); displayPortTestBufferSubstring(1, 11, " 0%c", SYM_MAH);
// when // when
simulationMahDrawn = 4; simulationMahDrawn = 4;
@ -576,7 +576,7 @@ TEST(OsdTest, TestElementMahDrawn)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 11, "%c4", SYM_MAH); displayPortTestBufferSubstring(1, 11, " 4%c", SYM_MAH);
// when // when
simulationMahDrawn = 15; simulationMahDrawn = 15;
@ -584,7 +584,7 @@ TEST(OsdTest, TestElementMahDrawn)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 11, "%c15", SYM_MAH); displayPortTestBufferSubstring(1, 11, " 15%c", SYM_MAH);
// when // when
simulationMahDrawn = 246; simulationMahDrawn = 246;
@ -592,7 +592,7 @@ TEST(OsdTest, TestElementMahDrawn)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 11, "%c246", SYM_MAH); displayPortTestBufferSubstring(1, 11, " 246%c", SYM_MAH);
// when // when
simulationMahDrawn = 1042; simulationMahDrawn = 1042;
@ -600,7 +600,7 @@ TEST(OsdTest, TestElementMahDrawn)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 11, "%c1042", SYM_MAH); displayPortTestBufferSubstring(1, 11, "1042%c", SYM_MAH);
} }
/* /*
@ -644,7 +644,7 @@ TEST(OsdTest, TestElementAltitude)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(23, 7, "-2.4%c", SYM_M); displayPortTestBufferSubstring(23, 7, " -2.4%c", SYM_M);
} }
/* /*