Add flip screen advanced config (Closes #61)

G4lile0 · Mar 1, 2021 · 987e09f · 987e09f
1 parent ff6d9e2
commit 987e09f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/tinyGS/src/ConfigManager/ConfigManager.cpp b/tinyGS/src/ConfigManager/ConfigManager.cpp
@@ -91,7 +91,6 @@ ConfigManager::ConfigManager()
   groupAdvanced.addItem(&modemParam);
   groupAdvanced.addItem(&advancedConfigParam);
   addParameterGroup(&groupAdvanced);
-
 }
 
 void ConfigManager::handleRoot()
@@ -370,6 +369,9 @@ boolean ConfigManager::init()
     boardDetection();
   }
 
+  if (strlen(advancedConfig))
+    parseAdvancedConf();
+
   return validConfig;
 }
 
@@ -450,10 +452,17 @@ void ConfigManager::parseAdvancedConf()
 
   size_t size = 512;
   DynamicJsonDocument doc(size);
-  deserializeJson(doc, advancedConfig);
+  deserializeJson(doc, (const char*)advancedConfig);
 
   if (doc.containsKey(F("dmode")))
   {
     Log::setLogLevel(doc["dmode"]);
   }
+
+  Serial.print("FlipOled ");
+  if (doc.containsKey(F("flipOled")))
+  {
+    advancedConf.flipOled = doc["flipOled"];
+    Serial.println(advancedConf.flipOled);
+  }
 }
diff --git a/tinyGS/src/ConfigManager/ConfigManager.h b/tinyGS/src/ConfigManager/ConfigManager.h
@@ -107,6 +107,11 @@ typedef struct {
    String   BOARD;
 } board_type;
 
+typedef struct {
+   uint8_t  flipOled = true;
+} AdvancedConfig;
+
+
 class ConfigManager : public IotWebConf2
 {
 public:
@@ -148,6 +153,7 @@ class ConfigManager : public IotWebConf2
   bool isConnected() { return getState() == IOTWEBCONF_STATE_ONLINE; };
   bool isApMode() { return (getState() != IOTWEBCONF_STATE_CONNECTING && getState() != IOTWEBCONF_STATE_ONLINE); }
   board_type getBoardConfig(){ return boards[getBoard()]; }
+  bool getFlipOled(){ return advancedConf.flipOled; }
 
 
 private:
@@ -193,6 +199,7 @@ class ConfigManager : public IotWebConf2
 #endif
   GSConfigHtmlFormatProvider gsConfigHtmlFormatProvider;
   board_type boards[NUM_BOARDS]; 
+  AdvancedConfig advancedConf;
 
   char latitude[COORDINATE_LENGTH] = "";
   char longitude[COORDINATE_LENGTH] = "";

diff --git a/tinyGS/src/Display/Display.cpp b/tinyGS/src/Display/Display.cpp
@@ -66,7 +66,13 @@ void displayInit()
   delay(50);
   digitalWrite(board.OLED__RST, HIGH);   
   display->init();
-  display->flipScreenVertically();
+
+  if (ConfigManager::getInstance().getFlipOled())
+  {
+    display->flipScreenVertically();
+    Serial.println("Flip");
+  }
+
 }
 
 void msOverlay(OLEDDisplay *display, OLEDDisplayUiState* state)