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

去除插座中文名

Browse Source
This commit is contained in:
zogodo
2020-02-17 17:12:46 +08:00
parent 651e8f25c4
commit 9123e2c584
2 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -62,8 +62,6 @@ mico_timer_t timer_handle;
static char timer_status = 0; static char timer_status = 0;
void UserMqttTimerFunc(void *arg) void UserMqttTimerFunc(void *arg)
{ {
char* buf1 = malloc(1024); //idx为1位时长度为24
LinkStatusTypeDef LinkStatus; LinkStatusTypeDef LinkStatus;
micoWlanGetLinkStatus(&LinkStatus); micoWlanGetLinkStatus(&LinkStatus);
if (LinkStatus.is_connected != 1) if (LinkStatus.is_connected != 1)
@@ -93,7 +91,7 @@ void UserMqttTimerFunc(void *arg)
case 11: case 11:
case 12: case 12:
case 13: case 13:
UserMqttHassAutoName(timer_status - 8); UserMqttHassAuto(timer_status - 8);
break; break;
case 14: case 14:
UserMqttHassAutoPowerName(); UserMqttHassAutoPowerName();
@@ -464,29 +462,6 @@ OSStatus UserMqttSendSocketState(char socket_id)
//hass mqtt自动发现数据开关发送 //hass mqtt自动发现数据开关发送
void UserMqttHassAuto(char socket_id) void UserMqttHassAuto(char socket_id)
{
char *send_buf = NULL;
char *topic_buf = NULL;
send_buf = malloc(512); //
topic_buf = malloc(128); //
if (send_buf != NULL && topic_buf != NULL)
{
sprintf(topic_buf, "homeassistant/switch/%s/socket_%d/config", str_mac, socket_id);
sprintf(send_buf, "{"
"\"name\":\"zTC1_socket%d_%s\","
"\"stat_t\":\"homeassistant/switch/%s/socket_%d/state\","
"\"cmd_t\":\"device/ztc1/set\","
"\"pl_on\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":1}}\","
"\"pl_off\":\"{\\\"mac\\\":\\\"%s\\\",\\\"socket_%d\\\":{\\\"on\\\":0,\\\"ttt1\\\":1}}\""
"}",
socket_id, str_mac + 8, str_mac, socket_id, str_mac, socket_id, str_mac, socket_id);
UserMqttSendTopic(topic_buf, send_buf, 1);
}
if (send_buf) free(send_buf);
if (topic_buf) free(topic_buf);
}
void UserMqttHassAutoName(char socket_id)
{ {
char *send_buf = NULL; char *send_buf = NULL;
char *topic_buf = NULL; char *topic_buf = NULL;
@@ -495,13 +470,13 @@ void UserMqttHassAutoName(char socket_id)
if (send_buf != NULL && topic_buf != NULL) if (send_buf != NULL && topic_buf != NULL)
{ {
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\":\"%s\"," "{\"name\":\"TC1-Socket-%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\"}",
"SSS", str_mac, socket_id, str_mac, socket_id, str_mac, socket_id); str_mac+8, 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, 0);
} }
if (send_buf) if (send_buf)

1
TC1/mqtt_server/user_mqtt_client.h
View File

@@ -22,7 +22,6 @@ extern OSStatus UserMqttSend(char *arg);
extern bool UserMqttIsConnect(void); extern bool UserMqttIsConnect(void);
extern OSStatus UserMqttSendSocketState(char socket_id); extern OSStatus UserMqttSendSocketState(char socket_id);
extern void UserMqttHassAuto(char socket_id); extern void UserMqttHassAuto(char socket_id);
extern void UserMqttHassAutoName(char socket_id);
extern void UserMqttHassPower(void); extern void UserMqttHassPower(void);
extern void UserMqttHassAutoPower(void); extern void UserMqttHassAutoPower(void);
extern void UserMqttHassAutoPowerName(void); extern void UserMqttHassAutoPowerName(void);