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

Add entity category to HA Discovery topics - #1323

Browse Source
This commit is contained in:
Proddy
2023-10-15 17:03:59 +02:00
parent d37a5c5713
commit 67693364cc
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mqtt.cpp
View File

@@ -532,7 +532,7 @@ void Mqtt::ha_status() {
doc["obj_id"] = uniq; doc["obj_id"] = uniq;
doc["stat_t"] = mqtt_basename_ + "/status"; doc["stat_t"] = mqtt_basename_ + "/status";
doc["name"] = "system status"; doc["name"] = "System status";
doc["pl_on"] = "online"; doc["pl_on"] = "online";
doc["pl_off"] = "offline"; doc["pl_off"] = "offline";
doc["stat_cla"] = "measurement"; doc["stat_cla"] = "measurement";
@@ -855,14 +855,11 @@ bool Mqtt::publish_ha_sensor_config(uint8_t type, // EMSdev
case DeviceValueType::UINT: case DeviceValueType::UINT:
case DeviceValueType::SHORT: case DeviceValueType::SHORT:
case DeviceValueType::USHORT: case DeviceValueType::USHORT:
// case DeviceValueType::ULONG:
if (discovery_type() == discoveryType::HOMEASSISTANT) { if (discovery_type() == discoveryType::HOMEASSISTANT) {
// Home Assistant
// number - https://www.home-assistant.io/integrations/number.mqtt // number - https://www.home-assistant.io/integrations/number.mqtt
snprintf(topic, sizeof(topic), "number/%s", config_topic); snprintf(topic, sizeof(topic), "number/%s", config_topic);
} else { } else {
// Domoticz // Domoticz does not support number, use sensor
// Does not support number, use sensor
snprintf(topic, sizeof(topic), "sensor/%s", config_topic); snprintf(topic, sizeof(topic), "sensor/%s", config_topic);
} }
break; break;
@@ -1126,9 +1123,8 @@ bool Mqtt::publish_ha_sensor_config(uint8_t type, // EMSdev
} }
// add category "diagnostic" for system entities // add category "diagnostic" for system entities
if (device_type == EMSdevice::DeviceType::SYSTEM) { // config for writeable entities, like switches. diagnostic for read only sensors.
doc["ent_cat"] = "diagnostic"; doc["ent_cat"] = (has_cmd) ? "config" : "diagnostic";
}
// add the dev json object to the end // add the dev json object to the end
doc["dev"] = dev_json; doc["dev"] = dev_json;