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

fix custom entity value info

Browse Source
This commit is contained in:
MichaelDvP
2023-07-13 18:23:04 +02:00
parent d9ad835fbc
commit 18d32de483
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/web/WebEntityService.cpp
View File

@@ -115,7 +115,7 @@ bool WebEntityService::command_setvalue(const char * value, const std::string na
strlcpy(telegram, value, sizeof(telegram)); strlcpy(telegram, value, sizeof(telegram));
uint8_t data[EMS_MAX_TELEGRAM_LENGTH]; uint8_t data[EMS_MAX_TELEGRAM_LENGTH];
uint8_t count = 0; uint8_t count = 0;
char * p = strtok(telegram, " ,"); // delimiter char * p = strtok(telegram, " ,"); // delimiter
while (p != nullptr) { while (p != nullptr) {
data[count++] = (uint8_t)strtol(p, 0, 16); data[count++] = (uint8_t)strtol(p, 0, 16);
p = strtok(nullptr, " ,"); p = strtok(nullptr, " ,");
@@ -244,12 +244,22 @@ bool WebEntityService::get_value_info(JsonObject & output, const char * cmd) {
} }
for (const auto & entity : *entityItems) { for (const auto & entity : *entityItems) {
if (Helpers::toLower(entity.name) == Helpers::toLower(command_s)) { if (Helpers::toLower(entity.name) == Helpers::toLower(command_s)) {
output["name"] = entity.name; output["name"] = entity.name;
output["uom"] = EMSdevice::uom_to_string(entity.uom); if (entity.uom > 0) {
output["type"] = entity.value_type == DeviceValueType::BOOL ? "boolean" : F_(number); output["uom"] = EMSdevice::uom_to_string(entity.uom);
}
output["type"] = entity.value_type == DeviceValueType::BOOL ? "boolean" : entity.value_type == DeviceValueType::STRING ? "string" : F_(number);
output["readable"] = true; output["readable"] = true;
output["writeable"] = entity.writeable; output["writeable"] = entity.writeable;
output["visible"] = true; output["visible"] = true;
output["device_id"] = entity.device_id;
output["type_id"] = entity.type_id;
output["offset"] = entity.offset;
if (entity.value_type != DeviceValueType::BOOL && entity.value_type != DeviceValueType::STRING) {
output["factor"] = entity.factor;
} else if (entity.value_type == DeviceValueType::STRING) {
output["bytes"] = (uint8_t)entity.factor;
}
render_value(output, entity, true); render_value(output, entity, true);
if (attribute_s) { if (attribute_s) {
if (output.containsKey(attribute_s)) { if (output.containsKey(attribute_s)) {