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

rollback #1338

Browse Source
This commit is contained in:
Proddy
2024-01-17 11:58:25 +01:00
parent 4ad5c7299e
commit 12a545ddbf
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/emsdevice.cpp
View File

@@ -930,12 +930,10 @@ void EMSdevice::generate_values_web(JsonObject output) {
auto mask = Helpers::hextoa((uint8_t)(dv.state >> 4), false); // create mask to a 2-char string auto mask = Helpers::hextoa((uint8_t)(dv.state >> 4), false); // create mask to a 2-char string
// add name, prefixing the tag if it exists. This is the id used in the WebUI table and must be unique // add name, prefixing the tag if it exists. This is the id used in the WebUI table and must be unique
if (dv.has_tag()) { obj["id"] = dv.has_tag() ? mask + tag_to_string(dv.tag) + " " + fullname : mask + fullname; // suffix tag
// TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338
obj["id"] = mask + fullname + " " + tag_to_string(dv.tag); // TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338
} else { // obj["id"] = dv.has_tag() ? mask + fullname + " " + tag_to_string(dv.tag) : mask + fullname; // suffix tag
obj["id"] = mask + fullname;
}
// add commands and options // add commands and options
if (dv.has_cmd && !dv.has_state(DeviceValueState::DV_READONLY)) { if (dv.has_cmd && !dv.has_state(DeviceValueState::DV_READONLY)) {
@@ -1046,14 +1044,10 @@ void EMSdevice::generate_values_web_customization(JsonArray output) {
auto fullname = Helpers::translated_word(dv.fullname); auto fullname = Helpers::translated_word(dv.fullname);
if (dv.type != DeviceValueType::CMD) { if (dv.type != DeviceValueType::CMD) {
if (fullname) { if (fullname) {
if (dv.has_tag()) { obj["n"] = dv.has_tag() ? std::string(tag_to_string(dv.tag)) + " " + fullname : fullname; // prefix tag
char name[80];
// TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338 // TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338
snprintf(name, sizeof(name), "%s %s", fullname, tag_to_string(dv.tag)); // suffix tag // obj["n"] = (dv.has_tag()) ? fullname + " " + tag_to_string(dv.tag) : fullname; // suffix tag
obj["n"] = name;
} else {
obj["n"] = fullname;
}
} }
// add the custom name, is optional // add the custom name, is optional
@@ -1398,14 +1392,10 @@ bool EMSdevice::get_value_info(JsonObject output, const char * cmd, const int8_t
auto fullname = dv.get_fullname(); auto fullname = dv.get_fullname();
if (!fullname.empty()) { if (!fullname.empty()) {
if (dv.has_tag()) { json["fullname"] = dv.has_tag() ? fullname + " " + tag_to_string(dv.tag) : fullname; // suffix tag
char name[80];
// TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338 // TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338
snprintf(name, sizeof(name), "%s %s", fullname.c_str(), tag_to_string(dv.tag)); // suffix tag json["fullname"] = dv.has_tag() ? std::string(tag_to_string(dv.tag)) + " " + fullname.c_str() : fullname; // prefix tag
json["fullname"] = name;
} else {
json["fullname"] = fullname;
}
} }
if (dv.tag != DeviceValueTAG::TAG_NONE) { if (dv.tag != DeviceValueTAG::TAG_NONE) {
@@ -1607,9 +1597,11 @@ bool EMSdevice::generate_values(JsonObject output, const uint8_t tag_filter, con
// strcpy(short_name, ""); // strcpy(short_name, "");
// } // }
// add tag
if (have_tag) { if (have_tag) {
snprintf(name, sizeof(name), "%s %s (%s)", tag_to_string(dv.tag), fullname.c_str(), dv.short_name); // prefix tag
// TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338 // TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338
snprintf(name, sizeof(name), "%s %s (%s)", fullname.c_str(), tag_to_string(dv.tag), dv.short_name); // add the tag // snprintf(name, sizeof(name), "%s %s (%s)", fullname.c_str(), tag_to_string(dv.tag), dv.short_name); // sufix tag
} else { } else {
snprintf(name, sizeof(name), "%s (%s)", fullname.c_str(), dv.short_name); snprintf(name, sizeof(name), "%s (%s)", fullname.c_str(), dv.short_name);
} }