From 6fad6106d96ba3e1616c8b1787e759e548e546e5 Mon Sep 17 00:00:00 2001
From: zogodo <742782908@qq.com>
Date: Wed, 9 Oct 2019 22:44:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E4=BD=8F=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TC1/http_server/app_httpd.c | 2 +-
 TC1/user_wifi.c             | 7 ++++++-
 TC1/user_wifi.h             | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/TC1/http_server/app_httpd.c b/TC1/http_server/app_httpd.c
index 7fd2acb..e6f5462 100644
--- a/TC1/http_server/app_httpd.c
+++ b/TC1/http_server/app_httpd.c
@@ -64,7 +64,7 @@ static int HttpGetTc1Status(httpd_request_t *req)
 {
     const unsigned char* sockets = GetSocketStatus();
     char* tc1_status = malloc(256);
-    sprintf(tc1_status, TC1_STATUS_JSON, sockets, (int)sys_config->micoSystemConfig.reserved,
+    sprintf(tc1_status, TC1_STATUS_JSON, sockets, ip_status.mode,
         sys_config->micoSystemConfig.ssid, sys_config->micoSystemConfig.user_key,
         ELAND_AP_SSID, ELAND_AP_KEY, ip_status.ip, ip_status.mask, ip_status.gateway);
 
diff --git a/TC1/user_wifi.c b/TC1/user_wifi.c
index bd3ab23..5506904 100644
--- a/TC1/user_wifi.c
+++ b/TC1/user_wifi.c
@@ -11,7 +11,7 @@
 char wifi_status = WIFI_STATE_NOCONNECT;
 
 mico_timer_t wifi_led_timer;
-IpStatus ip_status = { ELAND_AP_LOCAL_IP, ELAND_AP_LOCAL_IP, ELAND_AP_NET_MASK };
+IpStatus ip_status = { 0, ELAND_AP_LOCAL_IP, ELAND_AP_LOCAL_IP, ELAND_AP_NET_MASK };
 
 //wifi已连接获取到IP地址回调
 static void WifiGetIpCallback(IPStatusTypedef *pnet, void * arg)
@@ -40,6 +40,7 @@ static void WifiStatusCallback(WiFiEvent status, void* arg)
             os_log("close ap error[%d]", status);
         }
 
+        ip_status.mode = 1;
         //wifi_status = WIFI_STATE_CONNECTED;
     }
     else if (status == NOTIFY_STATION_DOWN) //wifi断开
@@ -56,6 +57,10 @@ static void WifiStatusCallback(WiFiEvent status, void* arg)
             mico_rtos_start_timer(&wifi_led_timer);
         }
     }
+    else if (status == NOTIFY_AP_UP)
+    {
+        ip_status.mode = 0;
+    }
 }
 
 bool scaned = false;
diff --git a/TC1/user_wifi.h b/TC1/user_wifi.h
index c5fba3f..3092217 100644
--- a/TC1/user_wifi.h
+++ b/TC1/user_wifi.h
@@ -13,7 +13,7 @@ enum
    WIFI_STATE_CONNECTED,
 };
 
-#define ELAND_AP_SSID       "TC1-AP-MAC"
+#define ELAND_AP_SSID       "TC1-AP"
 #define ELAND_AP_KEY        "12345678"
 #define ELAND_AP_LOCAL_IP   "192.168.0.1"
 #define ELAND_AP_DNS_SERVER "192.168.0.1"
@@ -26,6 +26,7 @@ extern char* wifi_ret;
 extern char wifi_status;
 
 typedef struct {
+    int  mode;  //0:AP, 1:Station
     char ip[16];
     char gateway[16];
     char mask[16];