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

Fix issue: LED bar button test pressed but WiFi connection still perform.

Browse Source
This commit is contained in:
Phat Nguyen
2024-05-13 14:43:53 +07:00
parent 3dae4cb06d
commit 5b18a8353d
4 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
examples/OneOpenAir/OneOpenAir.ino
View File

@ -176,28 +176,32 @@ void setup() {
ledBarEnabledUpdate(); ledBarEnabledUpdate();
} }
/** Show message confirm offline mode. */ /** Show message confirm offline mode, should me perform if LED bar button
oledDisplay.setText( * test pressed */
"Press now for", if (ledBarButtonTest == false) {
configuration.isOfflineMode() ? "online mode" : "offline mode", ""); oledDisplay.setText(
uint32_t startTime = millis(); "Press now for",
while (true) { configuration.isOfflineMode() ? "online mode" : "offline mode", "");
if (ag->button.getState() == ag->button.BUTTON_PRESSED) { uint32_t startTime = millis();
configuration.setOfflineMode(!configuration.isOfflineMode()); while (true) {
if (ag->button.getState() == ag->button.BUTTON_PRESSED) {
configuration.setOfflineMode(!configuration.isOfflineMode());
oledDisplay.setText( oledDisplay.setText(
"Offline Mode", "Offline Mode",
configuration.isOfflineMode() ? " = True" : " = False", ""); configuration.isOfflineMode() ? " = True" : " = False", "");
delay(1000); delay(1000);
break; break;
} }
uint32_t periodMs = (uint32_t)(millis() - startTime); uint32_t periodMs = (uint32_t)(millis() - startTime);
if (periodMs >= 3000) { if (periodMs >= 3000) {
break; break;
}
} }
connectToWifi = !configuration.isOfflineMode();
} else {
configuration.setOfflineModeWithoutSave(true);
} }
connectToWifi = !configuration.isOfflineMode();
} else { } else {
connectToWifi = true; connectToWifi = true;
} }
@ -1099,7 +1103,7 @@ static void updatePm(void) {
static void sendDataToServer(void) { static void sendDataToServer(void) {
/** Ignore send data to server if postToAirGradient disabled */ /** Ignore send data to server if postToAirGradient disabled */
if (configuration.isPostDataToAirGradient() == false) { if (configuration.isPostDataToAirGradient() == false || configuration.isOfflineMode()) {
return; return;
} }

3
src/AgApiClient.cpp
View File

@ -34,7 +34,8 @@ void AgApiClient::begin(void) {
*/ */
bool AgApiClient::fetchServerConfiguration(void) { bool AgApiClient::fetchServerConfiguration(void) {
if (config.getConfigurationControl() == if (config.getConfigurationControl() ==
ConfigurationControl::ConfigurationControlLocal) { ConfigurationControl::ConfigurationControlLocal ||
config.isOfflineMode()) {
logWarning("Ignore fetch server configuration"); logWarning("Ignore fetch server configuration");
// Clear server configuration failed flag, cause it's ignore but not // Clear server configuration failed flag, cause it's ignore but not

6
src/AgConfigure.cpp
View File

@ -1193,7 +1193,7 @@ int Configuration::getDisplayBrightness(void) {
bool Configuration::isOfflineMode(void) { bool Configuration::isOfflineMode(void) {
bool offline = jconfig[jprop_offlineMode]; bool offline = jconfig[jprop_offlineMode];
return offline; return (offline || _offlineMode);
} }
void Configuration::setOfflineMode(bool offline) { void Configuration::setOfflineMode(bool offline) {
@ -1202,6 +1202,10 @@ void Configuration::setOfflineMode(bool offline) {
saveConfig(); saveConfig();
} }
void Configuration::setOfflineModeWithoutSave(bool offline) {
_offlineMode = offline;
}
bool Configuration::isDisplayBrightnessChanged(void) { bool Configuration::isDisplayBrightnessChanged(void) {
bool changed = displayBrightnessChanged; bool changed = displayBrightnessChanged;
displayBrightnessChanged = false; displayBrightnessChanged = false;

2
src/AgConfigure.h
View File

@ -17,6 +17,7 @@ private:
bool ledBarBrightnessChanged = false; bool ledBarBrightnessChanged = false;
bool displayBrightnessChanged = false; bool displayBrightnessChanged = false;
String otaNewFirmwareVersion; String otaNewFirmwareVersion;
bool _offlineMode = false;
AirGradient* ag; AirGradient* ag;
@ -80,6 +81,7 @@ public:
String newFirmwareVersion(void); String newFirmwareVersion(void);
bool isOfflineMode(void); bool isOfflineMode(void);
void setOfflineMode(bool offline); void setOfflineMode(bool offline);
void setOfflineModeWithoutSave(bool offline);
}; };
#endif /** _AG_CONFIG_H_ */ #endif /** _AG_CONFIG_H_ */