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

Merge branch 'master' into 8107-osd-profile-names

Browse source
This commit is contained in:
pkruger 2019-05-22 21:58:36 +10:00 • committed by GitHub
commit b8a9e46a8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 3695 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/osd/osd.c
View file

@ -244,6 +244,7 @@ void pgResetFn_osdConfig(osdConfig_t *osdConfig)
// turn off RSSI & Link Quality warnings by default
osdWarnSetState(OSD_WARNING_RSSI, false);
osdWarnSetState(OSD_WARNING_LINK_QUALITY, false);
osdWarnSetState(OSD_WARNING_RSSI_DBM, false);
osdConfig->timers[OSD_TIMER_1] = osdTimerDefault[OSD_TIMER_1];
osdConfig->timers[OSD_TIMER_2] = osdTimerDefault[OSD_TIMER_2];
@ -264,10 +265,10 @@ void pgResetFn_osdConfig(osdConfig_t *osdConfig)
osdConfig->osdProfileIndex = 1;
osdConfig->ahInvert = false;
for (int i=0; i < OSD_PROFILE_COUNT; i++) {
osdConfig->profile[i][0] = '\0';
}
osdConfig->rssi_dbm_alarm = 60;
}
static void osdDrawLogo(int x, int y)
@ -346,6 +347,7 @@ static void osdResetStats(void)
stats.max_esc_temp = 0;
stats.max_esc_rpm = 0;
stats.min_link_quality = (linkQualitySource == LQ_SOURCE_RX_PROTOCOL_CRSF) ? 300 : 99; // CRSF : percent
stats.min_rssi_dbm = 0;
}
static void osdUpdateStats(void)
@ -392,6 +394,13 @@ static void osdUpdateStats(void)
}
#endif
#ifdef USE_RX_RSSI_DBM
value = getRssiDbm();
if (stats.min_rssi_dbm < value) {
stats.min_rssi_dbm = value;
}
#endif
#ifdef USE_GPS
if (STATE(GPS_FIX) && STATE(GPS_FIX_HOME)) {
value = GPS_distanceToHome;
@ -635,6 +644,13 @@ static uint8_t osdShowStats(uint16_t endBatteryVoltage, int statsRowCount)
}
#endif
#ifdef USE_RX_RSSI_DBM
if (osdStatGetState(OSD_STAT_MIN_RSSI_DBM)) {
tfp_sprintf(buff, "%3d", stats.min_rssi_dbm * -1);
osdDisplayStatisticLabel(top++, "MIN RSSI DBM", buff);
}
#endif
#ifdef USE_PERSISTENT_STATS
if (osdStatGetState(OSD_STAT_TOTAL_FLIGHTS)) {
itoa(statsConfig()->stats_total_flights, buff, 10);