diff --git a/examples/BASIC/BASIC.ino b/examples/BASIC/BASIC.ino index eccbcc5..cf65775 100644 --- a/examples/BASIC/BASIC.ino +++ b/examples/BASIC/BASIC.ino @@ -154,7 +154,7 @@ void setup() { apiClient.fetchServerConfiguration(); } configSchedule.update(); - if (apiClient.isFetchConfigureFailed()) { + if (apiClient.isFetchConfigurationFailed()) { if (apiClient.isNotAvailableOnDashboard()) { stateMachine.displaySetAddToDashBoard(); stateMachine.displayHandle( @@ -422,7 +422,7 @@ static void configurationUpdateSchedule(void) { configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) { Serial.println("Ignore fetch server configuration. Either mode is offline " "or configurationControl set to local"); - apiClient.resetFetchConfigureState(); + apiClient.resetFetchConfigurationStatus(); return; } @@ -483,7 +483,7 @@ static void appDispHandler(void) { if (configuration.isOfflineMode() == false) { if (wifiConnector.isConnected() == false) { state = AgStateMachineWiFiLost; - } else if (apiClient.isFetchConfigureFailed()) { + } else if (apiClient.isFetchConfigurationFailed()) { state = AgStateMachineSensorConfigFailed; if (apiClient.isNotAvailableOnDashboard()) { stateMachine.displaySetAddToDashBoard(); diff --git a/examples/BASIC/OpenMetrics.cpp b/examples/BASIC/OpenMetrics.cpp index c8395c0..9b92fbe 100644 --- a/examples/BASIC/OpenMetrics.cpp +++ b/examples/BASIC/OpenMetrics.cpp @@ -43,7 +43,7 @@ String OpenMetrics::getPayload(void) { "1 if the AirGradient device was able to successfully fetch its " "configuration from the server", "gauge"); - add_metric_point("", apiClient.isFetchConfigureFailed() ? "0" : "1"); + add_metric_point("", apiClient.isFetchConfigurationFailed() ? "0" : "1"); add_metric( "post_ok", diff --git a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino index 509a8c5..171d69d 100644 --- a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino +++ b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino @@ -154,7 +154,7 @@ void setup() { apiClient.fetchServerConfiguration(); } configSchedule.update(); - if (apiClient.isFetchConfigureFailed()) { + if (apiClient.isFetchConfigurationFailed()) { if (apiClient.isNotAvailableOnDashboard()) { stateMachine.displaySetAddToDashBoard(); stateMachine.displayHandle( @@ -474,7 +474,7 @@ static void configurationUpdateSchedule(void) { configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) { Serial.println("Ignore fetch server configuration. Either mode is offline " "or configurationControl set to local"); - apiClient.resetFetchConfigureState(); + apiClient.resetFetchConfigurationStatus(); return; } @@ -535,7 +535,7 @@ static void appDispHandler(void) { if (configuration.isOfflineMode() == false) { if (wifiConnector.isConnected() == false) { state = AgStateMachineWiFiLost; - } else if (apiClient.isFetchConfigureFailed()) { + } else if (apiClient.isFetchConfigurationFailed()) { state = AgStateMachineSensorConfigFailed; if (apiClient.isNotAvailableOnDashboard()) { stateMachine.displaySetAddToDashBoard(); diff --git a/examples/DiyProIndoorV3_3/OpenMetrics.cpp b/examples/DiyProIndoorV3_3/OpenMetrics.cpp index 8ec9d2f..dadb8b1 100644 --- a/examples/DiyProIndoorV3_3/OpenMetrics.cpp +++ b/examples/DiyProIndoorV3_3/OpenMetrics.cpp @@ -43,7 +43,7 @@ String OpenMetrics::getPayload(void) { "1 if the AirGradient device was able to successfully fetch its " "configuration from the server", "gauge"); - add_metric_point("", apiClient.isFetchConfigureFailed() ? "0" : "1"); + add_metric_point("", apiClient.isFetchConfigurationFailed() ? "0" : "1"); add_metric( "post_ok", diff --git a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino index 08f0551..f837481 100644 --- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino +++ b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino @@ -181,7 +181,7 @@ void setup() { apiClient.fetchServerConfiguration(); } configSchedule.update(); - if (apiClient.isFetchConfigureFailed()) { + if (apiClient.isFetchConfigurationFailed()) { if (apiClient.isNotAvailableOnDashboard()) { stateMachine.displaySetAddToDashBoard(); stateMachine.displayHandle( @@ -514,7 +514,7 @@ static void configurationUpdateSchedule(void) { configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) { Serial.println("Ignore fetch server configuration. Either mode is offline " "or configurationControl set to local"); - apiClient.resetFetchConfigureState(); + apiClient.resetFetchConfigurationStatus(); return; } @@ -575,7 +575,7 @@ static void appDispHandler(void) { if (configuration.isOfflineMode() == false) { if (wifiConnector.isConnected() == false) { state = AgStateMachineWiFiLost; - } else if (apiClient.isFetchConfigureFailed()) { + } else if (apiClient.isFetchConfigurationFailed()) { state = AgStateMachineSensorConfigFailed; if (apiClient.isNotAvailableOnDashboard()) { stateMachine.displaySetAddToDashBoard(); diff --git a/examples/DiyProIndoorV4_2/OpenMetrics.cpp b/examples/DiyProIndoorV4_2/OpenMetrics.cpp index c8395c0..9b92fbe 100644 --- a/examples/DiyProIndoorV4_2/OpenMetrics.cpp +++ b/examples/DiyProIndoorV4_2/OpenMetrics.cpp @@ -43,7 +43,7 @@ String OpenMetrics::getPayload(void) { "1 if the AirGradient device was able to successfully fetch its " "configuration from the server", "gauge"); - add_metric_point("", apiClient.isFetchConfigureFailed() ? "0" : "1"); + add_metric_point("", apiClient.isFetchConfigurationFailed() ? "0" : "1"); add_metric( "post_ok", diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino index df247bf..9dff24e 100644 --- a/examples/OneOpenAir/OneOpenAir.ino +++ b/examples/OneOpenAir/OneOpenAir.ino @@ -884,7 +884,7 @@ void initializeNetwork() { apiClient.fetchServerConfiguration(); configSchedule.update(); - if (apiClient.isFetchConfigureFailed()) { + if (apiClient.isFetchConfigurationFailed()) { if (ag->isOne()) { if (apiClient.isNotAvailableOnDashboard()) { stateMachine.displaySetAddToDashBoard(); @@ -905,7 +905,7 @@ static void configurationUpdateSchedule(void) { 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(); + apiClient.resetFetchConfigurationStatus(); return; } @@ -1019,7 +1019,7 @@ static void updateDisplayAndLedBar(void) { } AgStateMachineState state = AgStateMachineNormal; - if (apiClient.isFetchConfigureFailed()) { + if (apiClient.isFetchConfigurationFailed()) { state = AgStateMachineSensorConfigFailed; if (apiClient.isNotAvailableOnDashboard()) { stateMachine.displaySetAddToDashBoard(); diff --git a/examples/OneOpenAir/OpenMetrics.cpp b/examples/OneOpenAir/OpenMetrics.cpp index fa59444..e366ea4 100644 --- a/examples/OneOpenAir/OpenMetrics.cpp +++ b/examples/OneOpenAir/OpenMetrics.cpp @@ -43,7 +43,7 @@ String OpenMetrics::getPayload(void) { "1 if the AirGradient device was able to successfully fetch its " "configuration from the server", "gauge"); - add_metric_point("", apiClient.isFetchConfigureFailed() ? "0" : "1"); + add_metric_point("", apiClient.isFetchConfigurationFailed() ? "0" : "1"); add_metric( "post_ok", diff --git a/src/AgApiClient.cpp b/src/AgApiClient.cpp index 8984d1d..5869566 100644 --- a/src/AgApiClient.cpp +++ b/src/AgApiClient.cpp @@ -153,12 +153,12 @@ bool AgApiClient::postToServer(String data) { * @return true Success * @return false Failure */ -bool AgApiClient::isFetchConfigureFailed(void) { return getConfigFailed; } +bool AgApiClient::isFetchConfigurationFailed(void) { return getConfigFailed; } /** - * @brief Reset getConfigFailed state to false + * @brief Reset status of get configuration from AirGradient cloud */ -void AgApiClient::resetFetchConfigureState(void) { getConfigFailed = false; } +void AgApiClient::resetFetchConfigurationStatus(void) { getConfigFailed = false; } /** * @brief Get failed status when post data to AirGradient cloud diff --git a/src/AgApiClient.h b/src/AgApiClient.h index edb30c5..7ee8734 100644 --- a/src/AgApiClient.h +++ b/src/AgApiClient.h @@ -40,8 +40,8 @@ public: void begin(void); bool fetchServerConfiguration(void); bool postToServer(String data); - bool isFetchConfigureFailed(void); - void resetFetchConfigureState(void); + bool isFetchConfigurationFailed(void); + void resetFetchConfigurationStatus(void); bool isPostToServerFailed(void); bool isNotAvailableOnDashboard(void); void setAirGradient(AirGradient *ag);