GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2025-12-15 06:28:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

new homeassistant uniq_id

Browse Source
This commit is contained in:
zogodo
2022-01-02 19:29:27 +08:00
parent 3f1f617f36
commit ad461596ca
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -237,6 +237,8 @@ void MqttClientThread(mico_thread_arg_t arg)
connectData.clientID.cstring = str_mac; connectData.clientID.cstring = str_mac;
connectData.username.cstring = user_config->mqtt_user; connectData.username.cstring = user_config->mqtt_user;
connectData.password.cstring = user_config->mqtt_password; connectData.password.cstring = user_config->mqtt_password;
connectData.username.cstring = "test";
connectData.password.cstring = "12345678";
connectData.keepAliveInterval = MQTT_CLIENT_KEEPALIVE; connectData.keepAliveInterval = MQTT_CLIENT_KEEPALIVE;
connectData.cleansession = 1; 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(topic_buf, "homeassistant/switch/%s/socket_%d/config", str_mac, socket_id);
sprintf(send_buf, sprintf(send_buf,
"{\"name\":\"TC1_%s_Socket_%d\"," "{\"name\":\"TC1_%s_Socket_%d\","
"\"uniq_id\":\"%s_s%d\","
"\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\"," "\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\","
"\"cmd_t\":\"device/ztc1/set\"," "\"cmd_t\":\"device/ztc1/set\","
"\"pl_on\":\"set socket %s %d 1\"," "\"pl_on\":\"set socket %s %d 1\","
"\"pl_off\":\"set socket %s %d 0\"}", "\"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); 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, 0); UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) if (send_buf)
free(send_buf); free(send_buf);
@@ -489,11 +492,12 @@ void UserMqttHassAutoPower(void)
sprintf(topic_buf, "homeassistant/sensor/%s/power/config", str_mac); sprintf(topic_buf, "homeassistant/sensor/%s/power/config", str_mac);
sprintf(send_buf, sprintf(send_buf,
"{\"name\":\"TC1_%s_Power\"," "{\"name\":\"TC1_%s_Power\","
"\"uniq_id\":\"%s_p\","
"\"state_topic\":\"homeassistant/sensor/%s/power/state\"," "\"state_topic\":\"homeassistant/sensor/%s/power/state\","
"\"unit_of_measurement\":\"W\"," "\"unit_of_measurement\":\"W\","
"\"icon\":\"mdi:gauge\"," "\"icon\":\"mdi:gauge\","
"\"value_template\":\"{{ value_json.power }}\"}", "\"value_template\":\"{{ value_json.power }}\"}",
str_mac+8, str_mac); str_mac+8, str_mac, str_mac);
UserMqttSendTopic(topic_buf, send_buf, 1); UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) free(send_buf); if (send_buf) free(send_buf);

2
TC1/timed_task/timed_task.c
View File

@@ -165,7 +165,7 @@ char* GetTaskStr()
strftime(buffer, 26, "%m-%d %H:%M", tm_info); strftime(buffer, 26, "%m-%d %H:%M", tm_info);
sprintf(tmp_str, "{'timestamp':%ld,'prs_time':'%s','socket_idx':%d,'on':%d,'weekday':%d},", 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_str += strlen(tmp_str);
tmp_tsk = tmp_tsk->next; tmp_tsk = tmp_tsk->next;
} }