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

Socket_1~7

Browse Source
This commit is contained in:
zogodo
2020-02-17 18:53:00 +08:00
parent f0c3f24577
commit 976ea10521
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TC1/main.h
View File

@@ -4,7 +4,7 @@
#include "mico.h" #include "mico.h"
#include "micokit_ext.h" #include "micokit_ext.h"
#define VERSION "v1.0.11" #define VERSION "v1.0.12"
#define TYPE 1 #define TYPE 1
#define TYPE_NAME "zTC1" #define TYPE_NAME "zTC1"

9
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -71,24 +71,24 @@ void UserMqttTimerFunc(void *arg)
} }
if (mico_rtos_is_queue_empty(&mqtt_msg_send_queue)) if (mico_rtos_is_queue_empty(&mqtt_msg_send_queue))
{ {
timer_status++;
switch (timer_status) switch (timer_status)
{ {
case 0:
case 1: case 1:
case 2: case 2:
case 3: case 3:
case 4: case 4:
case 5: case 5:
case 6:
UserMqttHassAuto(timer_status); UserMqttHassAuto(timer_status);
break; break;
case 6: case 7:
UserMqttHassAutoPower(); UserMqttHassAutoPower();
break; break;
default: default:
mico_stop_timer(&timer_handle); mico_stop_timer(&timer_handle);
break; break;
} }
timer_status++;
} }
} }
@@ -450,6 +450,7 @@ OSStatus UserMqttSendSocketState(char socket_id)
//hass mqtt自动发现数据开关发送 //hass mqtt自动发现数据开关发送
void UserMqttHassAuto(char socket_id) void UserMqttHassAuto(char socket_id)
{ {
socket_id--;
char *send_buf = NULL; char *send_buf = NULL;
char *topic_buf = NULL; char *topic_buf = NULL;
send_buf = (char *) malloc(300); send_buf = (char *) malloc(300);
@@ -463,7 +464,7 @@ void UserMqttHassAuto(char socket_id)
"\"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, 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);
UserMqttSendTopic(topic_buf, send_buf, 0); UserMqttSendTopic(topic_buf, send_buf, 0);
} }
if (send_buf) if (send_buf)