From 1f92b30ea07d5b474c77e6c43abd8d4ce7b8f229 Mon Sep 17 00:00:00 2001
From: oopuuu <75833466+oopuuu@users.noreply.github.com>
Date: Wed, 19 Mar 2025 00:51:44 +0800
Subject: [PATCH] Update user_mqtt_client.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

指定hass中的实体名称，防止新功能导致它变化
---
 TC1/mqtt_server/user_mqtt_client.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/TC1/mqtt_server/user_mqtt_client.c b/TC1/mqtt_server/user_mqtt_client.c
index 994048a..110895c 100644
--- a/TC1/mqtt_server/user_mqtt_client.c
+++ b/TC1/mqtt_server/user_mqtt_client.c
@@ -510,6 +510,7 @@ void UserMqttHassAuto(char socket_id) {
         sprintf(send_buf,
                 "{\"name\":\"%s\","
                 "\"uniq_id\":\"%s_s%d\","
+                "\"object_id\":\"%s_s%d\","
                 "\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\","
                 "\"cmd_t\":\"device/ztc1/set\","
                 "\"pl_on\":\"set socket %s %d 1\","
@@ -519,7 +520,7 @@ void UserMqttHassAuto(char socket_id) {
                 "\"name\":\"TC1_%s\","
                 "\"model\":\"TC1\","
                 "\"manufacturer\":\"PHICOMM\"}}",
-                user_config->socket_names[(int)socket_id], str_mac, socket_id, str_mac, socket_id,
+                user_config->socket_names[(int)socket_id], str_mac, socket_id,str_mac, socket_id, str_mac, socket_id,
                 str_mac,
                 socket_id, str_mac, socket_id, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
@@ -540,6 +541,7 @@ void UserMqttHassAutoLed(void) {
         sprintf(send_buf,
                 "{\"name\":\"LED指示灯\","
                 "\"uniq_id\":\"%s_led\","
+                "\"object_id\":\"%s_led\","
                 "\"stat_t\":\"homeassistant/switch/%s/led/state\","
                 "\"cmd_t\":\"device/ztc1/set\","
                 "\"pl_on\":\"set led %s 1\","
@@ -549,7 +551,7 @@ void UserMqttHassAutoLed(void) {
                 "\"name\":\"TC1_%s\","
                 "\"model\":\"TC1\","
                 "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
+                str_mac,str_mac,str_mac, str_mac, str_mac, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
     }
     if (send_buf)
@@ -568,6 +570,7 @@ void UserMqttHassAutoTotalSocket(void) {
         sprintf(send_buf,
                 "{\"name\":\"总开关\","
                 "\"uniq_id\":\"%s_total_socket\","
+                "\"object_id\":\"%s_total_socket\","
                 "\"stat_t\":\"homeassistant/switch/%s/total_socket/state\","
                 "\"cmd_t\":\"device/ztc1/set\","
                 "\"pl_on\":\"set total_socket %s 1\","
@@ -577,7 +580,7 @@ void UserMqttHassAutoTotalSocket(void) {
                 "\"name\":\"TC1_%s\","
                 "\"model\":\"TC1\","
                 "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
+                str_mac, str_mac, str_mac, str_mac, str_mac, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
     }
     if (send_buf)
@@ -597,6 +600,7 @@ void UserMqttHassAutoPower(void) {
         sprintf(send_buf,
                 "{\"name\":\"功率\","
                 "\"uniq_id\":\"%s_p\","
+                "\"object_id\":\"%s_p\","
                 "\"state_topic\":\"homeassistant/sensor/%s/power/state\","
                 "\"unit_of_measurement\":\"W\","
                 "\"icon\":\"mdi:gauge\","
@@ -605,12 +609,13 @@ void UserMqttHassAutoPower(void) {
                 "\"name\":\"TC1_%s\","
                 "\"model\":\"TC1\","
                 "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac);
+                str_mac,str_mac, str_mac, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
         sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumption/config", str_mac);
         sprintf(send_buf,
                 "{\"name\":\"总耗电量\","
                 "\"uniq_id\":\"%s_pc\","
+                "\"object_id\":\"%s_pc\","
                 "\"state_topic\":\"homeassistant/sensor/%s/powerConsumption/state\","
                 "\"unit_of_measurement\":\"kWh\","
                 "\"icon\":\"mdi:fence-electric\","
@@ -619,13 +624,14 @@ void UserMqttHassAutoPower(void) {
                 "\"name\":\"TC1_%s\","
                 "\"model\":\"TC1\","
                 "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac);
+                str_mac, str_mac, str_mac, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
 
         sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionToday/config", str_mac);
         sprintf(send_buf,
                 "{\"name\":\"今日耗电量\","
                 "\"uniq_id\":\"%s_pc_today\","
+                "\"object_id\":\"%s_pc_today\","
                 "\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionToday/state\","
                 "\"unit_of_measurement\":\"kWh\","
                 "\"icon\":\"mdi:fence-electric\","
@@ -634,13 +640,14 @@ void UserMqttHassAutoPower(void) {
                 "\"name\":\"TC1_%s\","
                 "\"model\":\"TC1\","
                 "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac);
+                str_mac,str_mac, str_mac, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
 
         sprintf(topic_buf, "homeassistant/sensor/%s/powerConsumptionYesterday/config", str_mac);
         sprintf(send_buf,
                 "{\"name\":\"昨日耗电量\","
                 "\"uniq_id\":\"%s_pc_yesterday\","
+                "\"object_id\":\"%s_pc_yesterday\","
                 "\"state_topic\":\"homeassistant/sensor/%s/powerConsumptionYesterday/state\","
                 "\"unit_of_measurement\":\"kWh\","
                 "\"icon\":\"mdi:fence-electric\","
@@ -649,7 +656,7 @@ void UserMqttHassAutoPower(void) {
                 "\"name\":\"TC1_%s\","
                 "\"model\":\"TC1\","
                 "\"manufacturer\":\"PHICOMM\"}}",
-                str_mac, str_mac, str_mac, str_mac);
+                str_mac,str_mac, str_mac, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
     }
     if (send_buf) free(send_buf);