Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 14:25:20 +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

5
src/main/osd/osd.h
View file

@ -131,6 +131,7 @@ typedef enum {
OSD_RATE_PROFILE_NAME,
OSD_PID_PROFILE_NAME,
OSD_PROFILE_NAME,
OSD_RSSI_DBM_VALUE,
OSD_ITEM_COUNT // MUST BE LAST
} osd_items_e;
@ -167,6 +168,7 @@ typedef enum {
OSD_STAT_TOTAL_FLIGHTS,
OSD_STAT_TOTAL_TIME,
OSD_STAT_TOTAL_DIST,
OSD_STAT_MIN_RSSI_DBM,
OSD_STAT_COUNT // MUST BE LAST
} osd_stats_e;
@ -215,6 +217,7 @@ typedef enum {
OSD_WARNING_GPS_RESCUE_DISABLED,
OSD_WARNING_RSSI,
OSD_WARNING_LINK_QUALITY,
OSD_WARNING_RSSI_DBM,
OSD_WARNING_COUNT // MUST BE LAST
} osdWarningsFlags_e;
@ -254,6 +257,7 @@ typedef struct osdConfig_s {
uint8_t overlay_radio_mode;
char profile[OSD_PROFILE_COUNT][OSD_PROFILE_NAME_LENGTH + 1];
uint16_t link_quality_alarm;
uint8_t rssi_dbm_alarm;
} osdConfig_t;
PG_DECLARE(osdConfig_t, osdConfig);
@ -270,6 +274,7 @@ typedef struct statistic_s {
int16_t max_esc_temp;
int32_t max_esc_rpm;
uint16_t min_link_quality;
uint8_t min_rssi_dbm;
} statistic_t;
extern timeUs_t resumeRefreshAt;