From 2be91b3968866dea56742044c4e72c193b399985 Mon Sep 17 00:00:00 2001 From: samuelbles07 Date: Thu, 21 Nov 2024 02:30:03 +0700 Subject: [PATCH] Boot count using setter and getter --- examples/BASIC/BASIC.ino | 5 +++-- examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino | 5 +++-- examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino | 5 +++-- examples/OneOpenAir/OneOpenAir.ino | 5 +++-- src/AgValue.cpp | 10 +++++++--- src/AgValue.h | 5 +++-- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/examples/BASIC/BASIC.ino b/examples/BASIC/BASIC.ino index 78da232..97105fb 100644 --- a/examples/BASIC/BASIC.ino +++ b/examples/BASIC/BASIC.ino @@ -331,7 +331,7 @@ static void sendDataToAg() { stateMachine.displayHandle(AgStateMachineWiFiOkServerConnecting); delay(1500); - if (apiClient.sendPing(wifiConnector.RSSI(), measurements.bootCount)) { + if (apiClient.sendPing(wifiConnector.RSSI(), measurements.bootCount())) { stateMachine.displayHandle(AgStateMachineWiFiOkServerConnected); } else { stateMachine.displayHandle(AgStateMachineWiFiOkServerConnectFailed); @@ -518,7 +518,8 @@ static void updatePm(void) { static void sendDataToServer(void) { /** Increment bootcount when send measurements data is scheduled */ - measurements.bootCount++; + int bootCount = measurements.bootCount() + 1; + measurements.setBootCount(bootCount); /** Ignore send data to server if postToAirGradient disabled */ if (configuration.isPostDataToAirGradient() == false || diff --git a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino index 04430e3..bd19b86 100644 --- a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino +++ b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino @@ -388,7 +388,7 @@ static void sendDataToAg() { stateMachine.displayHandle(AgStateMachineWiFiOkServerConnecting); delay(1500); - if (apiClient.sendPing(wifiConnector.RSSI(), measurements.bootCount)) { + if (apiClient.sendPing(wifiConnector.RSSI(), measurements.bootCount())) { stateMachine.displayHandle(AgStateMachineWiFiOkServerConnected); } else { stateMachine.displayHandle(AgStateMachineWiFiOkServerConnectFailed); @@ -570,7 +570,8 @@ static void updatePm(void) { static void sendDataToServer(void) { /** Increment bootcount when send measurements data is scheduled */ - measurements.bootCount++; + int bootCount = measurements.bootCount() + 1; + measurements.setBootCount(bootCount); /** Ignore send data to server if postToAirGradient disabled */ if (configuration.isPostDataToAirGradient() == false || diff --git a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino index 8bfb466..f29c2cf 100644 --- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino +++ b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino @@ -411,7 +411,7 @@ static void sendDataToAg() { stateMachine.displayHandle(AgStateMachineWiFiOkServerConnecting); delay(1500); - if (apiClient.sendPing(wifiConnector.RSSI(), measurements.bootCount)) { + if (apiClient.sendPing(wifiConnector.RSSI(), measurements.bootCount())) { stateMachine.displayHandle(AgStateMachineWiFiOkServerConnected); } else { stateMachine.displayHandle(AgStateMachineWiFiOkServerConnectFailed); @@ -611,7 +611,8 @@ static void updatePm(void) { static void sendDataToServer(void) { /** Increment bootcount when send measurements data is scheduled */ - measurements.bootCount++; + int bootCount = measurements.bootCount() + 1; + measurements.setBootCount(bootCount); /** Ignore send data to server if postToAirGradient disabled */ if (configuration.isPostDataToAirGradient() == false || diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino index fce0feb..448284d 100644 --- a/examples/OneOpenAir/OneOpenAir.ino +++ b/examples/OneOpenAir/OneOpenAir.ino @@ -634,7 +634,7 @@ static void sendDataToAg() { "task_led", 2048, NULL, 5, NULL); delay(1500); - if (apiClient.sendPing(wifiConnector.RSSI(), measurements.bootCount)) { + if (apiClient.sendPing(wifiConnector.RSSI(), measurements.bootCount())) { if (ag->isOne()) { stateMachine.displayHandle(AgStateMachineWiFiOkServerConnected); } @@ -1135,7 +1135,8 @@ static void updatePm(void) { static void sendDataToServer(void) { /** Increment bootcount when send measurements data is scheduled */ - measurements.bootCount++; + int bootCount = measurements.bootCount() + 1; + measurements.setBootCount(bootCount); /** Ignore send data to server if postToAirGradient disabled */ if (configuration.isPostDataToAirGradient() == false || configuration.isOfflineMode()) { diff --git a/src/AgValue.cpp b/src/AgValue.cpp index 0df5db8..769fddd 100644 --- a/src/AgValue.cpp +++ b/src/AgValue.cpp @@ -601,8 +601,8 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } - root["boot"] = bootCount; - root["bootCount"] = bootCount; + root["boot"] = _bootCount; + root["bootCount"] = _bootCount; root["wifi"] = rssi; if (localServer) { @@ -1065,4 +1065,8 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem return pms; } -void Measurements::setDebug(bool debug) { _debug = debug; } \ No newline at end of file +void Measurements::setDebug(bool debug) { _debug = debug; } + +int Measurements::bootCount() { return _bootCount; } + +void Measurements::setBootCount(int bootCount) { _bootCount = bootCount; } \ No newline at end of file diff --git a/src/AgValue.h b/src/AgValue.h index f6ae46d..3546115 100644 --- a/src/AgValue.h +++ b/src/AgValue.h @@ -147,8 +147,8 @@ public: */ void setDebug(bool debug); - // TODO: update this to use setter - int bootCount; + int bootCount(); + void setBootCount(int bootCount); private: // Some declared as an array (channel), because FW_MODE_O_1PPx has two PMS5003T @@ -171,6 +171,7 @@ private: IntegerValue _pm_25_pc[2]; // particle count 2.5 IntegerValue _pm_5_pc[2]; // particle count 5.0 IntegerValue _pm_10_pc[2]; // particle count 10 + int _bootCount; bool _debug = false;