From ad461596ca2ebc86147cc3f6420b1af0d96e5d0d Mon Sep 17 00:00:00 2001
From: zogodo <742782908@qq.com>
Date: Sun, 2 Jan 2022 19:29:27 +0800
Subject: [PATCH] new homeassistant uniq_id

---
 TC1/mqtt_server/user_mqtt_client.c | 10 +++++++---
 TC1/timed_task/timed_task.c        |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/TC1/mqtt_server/user_mqtt_client.c b/TC1/mqtt_server/user_mqtt_client.c
index 3b1637f..38bf009 100644
--- a/TC1/mqtt_server/user_mqtt_client.c
+++ b/TC1/mqtt_server/user_mqtt_client.c
@@ -237,6 +237,8 @@ void MqttClientThread(mico_thread_arg_t arg)
     connectData.clientID.cstring = str_mac;
     connectData.username.cstring = user_config->mqtt_user;
     connectData.password.cstring = user_config->mqtt_password;
+    connectData.username.cstring = "test";
+    connectData.password.cstring = "12345678";
     connectData.keepAliveInterval = MQTT_CLIENT_KEEPALIVE;
     connectData.cleansession = 1;
 
@@ -465,12 +467,13 @@ void UserMqttHassAuto(char socket_id)
         sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", str_mac, socket_id);
         sprintf(send_buf, 
             "{\"name\":\"TC1_%s_Socket_%d\","
+            "\"uniq_id\":\"%s_s%d\","
             "\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\","
             "\"cmd_t\":\"device/ztc1/set\","
             "\"pl_on\":\"set socket %s %d 1\","
             "\"pl_off\":\"set socket %s %d 0\"}",
-            str_mac+8, socket_id+1, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id);
-        UserMqttSendTopic(topic_buf, send_buf, 0);
+            str_mac+8, socket_id+1, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id);
+        UserMqttSendTopic(topic_buf, send_buf, 1);
     }
     if (send_buf)
         free(send_buf);
@@ -489,11 +492,12 @@ void UserMqttHassAutoPower(void)
         sprintf(topic_buf, "homeassistant/sensor/%s/power/config", str_mac);
         sprintf(send_buf, 
             "{\"name\":\"TC1_%s_Power\","
+            "\"uniq_id\":\"%s_p\","
             "\"state_topic\":\"homeassistant/sensor/%s/power/state\","
             "\"unit_of_measurement\":\"W\","
             "\"icon\":\"mdi:gauge\","
             "\"value_template\":\"{{ value_json.power }}\"}",
-            str_mac+8, str_mac);
+            str_mac+8, str_mac, str_mac);
         UserMqttSendTopic(topic_buf, send_buf, 1);
     }
     if (send_buf) free(send_buf);
diff --git a/TC1/timed_task/timed_task.c b/TC1/timed_task/timed_task.c
index 371a023..8a3e913 100644
--- a/TC1/timed_task/timed_task.c
+++ b/TC1/timed_task/timed_task.c
@@ -165,7 +165,7 @@ char* GetTaskStr()
         strftime(buffer, 26, "%m-%d %H:%M", tm_info);
 
         sprintf(tmp_str, "{'timestamp':%ld,'prs_time':'%s','socket_idx':%d,'on':%d,'weekday':%d},",
-            tmp_tsk->prs_time, buffer, tmp_tsk->socket_idx, tmp_tsk->on, tmp_tsk->weekday);
+            tmp_tsk->prs_time, buffer, tmp_tsk->socket_idx+1, tmp_tsk->on, tmp_tsk->weekday);
         tmp_str += strlen(tmp_str);
         tmp_tsk = tmp_tsk->next;
     }