From 78ded9e6f778eebeb5722e6e8410d2948324b2eb Mon Sep 17 00:00:00 2001 From: "brucesdad13@gmail.com" Date: Wed, 19 Jul 2017 21:01:20 -0400 Subject: [PATCH 1/2] * OLED display showed CLEANFLIGHT V3.2.0... cahnged to BETAFLIGHT ~ Charlie Stevenson --- src/main/io/dashboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/io/dashboard.c b/src/main/io/dashboard.c index 546b17f5da..297873bdff 100644 --- a/src/main/io/dashboard.c +++ b/src/main/io/dashboard.c @@ -572,7 +572,7 @@ static void showDebugPage(void) #endif static const pageEntry_t pages[PAGE_COUNT] = { - { PAGE_WELCOME, "CLEANFLIGHT", showWelcomePage, PAGE_FLAGS_SKIP_CYCLING }, + { PAGE_WELCOME, "BETAFLIGHT", showWelcomePage, PAGE_FLAGS_SKIP_CYCLING }, { PAGE_ARMED, "ARMED", showArmedPage, PAGE_FLAGS_SKIP_CYCLING }, { PAGE_PROFILE, "PROFILE", showProfilePage, PAGE_FLAGS_NONE }, #ifdef GPS From 3c010c98d0b32abbad6db2e332226a52dfb158ff Mon Sep 17 00:00:00 2001 From: "brucesdad13@gmail.com" Date: Wed, 19 Jul 2017 23:47:44 -0400 Subject: [PATCH 2/2] @jflyper gave a recommendation to improve PR #3568 to remove hardcoded strings for firmware revision--implemented. ~ Charlie Stevenson --- src/main/io/dashboard.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/io/dashboard.c b/src/main/io/dashboard.c index 297873bdff..33275acf97 100644 --- a/src/main/io/dashboard.c +++ b/src/main/io/dashboard.c @@ -572,20 +572,20 @@ static void showDebugPage(void) #endif static const pageEntry_t pages[PAGE_COUNT] = { - { PAGE_WELCOME, "BETAFLIGHT", showWelcomePage, PAGE_FLAGS_SKIP_CYCLING }, - { PAGE_ARMED, "ARMED", showArmedPage, PAGE_FLAGS_SKIP_CYCLING }, - { PAGE_PROFILE, "PROFILE", showProfilePage, PAGE_FLAGS_NONE }, + { PAGE_WELCOME, FC_FIRMWARE_NAME, showWelcomePage, PAGE_FLAGS_SKIP_CYCLING }, + { PAGE_ARMED, "ARMED", showArmedPage, PAGE_FLAGS_SKIP_CYCLING }, + { PAGE_PROFILE, "PROFILE", showProfilePage, PAGE_FLAGS_NONE }, #ifdef GPS - { PAGE_GPS, "GPS", showGpsPage, PAGE_FLAGS_NONE }, + { PAGE_GPS, "GPS", showGpsPage, PAGE_FLAGS_NONE }, #endif - { PAGE_RX, "RX", showRxPage, PAGE_FLAGS_NONE }, - { PAGE_BATTERY, "BATTERY", showBatteryPage, PAGE_FLAGS_NONE }, - { PAGE_SENSORS, "SENSORS", showSensorsPage, PAGE_FLAGS_NONE }, + { PAGE_RX, "RX", showRxPage, PAGE_FLAGS_NONE }, + { PAGE_BATTERY, "BATTERY", showBatteryPage, PAGE_FLAGS_NONE }, + { PAGE_SENSORS, "SENSORS", showSensorsPage, PAGE_FLAGS_NONE }, #ifndef SKIP_TASK_STATISTICS - { PAGE_TASKS, "TASKS", showTasksPage, PAGE_FLAGS_NONE }, + { PAGE_TASKS, "TASKS", showTasksPage, PAGE_FLAGS_NONE }, #endif #ifdef ENABLE_DEBUG_DASHBOARD_PAGE - { PAGE_DEBUG, "DEBUG", showDebugPage, PAGE_FLAGS_NONE }, + { PAGE_DEBUG, "DEBUG", showDebugPage, PAGE_FLAGS_NONE }, #endif };