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

Merge pull request #6232 from McGiverGim/add_elements_osd_order_loop

Browse source 
Add OSD elements to order loop
This commit is contained in:
Michael Keller 2018-08-16 23:57:46 +12:00 • committed by GitHub
commit d4eabba541
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -200,7 +200,16 @@ static const uint8_t osdElementDisplayOrder[] = {
OSD_NUMERICAL_HEADING, OSD_NUMERICAL_HEADING,
OSD_NUMERICAL_VARIO, OSD_NUMERICAL_VARIO,
OSD_COMPASS_BAR, OSD_COMPASS_BAR,
OSD_ANTI_GRAVITY OSD_ANTI_GRAVITY,
#ifdef USE_RTC_TIME
OSD_RTC_DATETIME,
#endif
#ifdef USE_OSD_ADJUSTMENTS
OSD_ADJUSTMENT_RANGE,
#endif
#ifdef USE_ADC_INTERNAL
OSD_CORE_TEMPERATURE,
#endif
}; };
PG_REGISTER_WITH_RESET_FN(osdConfig_t, osdConfig, PG_OSD_CONFIG, 3); PG_REGISTER_WITH_RESET_FN(osdConfig_t, osdConfig, PG_OSD_CONFIG, 3);
@ -1016,17 +1025,6 @@ static void osdDrawElements(void)
} }
#endif #endif
#ifdef USE_RTC_TIME
osdDrawSingleElement(OSD_RTC_DATETIME);
#endif
#ifdef USE_OSD_ADJUSTMENTS
osdDrawSingleElement(OSD_ADJUSTMENT_RANGE);
#endif
#ifdef USE_ADC_INTERNAL
osdDrawSingleElement(OSD_CORE_TEMPERATURE);
#endif
} }
void pgResetFn_osdConfig(osdConfig_t *osdConfig) void pgResetFn_osdConfig(osdConfig_t *osdConfig)