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

Cosmetics around masterConfig.osdProfile.item_pos[]

Browse source
This commit is contained in:
jflyper 2016-11-08 13:18:28 +09:00
parent bf5430a2bd
commit b7342b98e2
1 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -453,47 +453,54 @@ int32_t osdGetAltitude(int32_t alt)
void osdUpdateAlarms(void) void osdUpdateAlarms(void)
{ {
osd_profile_t *pOsdProfile = &masterConfig.osdProfile;
// This is overdone?
// uint16_t *itemPos = masterConfig.osdProfile.item_pos;
int32_t alt = osdGetAltitude(BaroAlt) / 100; int32_t alt = osdGetAltitude(BaroAlt) / 100;
statRssi = rssi * 100 / 1024; statRssi = rssi * 100 / 1024;
if (statRssi < masterConfig.osdProfile.rssi_alarm) if (statRssi < pOsdProfile->rssi_alarm)
masterConfig.osdProfile.item_pos[OSD_RSSI_VALUE] |= BLINK_FLAG; pOsdProfile->item_pos[OSD_RSSI_VALUE] |= BLINK_FLAG;
else else
masterConfig.osdProfile.item_pos[OSD_RSSI_VALUE] &= ~BLINK_FLAG; pOsdProfile->item_pos[OSD_RSSI_VALUE] &= ~BLINK_FLAG;
if (vbat <= (batteryWarningVoltage - 1)) if (vbat <= (batteryWarningVoltage - 1))
masterConfig.osdProfile.item_pos[OSD_MAIN_BATT_VOLTAGE] |= BLINK_FLAG; pOsdProfile->item_pos[OSD_MAIN_BATT_VOLTAGE] |= BLINK_FLAG;
else else
masterConfig.osdProfile.item_pos[OSD_MAIN_BATT_VOLTAGE] &= ~BLINK_FLAG; pOsdProfile->item_pos[OSD_MAIN_BATT_VOLTAGE] &= ~BLINK_FLAG;
if (STATE(GPS_FIX) == 0) if (STATE(GPS_FIX) == 0)
masterConfig.osdProfile.item_pos[OSD_GPS_SATS] |= BLINK_FLAG; pOsdProfile->item_pos[OSD_GPS_SATS] |= BLINK_FLAG;
else else
masterConfig.osdProfile.item_pos[OSD_GPS_SATS] &= ~BLINK_FLAG; pOsdProfile->item_pos[OSD_GPS_SATS] &= ~BLINK_FLAG;
if (flyTime / 60 >= masterConfig.osdProfile.time_alarm && ARMING_FLAG(ARMED)) if (flyTime / 60 >= pOsdProfile->time_alarm && ARMING_FLAG(ARMED))
masterConfig.osdProfile.item_pos[OSD_FLYTIME] |= BLINK_FLAG; pOsdProfile->item_pos[OSD_FLYTIME] |= BLINK_FLAG;
else else
masterConfig.osdProfile.item_pos[OSD_FLYTIME] &= ~BLINK_FLAG; pOsdProfile->item_pos[OSD_FLYTIME] &= ~BLINK_FLAG;
if (mAhDrawn >= masterConfig.osdProfile.cap_alarm) if (mAhDrawn >= pOsdProfile->cap_alarm)
masterConfig.osdProfile.item_pos[OSD_MAH_DRAWN] |= BLINK_FLAG; pOsdProfile->item_pos[OSD_MAH_DRAWN] |= BLINK_FLAG;
else else
masterConfig.osdProfile.item_pos[OSD_MAH_DRAWN] &= ~BLINK_FLAG; pOsdProfile->item_pos[OSD_MAH_DRAWN] &= ~BLINK_FLAG;
if (alt >= masterConfig.osdProfile.alt_alarm) if (alt >= pOsdProfile->alt_alarm)
masterConfig.osdProfile.item_pos[OSD_ALTITUDE] |= BLINK_FLAG; pOsdProfile->item_pos[OSD_ALTITUDE] |= BLINK_FLAG;
else else
masterConfig.osdProfile.item_pos[OSD_ALTITUDE] &= ~BLINK_FLAG; pOsdProfile->item_pos[OSD_ALTITUDE] &= ~BLINK_FLAG;
} }
void osdResetAlarms(void) void osdResetAlarms(void)
{ {
masterConfig.osdProfile.item_pos[OSD_RSSI_VALUE] &= ~BLINK_FLAG; osd_profile_t *pOsdProfile = &masterConfig.osdProfile;
masterConfig.osdProfile.item_pos[OSD_MAIN_BATT_VOLTAGE] &= ~BLINK_FLAG;
masterConfig.osdProfile.item_pos[OSD_GPS_SATS] &= ~BLINK_FLAG; pOsdProfile->item_pos[OSD_RSSI_VALUE] &= ~BLINK_FLAG;
masterConfig.osdProfile.item_pos[OSD_FLYTIME] &= ~BLINK_FLAG; pOsdProfile->item_pos[OSD_MAIN_BATT_VOLTAGE] &= ~BLINK_FLAG;
masterConfig.osdProfile.item_pos[OSD_MAH_DRAWN] &= ~BLINK_FLAG; pOsdProfile->item_pos[OSD_GPS_SATS] &= ~BLINK_FLAG;
pOsdProfile->item_pos[OSD_FLYTIME] &= ~BLINK_FLAG;
pOsdProfile->item_pos[OSD_MAH_DRAWN] &= ~BLINK_FLAG;
} }
void osdResetStats(void) void osdResetStats(void)