airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-07-16 18:22:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update status notification in 1 function call

Browse Source
This commit is contained in:
samuelbles07
2024-09-22 13:18:15 +07:00
parent 6e212714fc
commit e10c9ff854
1 changed files with 33 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
examples/OneOpenAir/OneOpenAir.ino
View File

@ -98,9 +98,7 @@ static String fwNewVersion;
static void boardInit(void); static void boardInit(void);
static void failedHandler(String msg); static void failedHandler(String msg);
static void configurationUpdateSchedule(void); static void configurationUpdateSchedule(void);
static void appLedHandler(void); static void updateDisplayAndLedBar(void);
static void appDispHandler(void);
static void oledDisplayLedBarSchedule(void);
static void updateTvoc(void); static void updateTvoc(void);
static void updatePm(void); static void updatePm(void);
static void sendDataToServer(void); static void sendDataToServer(void);
@ -118,7 +116,7 @@ static void otaHandlerCallback(OtaState state, String mesasge);
static void displayExecuteOta(OtaState state, String msg, static void displayExecuteOta(OtaState state, String msg,
int processing); int processing);
AgSchedule dispLedSchedule(DISP_UPDATE_INTERVAL, oledDisplayLedBarSchedule); AgSchedule dispLedSchedule(DISP_UPDATE_INTERVAL, updateDisplayAndLedBar);
AgSchedule configSchedule(SERVER_CONFIG_SYNC_INTERVAL, AgSchedule configSchedule(SERVER_CONFIG_SYNC_INTERVAL,
configurationUpdateSchedule); configurationUpdateSchedule);
AgSchedule agApiPostSchedule(SERVER_SYNC_INTERVAL, sendDataToServer); AgSchedule agApiPostSchedule(SERVER_SYNC_INTERVAL, sendDataToServer);
@ -261,8 +259,8 @@ void setup() {
oledDisplay.setBrightness(configuration.getDisplayBrightness()); oledDisplay.setBrightness(configuration.getDisplayBrightness());
} }
appLedHandler(); // Update display and led bar after finishing setup to show dashboard
appDispHandler(); updateDisplayAndLedBar();
} }
void loop() { void loop() {
@ -449,7 +447,7 @@ static void factoryConfigReset(void) {
/** Show current content cause reset ignore */ /** Show current content cause reset ignore */
factoryBtnPressTime = 0; factoryBtnPressTime = 0;
if (ag->isOne()) { if (ag->isOne()) {
appDispHandler(); updateDisplayAndLedBar();
} }
} }
} }
@ -457,7 +455,7 @@ static void factoryConfigReset(void) {
if (factoryBtnPressTime != 0) { if (factoryBtnPressTime != 0) {
if (ag->isOne()) { if (ag->isOne()) {
/** Restore last display content */ /** Restore last display content */
appDispHandler(); updateDisplayAndLedBar();
} }
} }
factoryBtnPressTime = 0; factoryBtnPressTime = 0;
@ -949,57 +947,41 @@ static void configUpdateHandle() {
stateMachine.executeLedBarTest(); stateMachine.executeLedBarTest();
} }
appDispHandler(); // Update display and led bar notification based on updated configuration
appLedHandler(); updateDisplayAndLedBar();
} }
static void appLedHandler(void) { static void updateDisplayAndLedBar(void) {
if (factoryBtnPressTime != 0) {
// Do not distrub factory reset sequence countdown
return;
}
if (configuration.isOfflineMode()) {
// Ignore network related status when in offline mode
stateMachine.displayHandle(AgStateMachineNormal);
stateMachine.handleLeds(AgStateMachineNormal);
return;
}
AgStateMachineState state = AgStateMachineNormal; AgStateMachineState state = AgStateMachineNormal;
if (configuration.isOfflineMode() == false) { if (wifiConnector.isConnected() == false) {
if (wifiConnector.isConnected() == false) { state = AgStateMachineWiFiLost;
state = AgStateMachineWiFiLost; } else if (apiClient.isFetchConfigureFailed()) {
} else if (apiClient.isFetchConfigureFailed()) { state = AgStateMachineSensorConfigFailed;
state = AgStateMachineSensorConfigFailed; if (apiClient.isNotAvailableOnDashboard()) {
} else if (apiClient.isPostToServerFailed()) { stateMachine.displaySetAddToDashBoard();
state = AgStateMachineServerLost; } else {
stateMachine.displayClearAddToDashBoard();
} }
} else if (apiClient.isPostToServerFailed() && configuration.isPostDataToAirGradient()) {
state = AgStateMachineServerLost;
} }
stateMachine.displayHandle(state);
stateMachine.handleLeds(state); stateMachine.handleLeds(state);
} }
static void appDispHandler(void) {
if (ag->isOne()) {
AgStateMachineState state = AgStateMachineNormal;
/** Only show display status on online mode. */
if (configuration.isOfflineMode() == false) {
if (wifiConnector.isConnected() == false) {
state = AgStateMachineWiFiLost;
} else if (apiClient.isFetchConfigureFailed()) {
state = AgStateMachineSensorConfigFailed;
if (apiClient.isNotAvailableOnDashboard()) {
stateMachine.displaySetAddToDashBoard();
} else {
stateMachine.displayClearAddToDashBoard();
}
} else if (apiClient.isPostToServerFailed()) {
state = AgStateMachineServerLost;
}
}
stateMachine.displayHandle(state);
}
}
static void oledDisplayLedBarSchedule(void) {
if (ag->isOne()) {
if (factoryBtnPressTime == 0) {
appDispHandler();
}
}
appLedHandler();
}
static void updateTvoc(void) { static void updateTvoc(void) {
measurements.TVOC = ag->sgp41.getTvocIndex(); measurements.TVOC = ag->sgp41.getTvocIndex();
measurements.TVOCRaw = ag->sgp41.getTvocRaw(); measurements.TVOCRaw = ag->sgp41.getTvocRaw();
@ -1280,4 +1262,4 @@ static void tempHumUpdate(void) {
measurements.Humidity = utils::getInvalidHumidity(); measurements.Humidity = utils::getInvalidHumidity();
Serial.println("SHT read failed"); Serial.println("SHT read failed");
} }
} }