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

ap_name

Browse Source
This commit is contained in:
zogodo
2020-01-12 13:24:45 +08:00
parent 72b672344b
commit 604e05cbc3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TC1/http_server/app_httpd.c
View File

@@ -105,10 +105,10 @@ exit:
static int HttpGetTc1Status(httpd_request_t *req) static int HttpGetTc1Status(httpd_request_t *req)
{ {
const unsigned char* sockets = GetSocketStatus(); 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, sprintf(tc1_status, TC1_STATUS_JSON, sockets, ip_status.mode,
sys_config->micoSystemConfig.ssid, sys_config->micoSystemConfig.user_key, 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; OSStatus err = kNoErr;
send_http(tc1_status, strlen(tc1_status), exit, &err); send_http(tc1_status, strlen(tc1_status), exit, &err);

2
TC1/user_wifi.c
View File

@@ -13,6 +13,7 @@ char wifi_status = WIFI_STATE_NOCONNECT;
mico_timer_t wifi_led_timer; mico_timer_t wifi_led_timer;
IpStatus ip_status = { 0, 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 };
char ap_name[16];
//wifi已连接获取到IP地址回调 //wifi已连接获取到IP地址回调
static void WifiGetIpCallback(IPStatusTypedef *pnet, void * arg) static void WifiGetIpCallback(IPStatusTypedef *pnet, void * arg)
@@ -168,7 +169,6 @@ void WifiInit(void)
void ApInit() void ApInit()
{ {
char ap_name[16];
sprintf(ap_name, ELAND_AP_SSID, str_mac+6); sprintf(ap_name, ELAND_AP_SSID, str_mac+6);
os_log("ApInit ap_name[%s]", ap_name); os_log("ApInit ap_name[%s]", ap_name);

2
TC1/user_wifi.h
View File

@@ -22,7 +22,7 @@ enum
#define WIFI_SCAN_RESULT_JSON "{'success':%d,'ssids':[%s],'secs':[%s]}" #define WIFI_SCAN_RESULT_JSON "{'success':%d,'ssids':[%s],'secs':[%s]}"
extern bool scaned; extern bool scaned;
extern char* wifi_ret; extern char* wifi_ret;
extern char ap_name[16];
extern char wifi_status; extern char wifi_status;
typedef struct { typedef struct {