mirror of
https://github.com/airgradienthq/arduino.git
synced 2025-07-27 23:47:16 +02:00
Rename function
from configure to configuration
This commit is contained in:
@ -154,7 +154,7 @@ void setup() {
|
|||||||
apiClient.fetchServerConfiguration();
|
apiClient.fetchServerConfiguration();
|
||||||
}
|
}
|
||||||
configSchedule.update();
|
configSchedule.update();
|
||||||
if (apiClient.isFetchConfigureFailed()) {
|
if (apiClient.isFetchConfigurationFailed()) {
|
||||||
if (apiClient.isNotAvailableOnDashboard()) {
|
if (apiClient.isNotAvailableOnDashboard()) {
|
||||||
stateMachine.displaySetAddToDashBoard();
|
stateMachine.displaySetAddToDashBoard();
|
||||||
stateMachine.displayHandle(
|
stateMachine.displayHandle(
|
||||||
@ -422,7 +422,7 @@ static void configurationUpdateSchedule(void) {
|
|||||||
configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
|
configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
|
||||||
Serial.println("Ignore fetch server configuration. Either mode is offline "
|
Serial.println("Ignore fetch server configuration. Either mode is offline "
|
||||||
"or configurationControl set to local");
|
"or configurationControl set to local");
|
||||||
apiClient.resetFetchConfigureState();
|
apiClient.resetFetchConfigurationStatus();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -483,7 +483,7 @@ static void appDispHandler(void) {
|
|||||||
if (configuration.isOfflineMode() == false) {
|
if (configuration.isOfflineMode() == false) {
|
||||||
if (wifiConnector.isConnected() == false) {
|
if (wifiConnector.isConnected() == false) {
|
||||||
state = AgStateMachineWiFiLost;
|
state = AgStateMachineWiFiLost;
|
||||||
} else if (apiClient.isFetchConfigureFailed()) {
|
} else if (apiClient.isFetchConfigurationFailed()) {
|
||||||
state = AgStateMachineSensorConfigFailed;
|
state = AgStateMachineSensorConfigFailed;
|
||||||
if (apiClient.isNotAvailableOnDashboard()) {
|
if (apiClient.isNotAvailableOnDashboard()) {
|
||||||
stateMachine.displaySetAddToDashBoard();
|
stateMachine.displaySetAddToDashBoard();
|
||||||
|
@ -43,7 +43,7 @@ String OpenMetrics::getPayload(void) {
|
|||||||
"1 if the AirGradient device was able to successfully fetch its "
|
"1 if the AirGradient device was able to successfully fetch its "
|
||||||
"configuration from the server",
|
"configuration from the server",
|
||||||
"gauge");
|
"gauge");
|
||||||
add_metric_point("", apiClient.isFetchConfigureFailed() ? "0" : "1");
|
add_metric_point("", apiClient.isFetchConfigurationFailed() ? "0" : "1");
|
||||||
|
|
||||||
add_metric(
|
add_metric(
|
||||||
"post_ok",
|
"post_ok",
|
||||||
|
@ -154,7 +154,7 @@ void setup() {
|
|||||||
apiClient.fetchServerConfiguration();
|
apiClient.fetchServerConfiguration();
|
||||||
}
|
}
|
||||||
configSchedule.update();
|
configSchedule.update();
|
||||||
if (apiClient.isFetchConfigureFailed()) {
|
if (apiClient.isFetchConfigurationFailed()) {
|
||||||
if (apiClient.isNotAvailableOnDashboard()) {
|
if (apiClient.isNotAvailableOnDashboard()) {
|
||||||
stateMachine.displaySetAddToDashBoard();
|
stateMachine.displaySetAddToDashBoard();
|
||||||
stateMachine.displayHandle(
|
stateMachine.displayHandle(
|
||||||
@ -474,7 +474,7 @@ static void configurationUpdateSchedule(void) {
|
|||||||
configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
|
configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
|
||||||
Serial.println("Ignore fetch server configuration. Either mode is offline "
|
Serial.println("Ignore fetch server configuration. Either mode is offline "
|
||||||
"or configurationControl set to local");
|
"or configurationControl set to local");
|
||||||
apiClient.resetFetchConfigureState();
|
apiClient.resetFetchConfigurationStatus();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -535,7 +535,7 @@ static void appDispHandler(void) {
|
|||||||
if (configuration.isOfflineMode() == false) {
|
if (configuration.isOfflineMode() == false) {
|
||||||
if (wifiConnector.isConnected() == false) {
|
if (wifiConnector.isConnected() == false) {
|
||||||
state = AgStateMachineWiFiLost;
|
state = AgStateMachineWiFiLost;
|
||||||
} else if (apiClient.isFetchConfigureFailed()) {
|
} else if (apiClient.isFetchConfigurationFailed()) {
|
||||||
state = AgStateMachineSensorConfigFailed;
|
state = AgStateMachineSensorConfigFailed;
|
||||||
if (apiClient.isNotAvailableOnDashboard()) {
|
if (apiClient.isNotAvailableOnDashboard()) {
|
||||||
stateMachine.displaySetAddToDashBoard();
|
stateMachine.displaySetAddToDashBoard();
|
||||||
|
@ -43,7 +43,7 @@ String OpenMetrics::getPayload(void) {
|
|||||||
"1 if the AirGradient device was able to successfully fetch its "
|
"1 if the AirGradient device was able to successfully fetch its "
|
||||||
"configuration from the server",
|
"configuration from the server",
|
||||||
"gauge");
|
"gauge");
|
||||||
add_metric_point("", apiClient.isFetchConfigureFailed() ? "0" : "1");
|
add_metric_point("", apiClient.isFetchConfigurationFailed() ? "0" : "1");
|
||||||
|
|
||||||
add_metric(
|
add_metric(
|
||||||
"post_ok",
|
"post_ok",
|
||||||
|
@ -181,7 +181,7 @@ void setup() {
|
|||||||
apiClient.fetchServerConfiguration();
|
apiClient.fetchServerConfiguration();
|
||||||
}
|
}
|
||||||
configSchedule.update();
|
configSchedule.update();
|
||||||
if (apiClient.isFetchConfigureFailed()) {
|
if (apiClient.isFetchConfigurationFailed()) {
|
||||||
if (apiClient.isNotAvailableOnDashboard()) {
|
if (apiClient.isNotAvailableOnDashboard()) {
|
||||||
stateMachine.displaySetAddToDashBoard();
|
stateMachine.displaySetAddToDashBoard();
|
||||||
stateMachine.displayHandle(
|
stateMachine.displayHandle(
|
||||||
@ -514,7 +514,7 @@ static void configurationUpdateSchedule(void) {
|
|||||||
configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
|
configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
|
||||||
Serial.println("Ignore fetch server configuration. Either mode is offline "
|
Serial.println("Ignore fetch server configuration. Either mode is offline "
|
||||||
"or configurationControl set to local");
|
"or configurationControl set to local");
|
||||||
apiClient.resetFetchConfigureState();
|
apiClient.resetFetchConfigurationStatus();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -575,7 +575,7 @@ static void appDispHandler(void) {
|
|||||||
if (configuration.isOfflineMode() == false) {
|
if (configuration.isOfflineMode() == false) {
|
||||||
if (wifiConnector.isConnected() == false) {
|
if (wifiConnector.isConnected() == false) {
|
||||||
state = AgStateMachineWiFiLost;
|
state = AgStateMachineWiFiLost;
|
||||||
} else if (apiClient.isFetchConfigureFailed()) {
|
} else if (apiClient.isFetchConfigurationFailed()) {
|
||||||
state = AgStateMachineSensorConfigFailed;
|
state = AgStateMachineSensorConfigFailed;
|
||||||
if (apiClient.isNotAvailableOnDashboard()) {
|
if (apiClient.isNotAvailableOnDashboard()) {
|
||||||
stateMachine.displaySetAddToDashBoard();
|
stateMachine.displaySetAddToDashBoard();
|
||||||
|
@ -43,7 +43,7 @@ String OpenMetrics::getPayload(void) {
|
|||||||
"1 if the AirGradient device was able to successfully fetch its "
|
"1 if the AirGradient device was able to successfully fetch its "
|
||||||
"configuration from the server",
|
"configuration from the server",
|
||||||
"gauge");
|
"gauge");
|
||||||
add_metric_point("", apiClient.isFetchConfigureFailed() ? "0" : "1");
|
add_metric_point("", apiClient.isFetchConfigurationFailed() ? "0" : "1");
|
||||||
|
|
||||||
add_metric(
|
add_metric(
|
||||||
"post_ok",
|
"post_ok",
|
||||||
|
@ -884,7 +884,7 @@ void initializeNetwork() {
|
|||||||
|
|
||||||
apiClient.fetchServerConfiguration();
|
apiClient.fetchServerConfiguration();
|
||||||
configSchedule.update();
|
configSchedule.update();
|
||||||
if (apiClient.isFetchConfigureFailed()) {
|
if (apiClient.isFetchConfigurationFailed()) {
|
||||||
if (ag->isOne()) {
|
if (ag->isOne()) {
|
||||||
if (apiClient.isNotAvailableOnDashboard()) {
|
if (apiClient.isNotAvailableOnDashboard()) {
|
||||||
stateMachine.displaySetAddToDashBoard();
|
stateMachine.displaySetAddToDashBoard();
|
||||||
@ -905,7 +905,7 @@ static void configurationUpdateSchedule(void) {
|
|||||||
configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
|
configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
|
||||||
Serial.println("Ignore fetch server configuration. Either mode is offline or cloud connection "
|
Serial.println("Ignore fetch server configuration. Either mode is offline or cloud connection "
|
||||||
"disabled or configurationControl set to local");
|
"disabled or configurationControl set to local");
|
||||||
apiClient.resetFetchConfigureState();
|
apiClient.resetFetchConfigurationStatus();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1019,7 +1019,7 @@ static void updateDisplayAndLedBar(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AgStateMachineState state = AgStateMachineNormal;
|
AgStateMachineState state = AgStateMachineNormal;
|
||||||
if (apiClient.isFetchConfigureFailed()) {
|
if (apiClient.isFetchConfigurationFailed()) {
|
||||||
state = AgStateMachineSensorConfigFailed;
|
state = AgStateMachineSensorConfigFailed;
|
||||||
if (apiClient.isNotAvailableOnDashboard()) {
|
if (apiClient.isNotAvailableOnDashboard()) {
|
||||||
stateMachine.displaySetAddToDashBoard();
|
stateMachine.displaySetAddToDashBoard();
|
||||||
|
@ -43,7 +43,7 @@ String OpenMetrics::getPayload(void) {
|
|||||||
"1 if the AirGradient device was able to successfully fetch its "
|
"1 if the AirGradient device was able to successfully fetch its "
|
||||||
"configuration from the server",
|
"configuration from the server",
|
||||||
"gauge");
|
"gauge");
|
||||||
add_metric_point("", apiClient.isFetchConfigureFailed() ? "0" : "1");
|
add_metric_point("", apiClient.isFetchConfigurationFailed() ? "0" : "1");
|
||||||
|
|
||||||
add_metric(
|
add_metric(
|
||||||
"post_ok",
|
"post_ok",
|
||||||
|
@ -153,12 +153,12 @@ bool AgApiClient::postToServer(String data) {
|
|||||||
* @return true Success
|
* @return true Success
|
||||||
* @return false Failure
|
* @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
|
* @brief Get failed status when post data to AirGradient cloud
|
||||||
|
@ -40,8 +40,8 @@ public:
|
|||||||
void begin(void);
|
void begin(void);
|
||||||
bool fetchServerConfiguration(void);
|
bool fetchServerConfiguration(void);
|
||||||
bool postToServer(String data);
|
bool postToServer(String data);
|
||||||
bool isFetchConfigureFailed(void);
|
bool isFetchConfigurationFailed(void);
|
||||||
void resetFetchConfigureState(void);
|
void resetFetchConfigurationStatus(void);
|
||||||
bool isPostToServerFailed(void);
|
bool isPostToServerFailed(void);
|
||||||
bool isNotAvailableOnDashboard(void);
|
bool isNotAvailableOnDashboard(void);
|
||||||
void setAirGradient(AirGradient *ag);
|
void setAirGradient(AirGradient *ag);
|
||||||
|
Reference in New Issue
Block a user