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

Merge commit '5a2c1bd1d0290e5cae0b8dec02eb2a931211d1af' into feature/add-esp8266-examples

Browse Source
This commit is contained in:
Phat Nguyen
2024-06-25 15:19:28 +07:00
parent dbc63194e6 5a2c1bd1d0
commit 863b1f908e
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/AgConfigure.cpp
View File

@ -235,7 +235,10 @@ bool Configuration::parse(String data, bool isLocal) {
bool changed = false; bool changed = false;
/** Get ConfigurationControl */ /** Get ConfigurationControl */
String lasCtrl = jconfig[jprop_configurationControl]; String lastCtrl = jconfig[jprop_configurationControl];
const char *msg = "Monitor set to accept only configuration from the "
"cloud. Use property configurationControl to change.";
if (isLocal) { if (isLocal) {
if (JSON.typeof_(root[jprop_configurationControl]) == "string") { if (JSON.typeof_(root[jprop_configurationControl]) == "string") {
String ctrl = root[jprop_configurationControl]; String ctrl = root[jprop_configurationControl];
@ -248,9 +251,19 @@ bool Configuration::parse(String data, bool isLocal) {
ctrl == ctrl ==
String(CONFIGURATION_CONTROL_NAME String(CONFIGURATION_CONTROL_NAME
[ConfigurationControl::ConfigurationControlCloud])) { [ConfigurationControl::ConfigurationControlCloud])) {
if (ctrl != lasCtrl) { if (ctrl != lastCtrl) {
jconfig[jprop_configurationControl] = ctrl; jconfig[jprop_configurationControl] = ctrl;
changed = true; saveConfig();
configLogInfo(String(jprop_configurationControl), lastCtrl,
jconfig[jprop_configurationControl]);
}
/** Check to return result if configurationControl is 'cloud' */
if (ctrl ==
String(CONFIGURATION_CONTROL_NAME
[ConfigurationControl::ConfigurationControlCloud])) {
failedMessage = String(msg);
return true;
} }
} else { } else {
failedMessage = failedMessage =
@ -267,18 +280,11 @@ bool Configuration::parse(String data, bool isLocal) {
} }
} }
if (changed) { /** Ignore all configuration value if 'configurationControl' is 'cloud' */
changed = false;
saveConfig();
configLogInfo(String(jprop_configurationControl), lasCtrl,
jconfig[jprop_configurationControl]);
}
if (jconfig[jprop_configurationControl] == if (jconfig[jprop_configurationControl] ==
String(CONFIGURATION_CONTROL_NAME String(CONFIGURATION_CONTROL_NAME
[ConfigurationControl::ConfigurationControlCloud])) { [ConfigurationControl::ConfigurationControlCloud])) {
failedMessage = "Monitor set to accept only configuration from the " failedMessage = String(msg);
"cloud. Use property configurationControl to change.";
jsonInvalid(); jsonInvalid();
return false; return false;
} }