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

自定义命令-OK

Browse Source
This commit is contained in:
zogodo
2020-02-17 15:08:29 +08:00
parent 1c90fa943d
commit 97bfbef93c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -426,6 +426,7 @@ void ProcessHaCmd(char* cmd)
sscanf(cmd, "set socket %s %d %d", mac, &i, &on); sscanf(cmd, "set socket %s %d %d", mac, &i, &on);
app_log("set socket[%d] on[%d]", i, on); app_log("set socket[%d] on[%d]", i, on);
UserRelaySet(i, on); UserRelaySet(i, on);
UserMqttSendSocketState(i);
} }
} }
@@ -473,15 +474,13 @@ OSStatus UserMqttSend(char *arg)
//更新ha开关状态 //更新ha开关状态
OSStatus UserMqttSendSocketState(char socket_id) OSStatus UserMqttSendSocketState(char socket_id)
{ {
char *send_buf = NULL; char *send_buf = malloc(64);
char *topic_buf = NULL; char *topic_buf = malloc(64);
send_buf = malloc(64);
topic_buf = malloc(64);
OSStatus oss_status = kUnknownErr; OSStatus oss_status = kUnknownErr;
if (send_buf != NULL && topic_buf != NULL) if (send_buf != NULL && topic_buf != NULL)
{ {
sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/state", str_mac, (int)socket_id); sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/state", str_mac, (int)socket_id);
sprintf(send_buf, "{\"mac\":\"%s\",\"socket_%d\":{\"on\":%d}}", str_mac, socket_id, (int)user_config->socket_configs[(int)socket_id].on); sprintf(send_buf, "set socket %s %d %d", str_mac, socket_id, (int)user_config->socket_configs[(int)socket_id].on);
oss_status = UserMqttSendTopic(topic_buf, send_buf, 1); oss_status = UserMqttSendTopic(topic_buf, send_buf, 1);
} }
if (send_buf) free(send_buf); if (send_buf) free(send_buf);
@@ -527,7 +526,7 @@ void UserMqttHassAutoName(char socket_id)
"\"name\":\"%s\"," "\"name\":\"%s\","
"\"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\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":1}}\"," "\"pl_on\":\"set socket %s %d 1\","
"\"pl_off\":\"set socket %s %d 0\"}", "\"pl_off\":\"set socket %s %d 0\"}",
user_config->socket_configs[(int)socket_id].name, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id); user_config->socket_configs[(int)socket_id].name, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id);
UserMqttSendTopic(topic_buf, send_buf, 0); UserMqttSendTopic(topic_buf, send_buf, 0);

1
TODO.txt
View File

@@ -7,3 +7,4 @@
6. 去掉C_Json 6. 去掉C_Json
7. 去除user_udp 7. 去除user_udp
8. 统一os_log 8. 统一os_log
9. 更新web socket状态