From ce6582b88a933ffb77cdda300e8876effc00c408 Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Sat, 13 Dec 2014 03:45:39 +0000
Subject: [PATCH] GPS - remove temporary hack for fixing the OLED page to the
 GPS page. Fix incorrect flag usage.

---
 src/main/io/display.c | 20 +++-----------------
 src/main/io/display.h | 16 +++++++++++++++-
 src/main/main.c       |  7 +++++--
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/main/io/display.c b/src/main/io/display.c
index b2109d19a2..010eb1fbd1 100644
--- a/src/main/io/display.c
+++ b/src/main/io/display.c
@@ -70,20 +70,6 @@ static rxConfig_t *rxConfig;
 
 static char lineBuffer[SCREEN_CHARACTER_COLUMN_COUNT + 1];
 
-typedef enum {
-    PAGE_WELCOME,
-    PAGE_ARMED,
-    PAGE_BATTERY,
-    PAGE_SENSORS,
-    PAGE_RX,
-    PAGE_PROFILE,
-    PAGE_GPS
-#ifdef ENABLE_DEBUG_OLED_PAGE
-    ,
-    PAGE_DEBUG
-#endif
-} pageId_e;
-
 const char* pageTitles[] = {
     "CLEANFLIGHT",
     "ARMED",
@@ -442,7 +428,7 @@ void updateDisplay(void)
         }
 
         pageState.pageChanging = (pageState.pageFlags & PAGE_STATE_FLAG_FORCE_PAGE_CHANGE) ||
-                (((int32_t)(now - pageState.nextPageAt) >= 0L && (pageState.pageFlags & PAGE_STATE_FLAG_FORCE_PAGE_CHANGE)));
+                (((int32_t)(now - pageState.nextPageAt) >= 0L && (pageState.pageFlags & PAGE_STATE_FLAG_CYCLE_ENABLED)));
         if (pageState.pageChanging && (pageState.pageFlags & PAGE_STATE_FLAG_CYCLE_ENABLED)) {
             pageState.cycleIndex++;
             pageState.cycleIndex = pageState.cycleIndex % CYCLE_PAGE_ID_COUNT;
@@ -511,9 +497,9 @@ void displayInit(rxConfig_t *rxConfigToUse)
     displaySetNextPageChangeAt(micros() + (1000 * 1000 * 5));
 }
 
-void displayShowFixedPage(void)
+void displayShowFixedPage(pageId_e pageId)
 {
-    displaySetPage(PAGE_GPS);
+    displaySetPage(pageId);
     displayDisablePageCycling();
 }
 
diff --git a/src/main/io/display.h b/src/main/io/display.h
index ae554d72e1..5791e3e0f2 100644
--- a/src/main/io/display.h
+++ b/src/main/io/display.h
@@ -15,9 +15,23 @@
  * along with Cleanflight.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+typedef enum {
+    PAGE_WELCOME,
+    PAGE_ARMED,
+    PAGE_BATTERY,
+    PAGE_SENSORS,
+    PAGE_RX,
+    PAGE_PROFILE,
+    PAGE_GPS
+#ifdef ENABLE_DEBUG_OLED_PAGE
+    ,
+    PAGE_DEBUG
+#endif
+} pageId_e;
+
 void updateDisplay(void);
 
-void displayShowFixedPage(void);
+void displayShowFixedPage(pageId_e pageId);
 
 void displayEnablePageCycling(void);
 void displayDisablePageCycling(void);
diff --git a/src/main/main.c b/src/main/main.c
index 47158bbc3d..be109e3395 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -360,8 +360,11 @@ void init(void)
 
 #ifdef DISPLAY
     if (feature(FEATURE_DISPLAY)) {
-        //displayEnablePageCycling();
-        displayShowFixedPage();
+#ifdef USE_OLED_GPS_DEBUG_PAGE_ONLY
+        displayShowFixedPage(PAGE_GPS);
+#else
+        displayEnablePageCycling();
+#endif
     }
 #endif
 }