mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-24 16:55:36 +03:00
Improve formatting of some numerical OSD elements
- Moved units to the right of the number - Added adequate left padding
This commit is contained in:
Dan Nixon
parent
ad334113e2
commit
28fb930c1f
2 changed files with 33 additions and 30 deletions
|
|
@ -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)
|
||||
{
|
||||
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)
|
||||
osdRssi = 99;
|
||||
|
||||
buff[0] = SYM_RSSI;
|
||||
tfp_sprintf(buff + 1, "%d", osdRssi);
|
||||
tfp_sprintf(buff, "%c%d", SYM_RSSI, osdRssi);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -322,20 +331,17 @@ static void osdDrawSingleElement(uint8_t item)
|
|||
case OSD_CURRENT_DRAW:
|
||||
{
|
||||
const int32_t amperage = getAmperage();
|
||||
buff[0] = SYM_AMP;
|
||||
tfp_sprintf(buff + 1, "%d.%02d", abs(amperage) / 100, abs(amperage) % 100);
|
||||
tfp_sprintf(buff, "%3d.%02d%c", abs(amperage) / 100, abs(amperage) % 100, SYM_AMP);
|
||||
break;
|
||||
}
|
||||
|
||||
case OSD_MAH_DRAWN:
|
||||
buff[0] = SYM_MAH;
|
||||
tfp_sprintf(buff + 1, "%d", getMAhDrawn());
|
||||
tfp_sprintf(buff, "%4d%c", getMAhDrawn(), SYM_MAH);
|
||||
break;
|
||||
|
||||
#ifdef GPS
|
||||
case OSD_GPS_SATS:
|
||||
buff[0] = 0x1f;
|
||||
tfp_sprintf(buff + 1, "%d", gpsSol.numSat);
|
||||
tfp_sprintf(buff, "%c%d", 0x1f, gpsSol.numSat);
|
||||
break;
|
||||
|
||||
case OSD_GPS_SPEED:
|
||||
|
|
@ -410,8 +416,7 @@ static void osdDrawSingleElement(uint8_t item)
|
|||
|
||||
case OSD_ALTITUDE:
|
||||
{
|
||||
const int32_t alt = osdGetMetersToSelectedUnit(getEstimatedAltitude());
|
||||
tfp_sprintf(buff, "%c%d.%01d%c", alt < 0 ? '-' : ' ', abs(alt / 100), abs((alt % 100) / 10), osdGetMetersToSelectedUnitSymbol());
|
||||
osdFormatAltitudeString(buff, getEstimatedAltitude(), true);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -682,8 +687,7 @@ static void osdDrawSingleElement(uint8_t item)
|
|||
}
|
||||
#ifdef USE_ESC_SENSOR
|
||||
case OSD_ESC_TMP:
|
||||
buff[0] = SYM_TEMP_C;
|
||||
tfp_sprintf(buff + 1, "%d", escData == NULL ? 0 : escData->temperature);
|
||||
tfp_sprintf(buff, "%d%c", escData == NULL ? 0 : escData->temperature, SYM_TEMP_C);
|
||||
break;
|
||||
|
||||
case OSD_ESC_RPM:
|
||||
|
|
@ -1078,8 +1082,7 @@ static void osdShowStats(void)
|
|||
}
|
||||
|
||||
if (osdConfig()->enabled_stats[OSD_STAT_MAX_ALTITUDE]) {
|
||||
int32_t alt = osdGetMetersToSelectedUnit(stats.max_altitude);
|
||||
tfp_sprintf(buff, "%c%d.%01d%c", alt < 0 ? '-' : ' ', abs(alt / 100), abs((alt % 100) / 10), osdGetMetersToSelectedUnitSymbol());
|
||||
osdFormatAltitudeString(buff, stats.max_altitude, false);
|
||||
osdDisplayStatisticLabel(top++, "MAX ALTITUDE", buff);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -340,7 +340,7 @@ TEST(OsdTest, TestStatsImperial)
|
|||
displayPortTestBufferSubstring(2, row++, "MIN BATTERY : 14.7%c", SYM_VOLT);
|
||||
displayPortTestBufferSubstring(2, row++, "END BATTERY : 15.2%c", SYM_VOLT);
|
||||
displayPortTestBufferSubstring(2, row++, "MIN RSSI : 25%%");
|
||||
displayPortTestBufferSubstring(2, row++, "MAX ALTITUDE : 6.5%c", SYM_FT);
|
||||
displayPortTestBufferSubstring(2, row++, "MAX ALTITUDE : 6.5%c", SYM_FT);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -390,7 +390,7 @@ TEST(OsdTest, TestStatsMetric)
|
|||
displayPortTestBufferSubstring(2, row++, "MIN BATTERY : 14.7%c", SYM_VOLT);
|
||||
displayPortTestBufferSubstring(2, row++, "END BATTERY : 15.2%c", SYM_VOLT);
|
||||
displayPortTestBufferSubstring(2, row++, "MIN RSSI : 25%%");
|
||||
displayPortTestBufferSubstring(2, row++, "MAX ALTITUDE : 2.0%c", SYM_M);
|
||||
displayPortTestBufferSubstring(2, row++, "MAX ALTITUDE : 2.0%c", SYM_M);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -406,7 +406,7 @@ TEST(OsdTest, TestAlarms)
|
|||
// the following OSD elements are visible
|
||||
osdConfigMutable()->item_pos[OSD_RSSI_VALUE] = OSD_POS(8, 1) | VISIBLE_FLAG;
|
||||
osdConfigMutable()->item_pos[OSD_MAIN_BATT_VOLTAGE] = OSD_POS(12, 1) | VISIBLE_FLAG;
|
||||
osdConfigMutable()->item_pos[OSD_ITEM_TIMER_1] = OSD_POS(20, 1) | VISIBLE_FLAG;
|
||||
osdConfigMutable()->item_pos[OSD_ITEM_TIMER_1] = OSD_POS(20, 1) | VISIBLE_FLAG;
|
||||
osdConfigMutable()->item_pos[OSD_ITEM_TIMER_2] = OSD_POS(1, 1) | VISIBLE_FLAG;
|
||||
osdConfigMutable()->item_pos[OSD_ALTITUDE] = OSD_POS(23, 7) | VISIBLE_FLAG;
|
||||
|
||||
|
|
@ -452,7 +452,7 @@ TEST(OsdTest, TestAlarms)
|
|||
displayPortTestBufferSubstring(12, 1, "%c16.8%c", SYM_BATT_FULL, SYM_VOLT);
|
||||
displayPortTestBufferSubstring(1, 1, "%c00:", SYM_FLY_M); // only test the minute part of the timer
|
||||
displayPortTestBufferSubstring(20, 1, "%c01:", SYM_ON_M); // only test the minute part of the timer
|
||||
displayPortTestBufferSubstring(23, 7, " 0.0%c", SYM_M);
|
||||
displayPortTestBufferSubstring(23, 7, " 0.0%c", SYM_M);
|
||||
}
|
||||
|
||||
// when
|
||||
|
|
@ -535,7 +535,7 @@ TEST(OsdTest, TestElementAmperage)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(1, 12, "%c0.00", SYM_AMP);
|
||||
displayPortTestBufferSubstring(1, 12, " 0.00%c", SYM_AMP);
|
||||
|
||||
// when
|
||||
simulationBatteryAmperage = 2156;
|
||||
|
|
@ -543,7 +543,7 @@ TEST(OsdTest, TestElementAmperage)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(1, 12, "%c21.56", SYM_AMP);
|
||||
displayPortTestBufferSubstring(1, 12, " 21.56%c", SYM_AMP);
|
||||
|
||||
// when
|
||||
simulationBatteryAmperage = 12345;
|
||||
|
|
@ -551,7 +551,7 @@ TEST(OsdTest, TestElementAmperage)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// 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);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(1, 11, "%c0", SYM_MAH);
|
||||
displayPortTestBufferSubstring(1, 11, " 0%c", SYM_MAH);
|
||||
|
||||
// when
|
||||
simulationMahDrawn = 4;
|
||||
|
|
@ -576,7 +576,7 @@ TEST(OsdTest, TestElementMahDrawn)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(1, 11, "%c4", SYM_MAH);
|
||||
displayPortTestBufferSubstring(1, 11, " 4%c", SYM_MAH);
|
||||
|
||||
// when
|
||||
simulationMahDrawn = 15;
|
||||
|
|
@ -584,7 +584,7 @@ TEST(OsdTest, TestElementMahDrawn)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(1, 11, "%c15", SYM_MAH);
|
||||
displayPortTestBufferSubstring(1, 11, " 15%c", SYM_MAH);
|
||||
|
||||
// when
|
||||
simulationMahDrawn = 246;
|
||||
|
|
@ -592,7 +592,7 @@ TEST(OsdTest, TestElementMahDrawn)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(1, 11, "%c246", SYM_MAH);
|
||||
displayPortTestBufferSubstring(1, 11, " 246%c", SYM_MAH);
|
||||
|
||||
// when
|
||||
simulationMahDrawn = 1042;
|
||||
|
|
@ -600,7 +600,7 @@ TEST(OsdTest, TestElementMahDrawn)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(1, 11, "%c1042", SYM_MAH);
|
||||
displayPortTestBufferSubstring(1, 11, "1042%c", SYM_MAH);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -620,7 +620,7 @@ TEST(OsdTest, TestElementAltitude)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(23, 7, " 0.0%c", SYM_M);
|
||||
displayPortTestBufferSubstring(23, 7, " 0.0%c", SYM_M);
|
||||
|
||||
// when
|
||||
simulationAltitude = 247;
|
||||
|
|
@ -628,7 +628,7 @@ TEST(OsdTest, TestElementAltitude)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(23, 7, " 2.4%c", SYM_M);
|
||||
displayPortTestBufferSubstring(23, 7, " 2.4%c", SYM_M);
|
||||
|
||||
// when
|
||||
simulationAltitude = 4247;
|
||||
|
|
@ -636,7 +636,7 @@ TEST(OsdTest, TestElementAltitude)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(23, 7, " 42.4%c", SYM_M);
|
||||
displayPortTestBufferSubstring(23, 7, " 42.4%c", SYM_M);
|
||||
|
||||
// when
|
||||
simulationAltitude = -247;
|
||||
|
|
@ -644,7 +644,7 @@ TEST(OsdTest, TestElementAltitude)
|
|||
osdRefresh(simulationTime);
|
||||
|
||||
// then
|
||||
displayPortTestBufferSubstring(23, 7, "-2.4%c", SYM_M);
|
||||
displayPortTestBufferSubstring(23, 7, " -2.4%c", SYM_M);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue