From 882f75bd436fd58a81af3fd9dece3d4a525c8ae0 Mon Sep 17 00:00:00 2001
From: zogodo <742782908@qq.com>
Date: Mon, 17 Feb 2020 15:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=99=E6=A0=B7=E6=98=AF=E6=B2=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TC1/mqtt_server/user_function.c    | 2 +-
 TC1/mqtt_server/user_function.h    | 2 +-
 TC1/mqtt_server/user_mqtt_client.c | 2 +-
 TC1/user_udp.c                     | 2 +-
 TC1/user_wifi.c                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TC1/mqtt_server/user_function.c b/TC1/mqtt_server/user_function.c
index 40080fa..d4eb9e9 100644
--- a/TC1/mqtt_server/user_function.c
+++ b/TC1/mqtt_server/user_function.c
@@ -26,7 +26,7 @@ void UserSend(int udp_flag, char *s)
         UserMqttSend(s);
 }
 
-void UserFunctionCmdReceived(int udp_flag, char* pusrdata)
+void UserFunctionCmdReceived2(int udp_flag, char* pusrdata)
 {
 
     unsigned char i;
diff --git a/TC1/mqtt_server/user_function.h b/TC1/mqtt_server/user_function.h
index 3d871dc..ab7b3d0 100644
--- a/TC1/mqtt_server/user_function.h
+++ b/TC1/mqtt_server/user_function.h
@@ -7,7 +7,7 @@
 #include "micokit_ext.h"
 
 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);
 
 
diff --git a/TC1/mqtt_server/user_mqtt_client.c b/TC1/mqtt_server/user_mqtt_client.c
index b2db598..71f43e7 100644
--- a/TC1/mqtt_server/user_mqtt_client.c
+++ b/TC1/mqtt_server/user_mqtt_client.c
@@ -123,7 +123,7 @@ void UserMqttTimerFunc(void *arg)
             case 15:
                 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);
-                UserFunctionCmdReceived(0, buf1);
+                //UserFunctionCmdReceived(0, buf1);
                 free(buf1);
                 break;
             default:
diff --git a/TC1/user_udp.c b/TC1/user_udp.c
index a871807..93d1bf7 100644
--- a/TC1/user_udp.c
+++ b/TC1/user_udp.c
@@ -91,7 +91,7 @@ void UdpThread(void *arg)
             strcpy(ip_address, inet_ntoa(addr.sin_addr));
             if(len<1024) buf[len]=0;
             os_log("udp recv from %s:%d, len:%d ", ip_address,addr.sin_port, len);
-            UserFunctionCmdReceived(1,buf);
+            //UserFunctionCmdReceived(1,buf); //����?
             // sendto(udp_fd, buf, len, 0, (struct sockaddr *) &addr, sizeof(struct sockaddr_in));
         }
 
diff --git a/TC1/user_wifi.c b/TC1/user_wifi.c
index 5941cb6..608f8f5 100644
--- a/TC1/user_wifi.c
+++ b/TC1/user_wifi.c
@@ -24,7 +24,7 @@ static void WifiGetIpCallback(IPStatusTypedef *pnet, void * arg)
 
     os_log("got IP:%s", pnet->ip);
     wifi_status = WIFI_STATE_CONNECTED;
-    UserFunctionCmdReceived(1,"{\"cmd\":\"device report\"}");
+    //UserFunctionCmdReceived(1,"{\"cmd\":\"device report\"}");
 }
 
 //wifi连接状态改变回调