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

Merge pull request #939 from pswid/dev

Browse Source 
added hyperlink to the EMS-ESP web interface in Home Assistant (IPv4)
This commit is contained in:
Proddy
2023-01-30 20:21:32 +01:00
committed by GitHub
parent 887d53528b e3e14e7a66
commit 6b7da4068c
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mqtt.cpp
View File

@@ -610,8 +610,8 @@ void Mqtt::ha_status() {
strcpy(uniq, "system_status"); strcpy(uniq, "system_status");
} }
doc["uniq_id"] = uniq; doc["uniq_id"] = uniq;
doc["obj_id"] = uniq; doc["obj_id"] = uniq;
doc["stat_t"] = mqtt_base_ + "/status"; doc["stat_t"] = mqtt_base_ + "/status";
doc["name"] = "EMS-ESP status"; doc["name"] = "EMS-ESP status";
@@ -619,6 +619,7 @@ void Mqtt::ha_status() {
doc["pl_off"] = "offline"; doc["pl_off"] = "offline";
doc["stat_cla"] = "measurement"; doc["stat_cla"] = "measurement";
doc["dev_cla"] = "connectivity"; doc["dev_cla"] = "connectivity";
doc["ent_cat"] = "diagnostic";
// doc["avty_t"] = "~/status"; // commented out, as it causes errors in HA sometimes // doc["avty_t"] = "~/status"; // commented out, as it causes errors in HA sometimes
// doc["json_attr_t"] = "~/heartbeat"; // store also as HA attributes // doc["json_attr_t"] = "~/heartbeat"; // store also as HA attributes
@@ -628,7 +629,11 @@ void Mqtt::ha_status() {
dev["sw"] = "v" + std::string(EMSESP_APP_VERSION); dev["sw"] = "v" + std::string(EMSESP_APP_VERSION);
dev["mf"] = "proddy"; dev["mf"] = "proddy";
dev["mdl"] = "EMS-ESP"; dev["mdl"] = "EMS-ESP";
JsonArray ids = dev.createNestedArray("ids"); if (EMSESP::system_.ethernet_connected())
dev["cu"] = "http://" + ETH.localIP().toString();
else
dev["cu"] = "http://" + WiFi.localIP().toString();
JsonArray ids = dev.createNestedArray("ids");
ids.add("ems-esp"); ids.add("ems-esp");
char topic[MQTT_TOPIC_MAX_SIZE]; char topic[MQTT_TOPIC_MAX_SIZE];
@@ -1066,7 +1071,7 @@ void Mqtt::publish_ha_sensor_config(uint8_t type, // EMSdev
doc["obj_id"] = uniq_id; // same as unique_id doc["obj_id"] = uniq_id; // same as unique_id
const char * ic_ha = "ic"; // icon - only set this if there is no device class const char * ic_ha = "ic"; // icon - only set this if there is no device class
const char * sc_ha = "state_class"; // state class const char * sc_ha = "stat_cla"; // state class
const char * uom_ha = "unit_of_meas"; // unit of measure const char * uom_ha = "unit_of_meas"; // unit of measure
// handle commands, which are device entities that are writable // handle commands, which are device entities that are writable
@@ -1084,7 +1089,7 @@ void Mqtt::publish_ha_sensor_config(uint8_t type, // EMSdev
// for enums, add options // for enums, add options
if (type == DeviceValueType::ENUM) { if (type == DeviceValueType::ENUM) {
JsonArray option_list = doc.createNestedArray("options"); JsonArray option_list = doc.createNestedArray("ops"); //options
for (uint8_t i = 0; i < options_size; i++) { for (uint8_t i = 0; i < options_size; i++) {
option_list.add(Helpers::translated_word(options[i])); option_list.add(Helpers::translated_word(options[i]));
} }
@@ -1187,7 +1192,7 @@ void Mqtt::publish_ha_sensor_config(uint8_t type, // EMSdev
// this next section is adding the state class, device class and sometimes the icon // this next section is adding the state class, device class and sometimes the icon
// used for Sensor and Binary Sensor Entities in HA // used for Sensor and Binary Sensor Entities in HA
if (set_ha_classes) { if (set_ha_classes) {
const char * dc_ha = "device_class"; // device class const char * dc_ha = "dev_cla"; // device class
switch (uom) { switch (uom) {
case DeviceValueUOM::DEGREES: case DeviceValueUOM::DEGREES:
@@ -1271,6 +1276,11 @@ void Mqtt::publish_ha_sensor_config(uint8_t type, // EMSdev
} }
} }
// add category "diagnostic" for system entities
if (device_type == EMSdevice::DeviceType::SYSTEM) {
doc["ent_cat"] = "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;

5
src/system.cpp
View File

@@ -595,10 +595,7 @@ bool System::heartbeat_json(JsonObject & output) {
output["uptime"] = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3); output["uptime"] = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3);
output["uptime_sec"] = uuid::get_uptime_sec(); output["uptime_sec"] = uuid::get_uptime_sec();
bool value_b = ntp_connected(); bool value_b = ntp_connected();
if (Mqtt::ha_enabled()) { if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
char s[12];
output["ntp_status"] = Helpers::render_boolean(s, value_b); // for HA always render as string
} else if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
output["ntp_status"] = value_b; output["ntp_status"] = value_b;
} else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) { } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) {
output["ntp_status"] = value_b ? 1 : 0; output["ntp_status"] = value_b ? 1 : 0;