Merge pull request #121 from airgradienthq/hotfix/led-bar-power-up-test-wifi-connection-still-perform

Fix issue: LED bar test presssed but WiFi connection still perform

examples/OneOpenAir/OneOpenAir.ino

@@ -176,28 +176,32 @@ void setup() {
       ledBarEnabledUpdate();
     }
 
-    /** Show message confirm offline mode. */
-    oledDisplay.setText(
-        "Press now for",
-        configuration.isOfflineMode() ? "online mode" : "offline mode", "");
-    uint32_t startTime = millis();
-    while (true) {
-      if (ag->button.getState() == ag->button.BUTTON_PRESSED) {
-        configuration.setOfflineMode(!configuration.isOfflineMode());
+    /** Show message confirm offline mode, should me perform if LED bar button
+     * test pressed */
+    if (ledBarButtonTest == false) {
+      oledDisplay.setText(
+          "Press now for",
+          configuration.isOfflineMode() ? "online mode" : "offline mode", "");
+      uint32_t startTime = millis();
+      while (true) {
+        if (ag->button.getState() == ag->button.BUTTON_PRESSED) {
+          configuration.setOfflineMode(!configuration.isOfflineMode());
 
-        oledDisplay.setText(
-        "Offline Mode",
-        configuration.isOfflineMode() ? " = True" : "  = False", "");
-        delay(1000);
-        break;
-      }
-      uint32_t periodMs = (uint32_t)(millis() - startTime);
-      if (periodMs >= 3000) {
-        break;
+          oledDisplay.setText(
+              "Offline Mode",
+              configuration.isOfflineMode() ? " = True" : "  = False", "");
+          delay(1000);
+          break;
+        }
+        uint32_t periodMs = (uint32_t)(millis() - startTime);
+        if (periodMs >= 3000) {
+          break;
+        }
       }
+      connectToWifi = !configuration.isOfflineMode();
+    } else {
+      configuration.setOfflineModeWithoutSave(true);
     }
-    connectToWifi = !configuration.isOfflineMode();
-
   } else {
     connectToWifi = true;
   }
@@ -234,6 +238,11 @@ void setup() {
       }
     }
   }
+  /** Set offline mode without saving, cause wifi is not configured */
+  if (wifiConnector.hasConfigurated() == false) {
+    Serial.println("Set offline mode cause wifi is not configurated");
+    configuration.setOfflineModeWithoutSave(true);
+  }
 
   /** Show display Warning up */
   if (ag->isOne()) {
@@ -1099,7 +1108,7 @@ static void updatePm(void) {
 
 static void sendDataToServer(void) {
   /** Ignore send data to server if postToAirGradient disabled */
-  if (configuration.isPostDataToAirGradient() == false) {
+  if (configuration.isPostDataToAirGradient() == false || configuration.isOfflineMode()) {
     return;
   }
 

src/AgApiClient.cpp

@@ -34,7 +34,8 @@ void AgApiClient::begin(void) {
  */
 bool AgApiClient::fetchServerConfiguration(void) {
   if (config.getConfigurationControl() ==
-      ConfigurationControl::ConfigurationControlLocal) {
+          ConfigurationControl::ConfigurationControlLocal ||
+      config.isOfflineMode()) {
     logWarning("Ignore fetch server configuration");
 
     // Clear server configuration failed flag, cause it's ignore but not

src/AgConfigure.cpp

@@ -1193,7 +1193,7 @@ int Configuration::getDisplayBrightness(void) {
 
 bool Configuration::isOfflineMode(void) {
   bool offline = jconfig[jprop_offlineMode];
-  return offline;
+  return (offline || _offlineMode);
 }
 
 void Configuration::setOfflineMode(bool offline) {
@@ -1202,6 +1202,10 @@ void Configuration::setOfflineMode(bool offline) {
   saveConfig();
 }
 
+void Configuration::setOfflineModeWithoutSave(bool offline) {
+  _offlineMode = offline;
+}
+
 bool Configuration::isDisplayBrightnessChanged(void) {
   bool changed = displayBrightnessChanged;
   displayBrightnessChanged = false;

src/AgConfigure.h

@@ -17,6 +17,7 @@ private:
   bool ledBarBrightnessChanged = false;
   bool displayBrightnessChanged = false;
   String otaNewFirmwareVersion;
+  bool _offlineMode = false;
 
   AirGradient* ag;
 
@@ -80,6 +81,7 @@ public:
   String newFirmwareVersion(void);
   bool isOfflineMode(void);
   void setOfflineMode(bool offline);
+  void setOfflineModeWithoutSave(bool offline);
 };
 
 #endif /** _AG_CONFIG_H_ */

src/AgWiFiConnector.cpp

@@ -345,3 +345,16 @@ int WifiConnector::RSSI(void) { return WiFi.RSSI(); }
  * @return String
  */
 String WifiConnector::localIpStr(void) { return WiFi.localIP().toString(); }
+
+/**
+ * @brief Get status that wifi has configurated
+ * 
+ * @return true Configurated
+ * @return false Not Configurated
+ */
+bool WifiConnector::hasConfigurated(void) {
+  if (WiFi.SSID().isEmpty()) {
+    return false;
+  }
+  return true;
+}

src/AgWiFiConnector.h

@@ -50,6 +50,7 @@ public:
   void reset(void);
   int RSSI(void);
   String localIpStr(void);
+  bool hasConfigurated(void);
 };
 
 #endif /** _AG_WIFI_CONNECTOR_H_ */