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

这样是没问题的

Browse Source
This commit is contained in:
zogodo
2020-02-17 15:25:48 +08:00
parent 97bfbef93c
commit 882f75bd43
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TC1/mqtt_server/user_function.c
View File

@@ -26,7 +26,7 @@ void UserSend(int udp_flag, char *s)
UserMqttSend(s); UserMqttSend(s);
} }
void UserFunctionCmdReceived(int udp_flag, char* pusrdata) void UserFunctionCmdReceived2(int udp_flag, char* pusrdata)
{ {
unsigned char i; unsigned char i;

2
TC1/mqtt_server/user_function.h
View File

@@ -7,7 +7,7 @@
#include "micokit_ext.h" #include "micokit_ext.h"
void UserSend(int udp_flag, char *s); void UserSend(int udp_flag, char *s);
void UserFunctionCmdReceived(int udp_flag, char* pusrdata); void UserFunctionCmdReceived2(int udp_flag, char* pusrdata);
unsigned char StrToHex(char a, char b); unsigned char StrToHex(char a, char b);

2
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -123,7 +123,7 @@ void UserMqttTimerFunc(void *arg)
case 15: case 15:
if (buf1 == NULL) break; if (buf1 == NULL) break;
sprintf(buf1, "{\"mac\":\"%s\",\"version\":null,\"socket_0\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_1\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_2\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_3\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_4\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_5\":{\"on\":null,\"setting\":{\"name\":null}}}", str_mac); sprintf(buf1, "{\"mac\":\"%s\",\"version\":null,\"socket_0\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_1\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_2\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_3\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_4\":{\"on\":null,\"setting\":{\"name\":null}},\"socket_5\":{\"on\":null,\"setting\":{\"name\":null}}}", str_mac);
UserFunctionCmdReceived(0, buf1); //UserFunctionCmdReceived(0, buf1);
free(buf1); free(buf1);
break; break;
default: default:

2
TC1/user_udp.c
View File

@@ -91,7 +91,7 @@ void UdpThread(void *arg)
strcpy(ip_address, inet_ntoa(addr.sin_addr)); strcpy(ip_address, inet_ntoa(addr.sin_addr));
if(len<1024) buf[len]=0; if(len<1024) buf[len]=0;
os_log("udp recv from %s:%d, len:%d ", ip_address,addr.sin_port, len); os_log("udp recv from %s:%d, len:%d ", ip_address,addr.sin_port, len);
UserFunctionCmdReceived(1,buf); //UserFunctionCmdReceived(1,buf); //<2F><><EFBFBD><EFBFBD>?
// sendto(udp_fd, buf, len, 0, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)); // sendto(udp_fd, buf, len, 0, (struct sockaddr *) &addr, sizeof(struct sockaddr_in));
} }

2
TC1/user_wifi.c
View File

@@ -24,7 +24,7 @@ static void WifiGetIpCallback(IPStatusTypedef *pnet, void * arg)
os_log("got IP:%s", pnet->ip); os_log("got IP:%s", pnet->ip);
wifi_status = WIFI_STATE_CONNECTED; wifi_status = WIFI_STATE_CONNECTED;
UserFunctionCmdReceived(1,"{\"cmd\":\"device report\"}"); //UserFunctionCmdReceived(1,"{\"cmd\":\"device report\"}");
} }
//wifi连接状态改变回调 //wifi连接状态改变回调