From 604e05cbc3b4b889b35f8f25871605c64f7d85aa Mon Sep 17 00:00:00 2001
From: zogodo <742782908@qq.com>
Date: Sun, 12 Jan 2020 13:24:45 +0800
Subject: [PATCH] ap_name

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

diff --git a/TC1/http_server/app_httpd.c b/TC1/http_server/app_httpd.c
index a67d3f2..b763710 100644
--- a/TC1/http_server/app_httpd.c
+++ b/TC1/http_server/app_httpd.c
@@ -105,10 +105,10 @@ exit:
 static int HttpGetTc1Status(httpd_request_t *req)
 {
     const unsigned char* sockets = GetSocketStatus();
-    char* tc1_status = malloc(384);
+    char* tc1_status = malloc(391);
     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, "MQTT.ADDR", 1883, ip_status.ip, ip_status.mask, ip_status.gateway, 0L);
+        ap_name, ELAND_AP_KEY, "MQTT.ADDR", 1883, ip_status.ip, ip_status.mask, ip_status.gateway, 0L);
 
     OSStatus err = kNoErr;
     send_http(tc1_status, strlen(tc1_status), exit, &err);
diff --git a/TC1/user_wifi.c b/TC1/user_wifi.c
index be23163..ba2d997 100644
--- a/TC1/user_wifi.c
+++ b/TC1/user_wifi.c
@@ -13,6 +13,7 @@ char wifi_status = WIFI_STATE_NOCONNECT;
 
 mico_timer_t wifi_led_timer;
 IpStatus ip_status = { 0, ELAND_AP_LOCAL_IP, ELAND_AP_LOCAL_IP, ELAND_AP_NET_MASK };
+char ap_name[16];
 
 //wifi已连接获取到IP地址回调
 static void WifiGetIpCallback(IPStatusTypedef *pnet, void * arg)
@@ -168,7 +169,6 @@ void WifiInit(void)
 
 void ApInit()
 {
-    char ap_name[16];
     sprintf(ap_name, ELAND_AP_SSID, str_mac+6);
     os_log("ApInit ap_name[%s]", ap_name);
 
diff --git a/TC1/user_wifi.h b/TC1/user_wifi.h
index 2fabc7b..3a3dbc1 100644
--- a/TC1/user_wifi.h
+++ b/TC1/user_wifi.h
@@ -22,7 +22,7 @@ enum
 #define WIFI_SCAN_RESULT_JSON "{'success':%d,'ssids':[%s],'secs':[%s]}"
 extern bool scaned;
 extern char* wifi_ret;
-
+extern char ap_name[16];
 extern char wifi_status;
 
 typedef struct {