Merge pull request #9441 from jflyper/bfdev-fix-dashboard-init-order

Fix dashboard initialization order
This commit is contained in:
Michael Keller 2020-02-05 12:39:00 +13:00 committed by GitHub
commit 591ab6aff3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions

View File

@ -901,17 +901,6 @@ void init(void)
batteryInit(); // always needs doing, regardless of features.
#ifdef USE_DASHBOARD
if (featureIsEnabled(FEATURE_DASHBOARD)) {
#ifdef USE_OLED_GPS_DEBUG_PAGE_ONLY
dashboardShowFixedPage(PAGE_GPS);
#else
dashboardResetPageCycling();
dashboardEnablePageCycling();
#endif
}
#endif
#ifdef USE_RCDEVICE
rcdeviceInit();
#endif // USE_RCDEVICE
@ -1003,6 +992,12 @@ void init(void)
// Dashbord will register with CMS by itself.
if (featureIsEnabled(FEATURE_DASHBOARD)) {
dashboardInit();
#ifdef USE_OLED_GPS_DEBUG_PAGE_ONLY
dashboardShowFixedPage(PAGE_GPS);
#else
dashboardResetPageCycling();
dashboardEnablePageCycling();
#endif
}
#endif