diff --git a/TC1/http_server/app_httpd.c b/TC1/http_server/app_httpd.c index 3a9bd49..7fd2acb 100644 --- a/TC1/http_server/app_httpd.c +++ b/TC1/http_server/app_httpd.c @@ -63,12 +63,10 @@ exit: static int HttpGetTc1Status(httpd_request_t *req) { const unsigned char* sockets = GetSocketStatus(); - char* ap_name = "TC1-AP"; - char* ap_pwd = "12345678"; char* tc1_status = malloc(256); sprintf(tc1_status, TC1_STATUS_JSON, sockets, (int)sys_config->micoSystemConfig.reserved, sys_config->micoSystemConfig.ssid, sys_config->micoSystemConfig.user_key, - ap_name, ap_pwd, ip_status.ip, ip_status.mask, ip_status.gateway); + ELAND_AP_SSID, ELAND_AP_KEY, ip_status.ip, ip_status.mask, ip_status.gateway); 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 b54a4c6..bd3ab23 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 = { "0.0.0.0", "0.0.0.0", "0.0.0.0" }; +IpStatus ip_status = { ELAND_AP_LOCAL_IP, ELAND_AP_LOCAL_IP, ELAND_AP_NET_MASK }; //wifi已连接获取到IP地址回调 static void WifiGetIpCallback(IPStatusTypedef *pnet, void * arg) @@ -165,12 +165,6 @@ void WifiInit(void) } -#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" -#define ELAND_AP_NET_MASK "255.255.255.0" - void ApInit() { os_log("Soft_ap_Server"); diff --git a/TC1/user_wifi.h b/TC1/user_wifi.h index 9622426..c5fba3f 100644 --- a/TC1/user_wifi.h +++ b/TC1/user_wifi.h @@ -13,6 +13,12 @@ enum WIFI_STATE_CONNECTED, }; +#define ELAND_AP_SSID "TC1-AP-MAC" +#define ELAND_AP_KEY "12345678" +#define ELAND_AP_LOCAL_IP "192.168.0.1" +#define ELAND_AP_DNS_SERVER "192.168.0.1" +#define ELAND_AP_NET_MASK "255.255.255.0" + #define WIFI_SCAN_RESULT_JSON "{'success':%d,'ssids':[%s],'secs':[%s]}" extern bool scaned; extern char* wifi_ret;