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

tidy up generate_values_json_web

Browse Source
This commit is contained in:
proddy
2021-11-15 15:23:01 +01:00
parent cb2c898b7e
commit 22c9e3ee1f
2 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/emsdevice.cpp
View File

@@ -612,44 +612,43 @@ const std::string EMSdevice::get_value_uom(const char * key) {
} }
// prepare array of device values used for the WebUI // prepare array of device values used for the WebUI
// this is loosely based of the function generate_values_json used for the MQTT and Console
// except additional data is stored in the JSON document needed for the Web UI like the UOM and command
// v = value, u=uom, n=name, c=cmd // v = value, u=uom, n=name, c=cmd
void EMSdevice::generate_values_json_web(JsonObject & output) { void EMSdevice::generate_values_json_web(JsonObject & output) {
output["name"] = to_string_short(); output["name"] = to_string_short();
JsonArray data = output.createNestedArray("data"); JsonArray data = output.createNestedArray("data");
for (const auto & dv : devicevalues_) { for (const auto & dv : devicevalues_) {
// check conditions:
// 1. full_name cannot be empty
// 2. it can't be a command (like publish)
// 3. it must have a valid value
// ignore if full_name empty and also commands // ignore if full_name empty and also commands
if (dv.has_state(DeviceValueState::DV_VISIBLE) && dv.type != DeviceValueType::CMD) { if (dv.has_state(DeviceValueState::DV_VISIBLE) && (dv.type != DeviceValueType::CMD) && check_dv_hasvalue(dv)) {
JsonObject obj; // create the object, if needed JsonObject obj; // create the object, if needed
// handle Booleans (true, false) // handle Booleans (true, false)
if ((dv.type == DeviceValueType::BOOL) && Helpers::hasValue(*(uint8_t *)(dv.value_p), EMS_VALUE_BOOL)) { if (dv.type == DeviceValueType::BOOL) {
obj = data.createNestedObject(); obj = data.createNestedObject();
obj["v"] = *(bool *)(dv.value_p) ? "on" : "off"; obj["v"] = *(bool *)(dv.value_p) ? "on" : "off";
} }
// handle TEXT strings // handle TEXT strings
else if ((dv.type == DeviceValueType::STRING) && (Helpers::hasValue((char *)(dv.value_p)))) { else if (dv.type == DeviceValueType::STRING) {
obj = data.createNestedObject(); obj = data.createNestedObject();
obj["v"] = (char *)(dv.value_p); obj["v"] = (char *)(dv.value_p);
} }
// handle ENUMs // handle ENUMs
else if ((dv.type == DeviceValueType::ENUM) && Helpers::hasValue(*(uint8_t *)(dv.value_p))) { else if ((dv.type == DeviceValueType::ENUM) && (*(uint8_t *)(dv.value_p) < dv.options_size)) {
if (*(uint8_t *)(dv.value_p) < dv.options_size) { obj = data.createNestedObject();
obj = data.createNestedObject(); obj["v"] = dv.options[*(uint8_t *)(dv.value_p)];
obj["v"] = dv.options[*(uint8_t *)(dv.value_p)];
}
} }
// // handle commands without value // handle Integers and Floats
// else if (dv.type == DeviceValueType::CMD) {
// obj = data.createNestedObject();
// obj["v"] = "";
// }
else { else {
// handle Integers and Floats
// If a divider is specified, do the division to 2 decimals places and send back as double/float // If a divider is specified, do the division to 2 decimals places and send back as double/float
// otherwise force as an integer whole // otherwise force as an integer whole
// the nested if's is necessary due to the way the ArduinoJson templates are pre-processed by the compiler // the nested if's is necessary due to the way the ArduinoJson templates are pre-processed by the compiler
@@ -664,22 +663,22 @@ void EMSdevice::generate_values_json_web(JsonObject & output) {
} }
} }
if ((dv.type == DeviceValueType::INT) && Helpers::hasValue(*(int8_t *)(dv.value_p))) { if (dv.type == DeviceValueType::INT) {
obj = data.createNestedObject(); obj = data.createNestedObject();
obj["v"] = (divider) ? Helpers::round2(*(int8_t *)(dv.value_p), divider) : *(int8_t *)(dv.value_p) * factor; obj["v"] = (divider) ? Helpers::round2(*(int8_t *)(dv.value_p), divider) : *(int8_t *)(dv.value_p) * factor;
} else if ((dv.type == DeviceValueType::UINT) && Helpers::hasValue(*(uint8_t *)(dv.value_p))) { } else if (dv.type == DeviceValueType::UINT) {
obj = data.createNestedObject(); obj = data.createNestedObject();
obj["v"] = (divider) ? Helpers::round2(*(uint8_t *)(dv.value_p), divider) : *(uint8_t *)(dv.value_p) * factor; obj["v"] = (divider) ? Helpers::round2(*(uint8_t *)(dv.value_p), divider) : *(uint8_t *)(dv.value_p) * factor;
} else if ((dv.type == DeviceValueType::SHORT) && Helpers::hasValue(*(int16_t *)(dv.value_p))) { } else if (dv.type == DeviceValueType::SHORT) {
obj = data.createNestedObject(); obj = data.createNestedObject();
obj["v"] = (divider) ? Helpers::round2(*(int16_t *)(dv.value_p), divider) : *(int16_t *)(dv.value_p) * factor; obj["v"] = (divider) ? Helpers::round2(*(int16_t *)(dv.value_p), divider) : *(int16_t *)(dv.value_p) * factor;
} else if ((dv.type == DeviceValueType::USHORT) && Helpers::hasValue(*(uint16_t *)(dv.value_p))) { } else if (dv.type == DeviceValueType::USHORT) {
obj = data.createNestedObject(); obj = data.createNestedObject();
obj["v"] = (divider) ? Helpers::round2(*(uint16_t *)(dv.value_p), divider) : *(uint16_t *)(dv.value_p) * factor; obj["v"] = (divider) ? Helpers::round2(*(uint16_t *)(dv.value_p), divider) : *(uint16_t *)(dv.value_p) * factor;
} else if ((dv.type == DeviceValueType::ULONG) && Helpers::hasValue(*(uint32_t *)(dv.value_p))) { } else if (dv.type == DeviceValueType::ULONG) {
obj = data.createNestedObject(); obj = data.createNestedObject();
obj["v"] = divider ? Helpers::round2(*(uint32_t *)(dv.value_p), divider) : *(uint32_t *)(dv.value_p) * factor; obj["v"] = divider ? Helpers::round2(*(uint32_t *)(dv.value_p), divider) : *(uint32_t *)(dv.value_p) * factor;
} else if ((dv.type == DeviceValueType::TIME) && Helpers::hasValue(*(uint32_t *)(dv.value_p))) { } else if (dv.type == DeviceValueType::TIME) {
uint32_t time_value = *(uint32_t *)(dv.value_p); uint32_t time_value = *(uint32_t *)(dv.value_p);
obj = data.createNestedObject(); obj = data.createNestedObject();
obj["v"] = (divider > 0) ? time_value / divider : time_value * factor; // sometimes we need to divide by 60 obj["v"] = (divider > 0) ? time_value / divider : time_value * factor; // sometimes we need to divide by 60
@@ -688,8 +687,7 @@ void EMSdevice::generate_values_json_web(JsonObject & output) {
// check if we've added a data element then add the remaining elements // check if we've added a data element then add the remaining elements
if (obj.containsKey("v")) { if (obj.containsKey("v")) {
// add the unit of measure (uom) obj["u"] = dv.uom; // add the unit of measure (uom)
obj["u"] = dv.uom;
// add name, prefixing the tag if it exists // add name, prefixing the tag if it exists
if ((dv.tag == DeviceValueTAG::TAG_NONE) || tag_to_string(dv.tag).empty()) { if ((dv.tag == DeviceValueTAG::TAG_NONE) || tag_to_string(dv.tag).empty()) {
@@ -728,7 +726,7 @@ void EMSdevice::generate_values_json_web(JsonObject & output) {
} }
#if defined(EMSESP_DEBUG) #if defined(EMSESP_DEBUG)
// serializeJson(data, Serial); // debug only // serializeJson(data, Serial); // debug only
#endif #endif
} }
@@ -941,7 +939,16 @@ bool EMSdevice::generate_values_json(JsonObject & output, const uint8_t tag_filt
// 1. it must have a valid value // 1. it must have a valid value
// 2. it must be visible, unless our output destination is MQTT // 2. it must be visible, unless our output destination is MQTT
// 3. it must match the given tag filter or have an empty tag // 3. it must match the given tag filter or have an empty tag
bool conditions = ((tag_filter == DeviceValueTAG::TAG_NONE) || (tag_filter == dv.tag)) && check_dv_hasvalue(dv);
// check if it exists. We set the value activated once here
bool has_value = check_dv_hasvalue(dv);
if (has_value) {
dv.add_state(DeviceValueState::DV_ACTIVE);
} else {
dv.remove_state(DeviceValueState::DV_ACTIVE);
}
bool conditions = ((tag_filter == DeviceValueTAG::TAG_NONE) || (tag_filter == dv.tag)) && has_value;
if (output_target != OUTPUT_TARGET::MQTT) { if (output_target != OUTPUT_TARGET::MQTT) {
conditions &= conditions &=
dv.has_state(DeviceValueState::DV_VISIBLE); // value must be visible if outputting to API (web or console). This is for ID, hamode, hatemp etc dv.has_state(DeviceValueState::DV_VISIBLE); // value must be visible if outputting to API (web or console). This is for ID, hamode, hatemp etc
@@ -1192,7 +1199,7 @@ void EMSdevice::read_command(const uint16_t type_id, const uint8_t offset, const
// checks whether the device value has an actual value // checks whether the device value has an actual value
// returns true if its valid // returns true if its valid
// state is stored in the dv object // state is stored in the dv object
bool EMSdevice::check_dv_hasvalue(DeviceValue & dv) { bool EMSdevice::check_dv_hasvalue(const DeviceValue & dv) {
bool has_value = false; bool has_value = false;
switch (dv.type) { switch (dv.type) {
case DeviceValueType::BOOL: case DeviceValueType::BOOL:
@@ -1233,14 +1240,7 @@ bool EMSdevice::check_dv_hasvalue(DeviceValue & dv) {
} }
#endif #endif
// set the value state to active return has_value;
if (has_value) {
dv.add_state(DeviceValueState::DV_ACTIVE);
return true;
}
dv.remove_state(DeviceValueState::DV_ACTIVE);
return false;
} }
} // namespace emsesp } // namespace emsesp

2
src/emsdevice.h
View File

@@ -485,7 +485,7 @@ class EMSdevice {
const std::string device_entity_ha(DeviceValue const & dv); const std::string device_entity_ha(DeviceValue const & dv);
bool check_dv_hasvalue(DeviceValue & dv); bool check_dv_hasvalue(const DeviceValue & dv);
void init_devicevalues(uint8_t size) { void init_devicevalues(uint8_t size) {
devicevalues_.reserve(size); devicevalues_.reserve(size);