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

console show handle enum/bool like web

Browse Source
This commit is contained in:
MichaelDvP
2022-09-02 14:16:24 +02:00
parent 7cc2eac79d
commit 4f42ae7efc
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/emsdevice.cpp
View File

@@ -1238,17 +1238,17 @@ bool EMSdevice::generate_values(JsonObject & output, const uint8_t tag_filter, c
if (Mqtt::ha_enabled() && (output_target == OUTPUT_TARGET::MQTT)) { if (Mqtt::ha_enabled() && (output_target == OUTPUT_TARGET::MQTT)) {
char s[7]; char s[7];
json[name] = Helpers::render_boolean(s, value_b); // for HA always render as string json[name] = Helpers::render_boolean(s, value_b); // for HA always render as string
} else { } else if (output_target == OUTPUT_TARGET::CONSOLE) {
if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) { char s[7];
json[name] = Helpers::render_boolean(s, value_b, true); // console use web settings
} else if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
json[name] = value_b; json[name] = value_b;
} else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) { } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) {
json[name] = value_b ? 1 : 0; json[name] = value_b ? 1 : 0;
} else {
char s[7]; char s[7];
json[name] = Helpers::render_boolean(s, value_b); json[name] = Helpers::render_boolean(s, value_b);
} }
} }
}
// handle TEXT strings // handle TEXT strings
else if (dv.type == DeviceValueType::STRING) { else if (dv.type == DeviceValueType::STRING) {
@@ -1257,8 +1257,8 @@ bool EMSdevice::generate_values(JsonObject & output, const uint8_t tag_filter, c
// handle ENUMs // handle ENUMs
else if ((dv.type == DeviceValueType::ENUM) && (*(uint8_t *)(dv.value_p) < dv.options_size)) { else if ((dv.type == DeviceValueType::ENUM) && (*(uint8_t *)(dv.value_p) < dv.options_size)) {
// check for numeric enum-format // check for numeric enum-format, console use text format
if (EMSESP::system_.enum_format() == ENUM_FORMAT_INDEX) { if (EMSESP::system_.enum_format() == ENUM_FORMAT_INDEX && output_target != OUTPUT_TARGET::CONSOLE) {
json[name] = (uint8_t)(*(uint8_t *)(dv.value_p)); json[name] = (uint8_t)(*(uint8_t *)(dv.value_p));
} else { } else {
json[name] = Helpers::translated_word(dv.options[*(uint8_t *)(dv.value_p)]); json[name] = Helpers::translated_word(dv.options[*(uint8_t *)(dv.value_p)]);