mirror of
https://github.com/airgradienthq/arduino.git
synced 2025-07-15 08:56:34 +02:00
fix: OpenAir send incorrect model(firmware mode)
This commit is contained in:
@ -39,7 +39,11 @@ String LocalServer::getHostname(void) {
|
|||||||
void LocalServer::_handle(void) { server.handleClient(); }
|
void LocalServer::_handle(void) { server.handleClient(); }
|
||||||
|
|
||||||
void LocalServer::_GET_config(void) {
|
void LocalServer::_GET_config(void) {
|
||||||
|
if(ag->isOne()) {
|
||||||
server.send(200, "application/json", config.toString());
|
server.send(200, "application/json", config.toString());
|
||||||
|
} else {
|
||||||
|
server.send(200, "application/json", config.toString(fwMode));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void LocalServer::_PUT_config(void) {
|
void LocalServer::_PUT_config(void) {
|
||||||
|
@ -672,6 +672,20 @@ bool Configuration::parse(String data, bool isLocal) {
|
|||||||
*/
|
*/
|
||||||
String Configuration::toString(void) { return JSON.stringify(jconfig); }
|
String Configuration::toString(void) { return JSON.stringify(jconfig); }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Get current configuration value as JSON string
|
||||||
|
*
|
||||||
|
* @param fwMode Firmware mode value
|
||||||
|
* @return String
|
||||||
|
*/
|
||||||
|
String Configuration::toString(AgFirmwareMode fwMode) {
|
||||||
|
String model = jconfig[jprop_model];
|
||||||
|
jconfig[jprop_model] = AgFirmwareModeName(fwMode);
|
||||||
|
String value = toString();
|
||||||
|
jconfig[jprop_model] = model;
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Temperature unit (F or C)
|
* @brief Temperature unit (F or C)
|
||||||
*
|
*
|
||||||
|
@ -47,6 +47,7 @@ public:
|
|||||||
bool begin(void);
|
bool begin(void);
|
||||||
bool parse(String data, bool isLocal);
|
bool parse(String data, bool isLocal);
|
||||||
String toString(void);
|
String toString(void);
|
||||||
|
String toString(AgFirmwareMode fwMode);
|
||||||
bool isTemperatureUnitInF(void);
|
bool isTemperatureUnitInF(void);
|
||||||
String getCountry(void);
|
String getCountry(void);
|
||||||
bool isPmStandardInUSAQI(void);
|
bool isPmStandardInUSAQI(void);
|
||||||
|
Reference in New Issue
Block a user