From 6dc63907f14b4d0c1fadb9610c2b16885a3a76e3 Mon Sep 17 00:00:00 2001
From: Proddy <paul@derbyshire.nl>
Date: Mon, 30 Jan 2023 20:21:28 +0100
Subject: [PATCH] merge PR https://github.com/emsesp/EMS-ESP32/pull/939

---
 src/mqtt.cpp   | 18 +++++++++++++++---
 src/system.cpp |  5 +----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index b062f432f..5043703cd 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -624,6 +624,7 @@ void Mqtt::ha_status() {
     doc["pl_off"]   = "offline";
     doc["stat_cla"] = "measurement";
     doc["dev_cla"]  = "connectivity";
+    doc["ent_cat"]  = "diagnostic";
 
     // doc["avty_t"]      = "~/status"; // commented out, as it causes errors in HA sometimes
     // doc["json_attr_t"] = "~/heartbeat"; // store also as HA attributes
@@ -633,7 +634,13 @@ void Mqtt::ha_status() {
     dev["sw"]      = "v" + std::string(EMSESP_APP_VERSION);
     dev["mf"]      = "proddy";
     dev["mdl"]     = "EMS-ESP";
-    JsonArray ids  = dev.createNestedArray("ids");
+#ifndef EMSESP_STANDALONE
+    if (EMSESP::system_.ethernet_connected())
+        dev["cu"] = "http://" + ETH.localIP().toString();
+    else
+        dev["cu"] = "http://" + WiFi.localIP().toString();
+#endif
+    JsonArray ids = dev.createNestedArray("ids");
     ids.add("ems-esp");
 
     char topic[MQTT_TOPIC_MAX_SIZE];
@@ -1092,7 +1099,7 @@ void Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdev
 
         // for enums, add options
         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++) {
                 option_list.add(Helpers::translated_word(options[i]));
             }
@@ -1194,7 +1201,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
     // used for Sensor and Binary Sensor Entities in HA
     if (set_ha_classes) {
-        const char * dc_ha = "device_class"; // device class
+        const char * dc_ha = "dev_cla"; // device class
 
         switch (uom) {
         case DeviceValueUOM::DEGREES:
@@ -1278,6 +1285,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
     doc["dev"] = dev_json;
 
diff --git a/src/system.cpp b/src/system.cpp
index 436555efe..9763b283d 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -601,10 +601,7 @@ bool System::heartbeat_json(JsonObject & output) {
     output["uptime"]     = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3);
     output["uptime_sec"] = uuid::get_uptime_sec();
     bool value_b         = ntp_connected();
-    if (Mqtt::ha_enabled()) {
-        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) {
+    if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
         output["ntp_status"] = value_b;
     } else if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) {
         output["ntp_status"] = value_b ? 1 : 0;