Apply disableCloudConnection

fetch configuration, post data and ota will be ignored

examples/OneOpenAir/OneOpenAir.ino

@@ -96,6 +96,7 @@ static bool ledBarButtonTest = false;
 static String fwNewVersion;
 
 static void boardInit(void);
+static void initiateNetwork(void);
 static void failedHandler(String msg);
 static void configurationUpdateSchedule(void);
 static void updateDisplayAndLedBar(void);
@@ -208,51 +209,11 @@ void setup() {
     connectToWifi = true;
   }
 
+  // Initiate networking configuration
   if (connectToWifi) {
-    apiClient.begin();
+    initiateNetwork();
-
-    if (wifiConnector.connect()) {
-      if (wifiConnector.isConnected()) {
-        mdnsInit();
-        localServer.begin();
-        initMqtt();
-        sendDataToAg();
-
-        #ifdef ESP8266
-          // ota not supported
-        #else
-          firmwareCheckForUpdate();
-          checkForUpdateSchedule.update();
-        #endif
-
-        apiClient.fetchServerConfiguration();
-        configSchedule.update();
-        if (apiClient.isFetchConfigureFailed()) {
-          if (ag->isOne()) {
-            if (apiClient.isNotAvailableOnDashboard()) {
-              stateMachine.displaySetAddToDashBoard();
-              stateMachine.displayHandle(
-                  AgStateMachineWiFiOkServerOkSensorConfigFailed);
-            } else {
-              stateMachine.displayClearAddToDashBoard();
-            }
-          }
-          stateMachine.handleLeds(
-              AgStateMachineWiFiOkServerOkSensorConfigFailed);
-          delay(DISPLAY_DELAY_SHOW_CONTENT_MS);
-        } else {
-          ledBarEnabledUpdate();
-        }
-      } else {
-        if (wifiConnector.isConfigurePorttalTimeout()) {
-          oledDisplay.showRebooting();
-          delay(2500);
-          oledDisplay.setText("", "", "");
-          ESP.restart();
-        }
-      }
-    }
   }
+
   /** Set offline mode without saving, cause wifi is not configured */
   if (wifiConnector.hasConfigurated() == false) {
     Serial.println("Set offline mode cause wifi is not configurated");
@@ -506,15 +467,21 @@ static bool sgp41Init(void) {
 
 static void firmwareCheckForUpdate(void) {
   Serial.println();
-  Serial.println("firmwareCheckForUpdate:");
+  Serial.print("firmwareCheckForUpdate: ");
 
-  if (wifiConnector.isConnected()) {
+  if (configuration.isOfflineMode() || configuration.isCloudConnectionDisabled()) {
-    Serial.println("firmwareCheckForUpdate: Perform");
+    Serial.println("mode is offline or cloud connection disabled, ignored");
-    otaHandler.setHandlerCallback(otaHandlerCallback);
+    return;
-    otaHandler.updateFirmwareIfOutdated(ag->deviceId());
-  } else {
-    Serial.println("firmwareCheckForUpdate: Ignored");
   }
+  
+  if (!wifiConnector.isConnected()) {
+    Serial.println("wifi not connected, ignored");
+    return;
+  }
+
+  Serial.println("perform");
+  otaHandler.setHandlerCallback(otaHandlerCallback);
+  otaHandler.updateFirmwareIfOutdated(ag->deviceId());
   Serial.println();
 }
 
@@ -871,7 +838,75 @@ static void failedHandler(String msg) {
   }
 }
 
+void initiateNetwork() {
+
+  if (!wifiConnector.connect()) {
+    Serial.println("Cannot initiate wifi connection");
+    return;
+  }
+
+  if (!wifiConnector.isConnected()) {
+    Serial.println("Failed connect to WiFi");
+    if (wifiConnector.isConfigurePorttalTimeout()) {
+      oledDisplay.showRebooting();
+      delay(2500);
+      oledDisplay.setText("", "", "");
+      ESP.restart();
+    }
+
+    // Directly return because the rest of the function applied if wifi is connect only
+    return;
+  }
+
+  // Initiate local network configuration
+  mdnsInit();
+  localServer.begin();
+  // Apply mqtt connection
+  initMqtt();
+
+  // Ignore the rest if cloud connection to AirGradient is disabled
+  if (configuration.isCloudConnectionDisabled()) {
+    return;
+  }
+
+  // Send ping to aigradient server
+  sendDataToAg();
+
+// OTA check
+#ifdef ESP8266
+// ota not supported
+#else
+  firmwareCheckForUpdate();
+  checkForUpdateSchedule.update();
+#endif
+
+  apiClient.fetchServerConfiguration();
+  configSchedule.update();
+  if (apiClient.isFetchConfigureFailed()) {
+    if (ag->isOne()) {
+      if (apiClient.isNotAvailableOnDashboard()) {
+        stateMachine.displaySetAddToDashBoard();
+        stateMachine.displayHandle(AgStateMachineWiFiOkServerOkSensorConfigFailed);
+      } else {
+        stateMachine.displayClearAddToDashBoard();
+      }
+    }
+    stateMachine.handleLeds(AgStateMachineWiFiOkServerOkSensorConfigFailed);
+    delay(DISPLAY_DELAY_SHOW_CONTENT_MS);
+  } else {
+    ledBarEnabledUpdate();
+  }
+}
+
 static void configurationUpdateSchedule(void) {
+  if (configuration.isOfflineMode() || configuration.isCloudConnectionDisabled() ||
+      configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
+    Serial.println("Ignore fetch server configuration. Either mode is offline or cloud connection "
+                   "disabled or configurationControl set to local");
+    apiClient.resetFetchConfigureState();
+    return;
+  }
+
   if (apiClient.fetchServerConfiguration()) {
     configUpdateHandle();
   }
@@ -969,10 +1004,20 @@ static void updateDisplayAndLedBar(void) {
     return;
   }
 
-  AgStateMachineState state = AgStateMachineNormal;
   if (wifiConnector.isConnected() == false) {
-    state = AgStateMachineWiFiLost;
+    stateMachine.displayHandle(AgStateMachineWiFiLost);
-  } else if (apiClient.isFetchConfigureFailed()) {
+    stateMachine.handleLeds(AgStateMachineWiFiLost);
+  }
+
+  if (configuration.isCloudConnectionDisabled()) {
+    // Ignore API related check since cloud is disabled 
+    stateMachine.displayHandle(AgStateMachineNormal);
+    stateMachine.handleLeds(AgStateMachineNormal);
+    return;
+  }
+
+  AgStateMachineState state = AgStateMachineNormal;
+  if (apiClient.isFetchConfigureFailed()) {
     state = AgStateMachineSensorConfigFailed;
     if (apiClient.isNotAvailableOnDashboard()) {
       stateMachine.displaySetAddToDashBoard();
@@ -1140,16 +1185,22 @@ static void sendDataToServer(void) {
   int bootCount = measurements.bootCount() + 1;
   measurements.setBootCount(bootCount);
 
-  /** Ignore send data to server if postToAirGradient disabled */
+  if (configuration.isOfflineMode() || configuration.isCloudConnectionDisabled() ||
-  if (configuration.isPostDataToAirGradient() == false || configuration.isOfflineMode()) {
+      !configuration.isPostDataToAirGradient()) {
+    Serial.println("Ignore send data to server. Either mode is offline or cloud connection is "
+                   "disabled or post data to server disabled");
+    return;
+  }
+
+  if (wifiConnector.isConnected() == false) {
+    Serial.println("WiFi not connected, skip post data to server");
     return;
   }
 
   String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), *ag, configuration);
   if (apiClient.postToServer(syncData)) {
     Serial.println();
-    Serial.println(
+    Serial.println("Online mode and isPostToAirGradient = true");
-        "Online mode and isPostToAirGradient = true: watchdog reset");
     Serial.println();
   }
 

src/AgApiClient.cpp

@@ -34,17 +34,6 @@ void AgApiClient::begin(void) {
  * @return false Failure
  */
 bool AgApiClient::fetchServerConfiguration(void) {
-  if (config.getConfigurationControl() ==
-          ConfigurationControl::ConfigurationControlLocal ||
-      config.isOfflineMode()) {
-    logWarning("Ignore fetch server configuration");
-
-    // Clear server configuration failed flag, cause it's ignore but not
-    // really failed
-    getConfigFailed = false;
-    return false;
-  }
-
   String uri = apiRoot + "/sensors/airgradient:" +
                ag->deviceId() + "/one/config";
 
@@ -114,15 +103,6 @@ bool AgApiClient::fetchServerConfiguration(void) {
  * @return false Failure
  */
 bool AgApiClient::postToServer(String data) {
-  if (config.isPostDataToAirGradient() == false) {
-    logWarning("Ignore post data to server");
-    return true;
-  }
-
-  if (WiFi.isConnected() == false) {
-    return false;
-  }
-
   String uri = apiRoot + "/sensors/airgradient:" + ag->deviceId() + "/measures";
 #ifdef ESP8266
   HTTPClient client;
@@ -175,6 +155,11 @@ bool AgApiClient::postToServer(String data) {
  */
 bool AgApiClient::isFetchConfigureFailed(void) { return getConfigFailed; }
 
+/**
+ * @brief Reset getConfigFailed state to false
+ */
+void AgApiClient::resetFetchConfigureState(void) { getConfigFailed = false; }
+
 /**
  * @brief Get failed status when post data to AirGradient cloud
  *

src/AgApiClient.h

@@ -41,6 +41,7 @@ public:
   bool fetchServerConfiguration(void);
   bool postToServer(String data);
   bool isFetchConfigureFailed(void);
+  void resetFetchConfigureState(void);
   bool isPostToServerFailed(void);
   bool isNotAvailableOnDashboard(void);
   void setAirGradient(AirGradient *ag);

src/AgWiFiConnector.cpp

@@ -81,16 +81,15 @@ bool WifiConnector::connect(void) {
   // ssid = "AG-" + String(ESP.getChipId(), HEX);
   WIFI()->setConfigPortalTimeout(WIFI_CONNECT_COUNTDOWN_MAX);
 
-  WiFiManagerParameter postToAg("chbPostToAg",
+  WiFiManagerParameter disableCloud("chbPostToAg", "Prevent Connection to AirGradient Server", "T",
-                                "Prevent Connection to AirGradient Server", "T",
+                                    2, "type=\"checkbox\" ", WFM_LABEL_AFTER);
-                                2, "type=\"checkbox\" ", WFM_LABEL_AFTER);
+  WIFI()->addParameter(&disableCloud);
-  WIFI()->addParameter(&postToAg);
+  WiFiManagerParameter disableCloudInfo(
-  WiFiManagerParameter postToAgInfo(
       "<p>Prevent connection to the AirGradient Server. Important: Only enable "
       "it if you are sure you don't want to use any AirGradient cloud "
       "features. As a result you will not receive automatic firmware updates "
       "and your data will not reach the AirGradient dashboard.</p>");
-  WIFI()->addParameter(&postToAgInfo);
+  WIFI()->addParameter(&disableCloudInfo);
 
   WIFI()->autoConnect(ssid.c_str(), WIFI_HOTSPOT_PASSWORD_DEFAULT);
 
@@ -174,12 +173,11 @@ bool WifiConnector::connect(void) {
     logInfo("WiFi Connected: " + WiFi.SSID() + " IP: " + localIpStr());
 
     if (hasPortalConfig) {
-      String result = String(postToAg.getValue());
+      String result = String(disableCloud.getValue());
-      logInfo("Setting postToAirGradient set from " +
+      logInfo("Setting disableCloudConnection set from " +
-              String(config.isPostDataToAirGradient() ? "True" : "False") +
+              String(config.isCloudConnectionDisabled() ? "True" : "False") + String(" to ") +
-              String(" to ") + String(result != "T" ? "True" : "False") +
+              String(result == "T" ? "True" : "False") + String(" successful"));
-              String(" successful"));
+      config.setDisableCloudConnection(result == "T");
-      config.setPostToAirGradient(result != "T");
     }
     hasPortalConfig = false;
   }