From 76e40fea8cca10a7fe619930531ea9e4c941aa27 Mon Sep 17 00:00:00 2001 From: Achim Date: Sat, 21 Sep 2024 08:09:58 +0700 Subject: [PATCH 1/2] let hw watchdog run independently of POST success --- examples/BASIC/BASIC.ino | 8 +------- examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino | 8 +------- examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino | 8 +------- examples/OneOpenAir/OneOpenAir.ino | 8 +------- 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/examples/BASIC/BASIC.ino b/examples/BASIC/BASIC.ino index 2a574e0..01c394d 100644 --- a/examples/BASIC/BASIC.ino +++ b/examples/BASIC/BASIC.ino @@ -206,11 +206,7 @@ void loop() { tvocSchedule.run(); } - /** Auto reset watchdog timer if offline mode or postDataToAirGradient */ - if (configuration.isOfflineMode() || - (configuration.isPostDataToAirGradient() == false)) { - watchdogFeedSchedule.run(); - } + watchdogFeedSchedule.run(); /** Check for handle WiFi reconnect */ wifiConnector.handle(); @@ -542,13 +538,11 @@ static void sendDataToServer(void) { String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), &ag, &configuration); if (apiClient.postToServer(syncData)) { - ag.watchdog.reset(); Serial.println(); Serial.println( "Online mode and isPostToAirGradient = true: watchdog reset"); Serial.println(); } - measurements.bootCount++; } diff --git a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino index 743aafc..bdd79c7 100644 --- a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino +++ b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino @@ -204,11 +204,7 @@ void loop() { tvocSchedule.run(); } - /** Auto reset watchdog timer if offline mode or postDataToAirGradient */ - if (configuration.isOfflineMode() || - (configuration.isPostDataToAirGradient() == false)) { - watchdogFeedSchedule.run(); - } + watchdogFeedSchedule.run(); /** Check for handle WiFi reconnect */ wifiConnector.handle(); @@ -594,13 +590,11 @@ static void sendDataToServer(void) { String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), &ag, &configuration); if (apiClient.postToServer(syncData)) { - ag.watchdog.reset(); Serial.println(); Serial.println( "Online mode and isPostToAirGradient = true: watchdog reset"); Serial.println(); } - measurements.bootCount++; } diff --git a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino index 5394f82..dca098c 100644 --- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino +++ b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino @@ -231,11 +231,7 @@ void loop() { tvocSchedule.run(); } - /** Auto reset watchdog timer if offline mode or postDataToAirGradient */ - if (configuration.isOfflineMode() || - (configuration.isPostDataToAirGradient() == false)) { - watchdogFeedSchedule.run(); - } + watchdogFeedSchedule.run(); /** Check for handle WiFi reconnect */ wifiConnector.handle(); @@ -635,13 +631,11 @@ static void sendDataToServer(void) { String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), &ag, &configuration); if (apiClient.postToServer(syncData)) { - ag.watchdog.reset(); Serial.println(); Serial.println( "Online mode and isPostToAirGradient = true: watchdog reset"); Serial.println(); } - measurements.bootCount++; } diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino index b5c9518..5495308 100644 --- a/examples/OneOpenAir/OneOpenAir.ino +++ b/examples/OneOpenAir/OneOpenAir.ino @@ -298,11 +298,7 @@ void loop() { } } - /** Auto reset watchdog timer if offline mode or postDataToAirGradient */ - if (configuration.isOfflineMode() || - (configuration.isPostDataToAirGradient() == false)) { - watchdogFeedSchedule.run(); - } + watchdogFeedSchedule.run(); /** Check for handle WiFi reconnect */ wifiConnector.handle(); @@ -1240,13 +1236,11 @@ static void sendDataToServer(void) { String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), ag, &configuration); if (apiClient.postToServer(syncData)) { - ag->watchdog.reset(); Serial.println(); Serial.println( "Online mode and isPostToAirGradient = true: watchdog reset"); Serial.println(); } - measurements.bootCount++; } From 3890919f5419b0d8dbbec809081254c67f19d1a5 Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Sat, 21 Sep 2024 08:46:05 +0700 Subject: [PATCH 2/2] Update log message --- examples/BASIC/BASIC.ino | 4 +--- examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino | 4 +--- examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino | 4 +--- examples/OneOpenAir/OneOpenAir.ino | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/examples/BASIC/BASIC.ino b/examples/BASIC/BASIC.ino index 01c394d..9b29fd0 100644 --- a/examples/BASIC/BASIC.ino +++ b/examples/BASIC/BASIC.ino @@ -271,9 +271,7 @@ static void initMqtt(void) { static void wdgFeedUpdate(void) { ag.watchdog.reset(); - Serial.println(); - Serial.println("Offline mode or isPostToAirGradient = false: watchdog reset"); - Serial.println(); + Serial.println("External watchdog feed!"); } static bool sgp41Init(void) { diff --git a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino index bdd79c7..c31f830 100644 --- a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino +++ b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino @@ -328,9 +328,7 @@ static void factoryConfigReset(void) { static void wdgFeedUpdate(void) { ag.watchdog.reset(); - Serial.println(); - Serial.println("Offline mode or isPostToAirGradient = false: watchdog reset"); - Serial.println(); + Serial.println("External watchdog feed!"); } static bool sgp41Init(void) { diff --git a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino index dca098c..71b0a66 100644 --- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino +++ b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino @@ -351,9 +351,7 @@ static void factoryConfigReset(void) { static void wdgFeedUpdate(void) { ag.watchdog.reset(); - Serial.println(); - Serial.println("Offline mode or isPostToAirGradient = false: watchdog reset"); - Serial.println(); + Serial.println("External watchdog feed!"); } static bool sgp41Init(void) { diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino index 5495308..1b9e8a5 100644 --- a/examples/OneOpenAir/OneOpenAir.ino +++ b/examples/OneOpenAir/OneOpenAir.ino @@ -455,9 +455,7 @@ static void factoryConfigReset(void) { static void wdgFeedUpdate(void) { ag->watchdog.reset(); - Serial.println(); - Serial.println("Offline mode or isPostToAirGradient = false: watchdog reset"); - Serial.println(); + Serial.println("External watchdog feed!"); } static void ledBarEnabledUpdate(void) {