andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Web selectbox for enum commands (like bool)

Browse Source
This commit is contained in:
MichaelDvP
2021-07-11 15:02:24 +02:00
parent 82978a25c5
commit 358d6010b0
11 changed files with 107 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/emsdevice.cpp
View File

@@ -40,7 +40,8 @@ static const __FlashStringHelper * DeviceValueUOM_s[] __attribute__((__aligned__
F_(seconds),
F_(dbm),
F_(num),
F_(bool)
F_(bool),
F_(blank)
};
@@ -580,6 +581,12 @@ void EMSdevice::generate_values_json_web(JsonObject & json) {
}
}
// handle commands without value
else if(dv.type == DeviceValueType::CMD) {
obj = data.createNestedObject();
obj["v"] = "";
}
else {
// handle Integers and Floats
// If a divider is specified, do the division to 2 decimals places and send back as double/float
@@ -634,6 +641,16 @@ void EMSdevice::generate_values_json_web(JsonObject & json) {
} else {
obj["c"] = "";
}
// add enum and text option settings
if ((dv.uom == DeviceValueUOM::LIST) && dv.has_cmd) {
JsonArray l = obj.createNestedArray("l");
for (uint8_t i = 0; i < dv.options_size; i++) {
if (!uuid::read_flash_string(dv.options[i]).empty()) {
l.add(uuid::read_flash_string(dv.options[i]));
}
}
}
}
}
}