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

Tidy formatting in osd.c

Browse source
This commit is contained in:
Dan Nixon 2017-05-23 17:07:56 +01:00
parent 7b6dc1b005
commit 4c47e2e972
1 changed files with 265 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -109,8 +109,6 @@ static uint32_t blinkBits[(OSD_ITEM_COUNT + 31)/32];
#define IS_LO(X) (rcData[X] < 1250)
#define IS_MID(X) (rcData[X] > 1250 && rcData[X] < 1750)
//extern uint8_t RSSI; // TODO: not used?
static uint16_t flyTime = 0;
static uint8_t statRssi;
@ -192,11 +190,9 @@ static void osdDrawSingleElement(uint8_t item)
}
case OSD_MAIN_BATT_VOLTAGE:
{
buff[0] = SYM_BATT_5;
tfp_sprintf(buff + 1, "%d.%1dV", getBatteryVoltage() / 10, getBatteryVoltage() % 10);
break;
}
case OSD_CURRENT_DRAW:
{
@ -207,26 +203,20 @@ static void osdDrawSingleElement(uint8_t item)
}
case OSD_MAH_DRAWN:
{
buff[0] = SYM_MAH;
tfp_sprintf(buff + 1, "%d", getMAhDrawn());
break;
}
#ifdef GPS
case OSD_GPS_SATS:
{
buff[0] = 0x1f;
tfp_sprintf(buff + 1, "%d", GPS_numSat);
break;
}
case OSD_GPS_SPEED:
{
// FIXME ideally we want to use SYM_KMH symbol but it's not in the font any more, so we use K.
tfp_sprintf(buff, "%dK", CM_S_TO_KM_H(GPS_speed) * 10);
break;
}
case OSD_GPS_LAT:
case OSD_GPS_LON:
@ -269,18 +259,14 @@ static void osdDrawSingleElement(uint8_t item)
}
case OSD_FLYTIME:
{
buff[0] = SYM_FLY_M;
tfp_sprintf(buff + 1, "%02d:%02d", flyTime / 60, flyTime % 60);
break;
}
case OSD_ARMED_TIME:
{
buff[0] = SYM_FLY_M;
tfp_sprintf(buff + 1, "%02d:%02d", stats.armed_time / 60, stats.armed_time % 60);
break;
}
case OSD_FLYMODE:
{
@ -316,12 +302,10 @@ static void osdDrawSingleElement(uint8_t item)
}
case OSD_THROTTLE_POS:
{
buff[0] = SYM_THR;
buff[1] = SYM_THR1;
tfp_sprintf(buff + 2, "%d", (constrain(rcData[THROTTLE], PWM_RANGE_MIN, PWM_RANGE_MAX) - PWM_RANGE_MIN) * 100 / (PWM_RANGE_MAX - PWM_RANGE_MIN));
break;
}
#if defined(VTX_COMMON)
case OSD_VTX_CHANNEL:
@ -435,10 +419,8 @@ static void osdDrawSingleElement(uint8_t item)
}
case OSD_POWER:
{
tfp_sprintf(buff, "%dW", getAmperage() * getBatteryVoltage() / 1000);
break;
}
case OSD_PIDRATE_PROFILE:
{
@ -449,7 +431,6 @@ static void osdDrawSingleElement(uint8_t item)
}
case OSD_MAIN_BATT_WARNING:
{
switch(getBatteryState()) {
case BATTERY_WARNING:
tfp_sprintf(buff, "LOW BATTERY");
@ -464,7 +445,6 @@ static void osdDrawSingleElement(uint8_t item)
return;
}
break;
}
case OSD_AVG_CELL_VOLTAGE:
{
@ -475,10 +455,8 @@ static void osdDrawSingleElement(uint8_t item)
}
case OSD_DEBUG:
{
sprintf(buff, "DBG %5d %5d %5d %5d", debug[0], debug[1], debug[2], debug[3]);
break;
}
case OSD_PITCH_ANGLE:
case OSD_ROLL_ANGLE:
@ -723,8 +701,7 @@ void osdUpdateAlarms(void)
if (getMAhDrawn() >= osdConfig()->cap_alarm) {
SET_BLINK(OSD_MAH_DRAWN);
SET_BLINK(OSD_MAIN_BATT_USAGE);
}
else {
} else {
CLR_BLINK(OSD_MAH_DRAWN);
CLR_BLINK(OSD_MAIN_BATT_USAGE);
}