Update diy samples

That accomodate ApiClient changes
Fix apiClient begin on OneOpenAir

examples/BASIC/BASIC.ino

@@ -149,7 +149,10 @@ void setup() {
         initMqtt();
         sendDataToAg();
 
-        apiClient.fetchServerConfiguration();
+        if (configuration.getConfigurationControl() !=
+            ConfigurationControl::ConfigurationControlLocal) {
+          apiClient.fetchServerConfiguration();
+        }
         configSchedule.update();
         if (apiClient.isFetchConfigureFailed()) {
           if (apiClient.isNotAvailableOnDashboard()) {
@@ -415,6 +418,14 @@ static void failedHandler(String msg) {
 }
 
 static void configurationUpdateSchedule(void) {
+  if (configuration.isOfflineMode() ||
+      configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
+    Serial.println("Ignore fetch server configuration. Either mode is offline "
+                   "or configurationControl set to local");
+    apiClient.resetFetchConfigureState();
+    return;
+  }
+
   if (apiClient.fetchServerConfiguration()) {
     configUpdateHandle();
   }
@@ -521,17 +532,21 @@ static void sendDataToServer(void) {
   int bootCount = measurements.bootCount() + 1;
   measurements.setBootCount(bootCount);
 
-  /** Ignore send data to server if postToAirGradient disabled */
+  if (configuration.isOfflineMode() || !configuration.isPostDataToAirGradient()) {
-  if (configuration.isPostDataToAirGradient() == false ||
+    Serial.println("Ignore send data to server. Either mode is offline "
-      configuration.isOfflineMode()) {
+                   "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();
   }
 }

examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino

@@ -149,7 +149,10 @@ void setup() {
         initMqtt();
         sendDataToAg();
 
-        apiClient.fetchServerConfiguration();
+        if (configuration.getConfigurationControl() !=
+            ConfigurationControl::ConfigurationControlLocal) {
+          apiClient.fetchServerConfiguration();
+        }
         configSchedule.update();
         if (apiClient.isFetchConfigureFailed()) {
           if (apiClient.isNotAvailableOnDashboard()) {
@@ -467,6 +470,14 @@ static void failedHandler(String msg) {
 }
 
 static void configurationUpdateSchedule(void) {
+  if (configuration.isOfflineMode() ||
+      configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
+    Serial.println("Ignore fetch server configuration. Either mode is offline "
+                   "or configurationControl set to local");
+    apiClient.resetFetchConfigureState();
+    return;
+  }
+
   if (apiClient.fetchServerConfiguration()) {
     configUpdateHandle();
   }
@@ -573,17 +584,21 @@ static void sendDataToServer(void) {
   int bootCount = measurements.bootCount() + 1;
   measurements.setBootCount(bootCount);
 
-  /** Ignore send data to server if postToAirGradient disabled */
+  if (configuration.isOfflineMode() || !configuration.isPostDataToAirGradient()) {
-  if (configuration.isPostDataToAirGradient() == false ||
+    Serial.println("Ignore send data to server. Either mode is offline "
-      configuration.isOfflineMode()) {
+                   "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();
   }
 }

examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino

@@ -176,7 +176,10 @@ void setup() {
         initMqtt();
         sendDataToAg();
 
-        apiClient.fetchServerConfiguration();
+        if (configuration.getConfigurationControl() !=
+            ConfigurationControl::ConfigurationControlLocal) {
+          apiClient.fetchServerConfiguration();
+        }
         configSchedule.update();
         if (apiClient.isFetchConfigureFailed()) {
           if (apiClient.isNotAvailableOnDashboard()) {
@@ -507,6 +510,14 @@ static void failedHandler(String msg) {
 }
 
 static void configurationUpdateSchedule(void) {
+  if (configuration.isOfflineMode() ||
+      configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
+    Serial.println("Ignore fetch server configuration. Either mode is offline "
+                   "or configurationControl set to local");
+    apiClient.resetFetchConfigureState();
+    return;
+  }
+
   if (apiClient.fetchServerConfiguration()) {
     configUpdateHandle();
   }
@@ -614,17 +625,21 @@ static void sendDataToServer(void) {
   int bootCount = measurements.bootCount() + 1;
   measurements.setBootCount(bootCount);
 
-  /** Ignore send data to server if postToAirGradient disabled */
+  if (configuration.isOfflineMode() || !configuration.isPostDataToAirGradient()) {
-  if (configuration.isPostDataToAirGradient() == false ||
+    Serial.println("Ignore send data to server. Either mode is offline "
-      configuration.isOfflineMode()) {
+                   "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();
   }
 }

examples/OneOpenAir/OneOpenAir.ino

@@ -861,7 +861,7 @@ void initiateNetwork() {
   // Initiate local network configuration
   mdnsInit();
   localServer.begin();
-  // Apply mqtt connection
+  // Apply mqtt connection if configured
   initMqtt();
 
   // Ignore the rest if cloud connection to AirGradient is disabled
@@ -869,7 +869,10 @@ void initiateNetwork() {
     return;
   }
 
-  // Send ping to aigradient server
+  // Initialize api client
+  apiClient.begin();
+
+  // Send ping to airgradient server
   sendDataToAg();
 
 // OTA check