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

change locallyControlled to configurationControl and update relate logic

Browse Source
This commit is contained in:
Phat Nguyen
2024-04-01 09:15:10 +07:00
parent 260e904326
commit 3788aa2746
4 changed files with 68 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
examples/OneOpenAir/LocalConfig.cpp
View File

@ -1,6 +1,9 @@
#include "LocalConfig.h"
#include "EEPROM.h"
const char *CONFIGURATION_CONTROL_NAME[] = {
[Local] = "local", [Cloud] = "cloud", [Both] = "both"};
void LocalConfig::printLog(String log) {
debugLog.printf("[LocalConfig] %s\r\n", log.c_str());
}
@ -54,10 +57,10 @@ void LocalConfig::defaultConfig(void) {
// Default MQTT broker is null.
memset(config.mqttBroker, 0, sizeof(config.mqttBroker));
config.configurationControl = ConfigurationControl::Both;
config.inUSAQI = false; // pmStandard = ugm3
config.inF = false;
config.postDataToAirGradient = true;
config.locallyControlled = true;
config.displayMode = true;
config.useRGBLedBar = UseLedBar::UseLedBarCO2;
config.abcDays = 7;
@ -102,6 +105,37 @@ bool LocalConfig::parse(String data, bool isLocal) {
/** Is configuration changed */
bool changed = false;
/** Get ConfigurationControl */
if (JSON.typeof_(root["configurationControl"]) == "string") {
String configurationControl = root["configurationControl"];
if (configurationControl ==
String(CONFIGURATION_CONTROL_NAME[ConfigurationControl::Local])) {
config.configurationControl = (uint8_t)ConfigurationControl::Local;
changed = true;
} else if (configurationControl ==
String(
CONFIGURATION_CONTROL_NAME[ConfigurationControl::Cloud])) {
config.configurationControl = (uint8_t)ConfigurationControl::Cloud;
changed = true;
} else if (configurationControl ==
String(CONFIGURATION_CONTROL_NAME[ConfigurationControl::Both])) {
config.configurationControl = (uint8_t)ConfigurationControl::Both;
changed = true;
} else {
printLog("'configurationControl' value '" + configurationControl +
"' invalid");
return false;
}
} else {
return false;
}
if ((config.configurationControl == (byte)ConfigurationControl::Cloud)) {
printLog("Ignore, cause ConfigurationControl is " +
String(CONFIGURATION_CONTROL_NAME[config.configurationControl]));
return false;
}
if (JSON.typeof_(root["country"]) == "string") {
String country = root["country"];
if (country.length() == 2) {
@ -267,18 +301,6 @@ bool LocalConfig::parse(String data, bool isLocal) {
}
}
/** This field only allow on local configure */
if (isLocal) {
if (JSON.typeof_(root["locallyControlled"]) == "boolean") {
bool locallyControlled = root["locallyControlled"];
if (locallyControlled != config.locallyControlled) {
changed = true;
config.locallyControlled = locallyControlled;
printLog("set locallyControlled: " + String(locallyControlled));
}
}
}
/** Parse data only got from AirGradient server */
if (isLocal == false) {
if (JSON.typeof_(root["model"]) == "string") {
@ -339,8 +361,9 @@ String LocalConfig::toString(void) {
/** "temperatureUnit" */
root["temperatureUnit"] = String(config.temperatureUnit);
/** "locallyControlled" */
root["locallyControlled"] = config.locallyControlled;
/** configurationControl */
root["configurationControl"] =
String(CONFIGURATION_CONTROL_NAME[config.configurationControl]);
/** "postDataToAirGradient" */
root["postDataToAirGradient"] = config.postDataToAirGradient;
@ -374,11 +397,14 @@ bool LocalConfig::isPostDataToAirGradient(void) {
return config.postDataToAirGradient;
}
bool LocalConfig::isLocallyControlled(void) { return config.locallyControlled; }
ConfigurationControl LocalConfig::getConfigurationControl(void) {
return (ConfigurationControl)config.configurationControl;
}
/**
* @brief CO2 manual calib request, the request flag will clear after get. Must call this after parse success
*
* @brief CO2 manual calib request, the request flag will clear after get. Must
* call this after parse success
*
* @return true Requested
* @return false Not requested
*/
@ -389,8 +415,9 @@ bool LocalConfig::isCo2CalibrationRequested(void) {
}
/**
* @brief LED bar test request, the request flag will clear after get. Must call this function after parse success
*
* @brief LED bar test request, the request flag will clear after get. Must call
* this function after parse success
*
* @return true Requested
* @return false Not requested
*/
@ -411,7 +438,7 @@ void LocalConfig::reset(void) {
/**
* @brief Get model name, it's usage for offline mode
*
* @return String
*
* @return String
*/
String LocalConfig::getModel(void) { return String(config.model); }