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

domoticz warnings on custom entities - https://github.com/emsesp/EMS-ESP32/discussions/2408#discussioncomment-12896868

Browse Source
This commit is contained in:
proddy
2025-04-22 16:07:22 +02:00
parent 71726530c0
commit c6b0099581
6 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/analogsensor.cpp
View File

@@ -594,7 +594,12 @@ void AnalogSensor::publish_values(const bool force) {
if (sensor.type() == AnalogType::DIGITAL_IN || sensor.type() == AnalogType::DIGITAL_OUT) { if (sensor.type() == AnalogType::DIGITAL_IN || sensor.type() == AnalogType::DIGITAL_OUT) {
Helpers::render_boolean(sample_val, false); Helpers::render_boolean(sample_val, false);
} }
config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + " else " + sample_val + "}}"; // don't bother with value template conditions if using Domoticz which doesn't fully support MQTT Discovery
if (Mqtt::discovery_type() == Mqtt::discoveryType::HOMEASSISTANT) {
config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + "}}";
} else {
config["val_tpl"] = (std::string) "{{" + val_obj + "}}";
}
char uniq_s[70]; char uniq_s[70];
if (Mqtt::entity_format() == Mqtt::entityFormat::MULTI_SHORT) { if (Mqtt::entity_format() == Mqtt::entityFormat::MULTI_SHORT) {

11
src/core/shower.cpp
View File

@@ -222,8 +222,15 @@ void Shower::set_shower_state(bool state, bool force) {
snprintf(stat_t, sizeof(stat_t), "%s/shower_data", Mqtt::base().c_str()); snprintf(stat_t, sizeof(stat_t), "%s/shower_data", Mqtt::base().c_str());
doc["stat_t"] = stat_t; doc["stat_t"] = stat_t;
doc["name"] = "Shower Duration"; doc["name"] = "Shower Duration";
doc["val_tpl"] = "{{value_json.duration if value_json.duration is defined else 0}}";
// don't bother with value template conditions if using Domoticz which doesn't fully support MQTT Discovery
if (Mqtt::discovery_type() == Mqtt::discoveryType::HOMEASSISTANT) {
doc["val_tpl"] = "{{value_json.duration if value_json.duration is defined else 0}}";
} else {
doc["val_tpl"] = "{{value_json.duration}}";
}
doc["unit_of_meas"] = "s"; doc["unit_of_meas"] = "s";
doc["stat_cla"] = "measurement"; doc["stat_cla"] = "measurement";
doc["dev_cla"] = "duration"; doc["dev_cla"] = "duration";

28
src/devices/boiler.cpp
View File

@@ -1881,13 +1881,13 @@ void Boiler::process_UBAErrorMessage2(std::shared_ptr<const Telegram> telegram)
return; return;
} }
uint32_t date = 0; uint32_t date = 0;
char code[sizeof(lastCode_)] = {0}; char code[sizeof(lastCode_)] = {0};
uint16_t codeNo = EMS_VALUE_INT16_NOTSET; uint16_t codeNo = EMS_VALUE_INT16_NOTSET;
code[0] = telegram->message_data[5]; code[0] = telegram->message_data[5];
code[1] = telegram->message_data[6]; code[1] = telegram->message_data[6];
code[2] = telegram->message_data[7]; code[2] = telegram->message_data[7];
code[3] = 0; code[3] = 0;
telegram->read_value(codeNo, 8); telegram->read_value(codeNo, 8);
if (!std::isprint(code[0]) || !std::isprint(code[1]) || !std::isprint(code[2])) { if (!std::isprint(code[0]) || !std::isprint(code[1]) || !std::isprint(code[2])) {
return; return;
@@ -1947,13 +1947,13 @@ void Boiler::process_UBAErrorMessage3(std::shared_ptr<const Telegram> telegram)
return; return;
} }
uint32_t date = 0; uint32_t date = 0;
char code[sizeof(lastCode_)] = {0}; char code[sizeof(lastCode_)] = {0};
uint16_t codeNo = EMS_VALUE_INT16_NOTSET; uint16_t codeNo = EMS_VALUE_INT16_NOTSET;
code[0] = telegram->message_data[6]; code[0] = telegram->message_data[6];
code[1] = telegram->message_data[7]; code[1] = telegram->message_data[7];
code[2] = telegram->message_data[8]; code[2] = telegram->message_data[8];
code[3] = 0; code[3] = 0;
telegram->read_value(codeNo, 9); telegram->read_value(codeNo, 9);
if (!std::isprint(code[0]) || !std::isprint(code[1]) || !std::isprint(code[2])) { if (!std::isprint(code[0]) || !std::isprint(code[1]) || !std::isprint(code[2])) {
return; return;

2
src/devices/boiler.h
View File

@@ -149,7 +149,7 @@ class Boiler : public EMSdevice {
char lastCode_[55]; // last error code char lastCode_[55]; // last error code
char serviceCode_[4]; // 3 character status/service code char serviceCode_[4]; // 3 character status/service code
uint16_t serviceCodeNumber_; // error/service code uint16_t serviceCodeNumber_; // error/service code
uint32_t lastCodeDate_ = 0; // last code date uint32_t lastCodeDate_ = 0; // last code date
uint8_t emergencyOps_; uint8_t emergencyOps_;
uint8_t emergencyTemp_; uint8_t emergencyTemp_;
uint16_t headertemp_; // see #1317 uint16_t headertemp_; // see #1317

7
src/web/WebCustomEntityService.cpp
View File

@@ -399,7 +399,12 @@ void WebCustomEntityService::publish(const bool force) {
char val_cond[65]; char val_cond[65];
snprintf(val_obj, sizeof(val_obj), "value_json['%s']", entityItem.name.c_str()); snprintf(val_obj, sizeof(val_obj), "value_json['%s']", entityItem.name.c_str());
snprintf(val_cond, sizeof(val_cond), "%s is defined", val_obj); snprintf(val_cond, sizeof(val_cond), "%s is defined", val_obj);
config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + "}}"; // don't bother with value template conditions if using Domoticz which doesn't fully support MQTT Discovery
if (Mqtt::discovery_type() == Mqtt::discoveryType::HOMEASSISTANT) {
config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + "}}";
} else {
config["val_tpl"] = (std::string) "{{" + val_obj + "}}";
}
char uniq_s[70]; char uniq_s[70];
snprintf(uniq_s, sizeof(uniq_s), "%s_%s", F_(custom), entityItem.name.c_str()); snprintf(uniq_s, sizeof(uniq_s), "%s_%s", F_(custom), entityItem.name.c_str());

7
src/web/WebSchedulerService.cpp
View File

@@ -267,7 +267,12 @@ void WebSchedulerService::publish(const bool force) {
char val_cond[65]; char val_cond[65];
snprintf(val_obj, sizeof(val_obj), "value_json['%s']", scheduleItem.name.c_str()); snprintf(val_obj, sizeof(val_obj), "value_json['%s']", scheduleItem.name.c_str());
snprintf(val_cond, sizeof(val_cond), "%s is defined", val_obj); snprintf(val_cond, sizeof(val_cond), "%s is defined", val_obj);
config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + "}}";
if (Mqtt::discovery_type() == Mqtt::discoveryType::HOMEASSISTANT) {
config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + "}}";
} else {
config["val_tpl"] = (std::string) "{{" + val_obj + "}}"; // omit value conditional Jinja2 template code
}
char uniq_s[70]; char uniq_s[70];
snprintf(uniq_s, sizeof(uniq_s), "%s_%s", F_(scheduler), scheduleItem.name.c_str()); snprintf(uniq_s, sizeof(uniq_s), "%s_%s", F_(scheduler), scheduleItem.name.c_str());