From 22dc2136e4b2180dd4f94dcc3b3a73dbb1ff8a6c Mon Sep 17 00:00:00 2001
From: Phat Nguyen <phat.nt@hotmail.com>
Date: Mon, 13 May 2024 11:18:08 +0700
Subject: [PATCH 1/2] Update watchdog reset message

---
 examples/OneOpenAir/OneOpenAir.ino | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino
index a865575..0514c5b 100644
--- a/examples/OneOpenAir/OneOpenAir.ino
+++ b/examples/OneOpenAir/OneOpenAir.ino
@@ -440,7 +440,7 @@ static void factoryConfigReset(void) {
 static void wdgFeedUpdate(void) {
   ag->watchdog.reset();
   Serial.println();
-  Serial.println("External watchdog feed");
+  Serial.println("Offline mode or isPostToAirGradient = false: watchdog reset");
   Serial.println();
 }
 
@@ -584,11 +584,6 @@ static void sendDataToAg() {
   stateMachine.handleLeds(AgStateMachineNormal);
 }
 
-/**
- * @brief Must reset each 5min to avoid ESP32 reset
- */
-static void resetWatchdog() { ag->watchdog.reset(); }
-
 void dispSensorNotFound(String ss) {
   ss = ss + " not found";
   oledDisplay.setText("Sensor init", "Error:", ss.c_str());
@@ -1101,10 +1096,19 @@ static void updatePm(void) {
 }
 
 static void sendDataToServer(void) {
+  /** Ignore send data to server if postToAirGradient disabled */
+  if (configuration.isPostDataToAirGradient() == false) {
+    return;
+  }
+
   String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(),
                                           ag, &configuration);
   if (apiClient.postToServer(syncData)) {
-    resetWatchdog();
+    ag->watchdog.reset();
+    Serial.println();
+    Serial.println(
+        "Online mode and isPostToAirGradient = true: watchdog reset");
+    Serial.println();
   }
 
   measurements.bootCount++;

From a6d8936ea61fd38d5bc5acaa0446284d1e847c90 Mon Sep 17 00:00:00 2001
From: Phat Nguyen <phat.nt@hotmail.com>
Date: Mon, 13 May 2024 11:47:37 +0700
Subject: [PATCH 2/2] Fix factory reset failed, the configuration not set to
 default. #112

---
 examples/OneOpenAir/OneOpenAir.ino | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino
index 0514c5b..f458d6e 100644
--- a/examples/OneOpenAir/OneOpenAir.ino
+++ b/examples/OneOpenAir/OneOpenAir.ino
@@ -402,9 +402,8 @@ static void factoryConfigReset(void) {
               mqttTask = NULL;
             }
 
-            /** Disconnect WIFI */
-            wifiConnector.disconnect();
-            wifiConnector.reset();
+            /** Reset WIFI */
+            WiFi.disconnect(true, true);
 
             /** Reset local config */
             configuration.reset();