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

station连接成功关ap

Browse Source
This commit is contained in:
zogodo
2019-09-25 21:53:38 +08:00
parent cc64a3aa17
commit 61734eddf6
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
TC1/main.c
View File

@@ -146,8 +146,10 @@ int application_start(void)
// } // }
// } // }
//sys_config = mico_system_context_init(sizeof(user_config_t)); //获取Flash中的配置 if (user_config->last_wifi_status != NOTIFY_STATION_UP)
ap_init(); {
ap_init();
}
wifi_init(); wifi_init();
user_udp_init(); user_udp_init();
key_init(); key_init();

5
TC1/main.h
View File

@@ -60,14 +60,15 @@ typedef struct
char version; char version;
user_plug_config_t plug[PLUG_NUM]; user_plug_config_t plug[PLUG_NUM];
char user[maxNameLen]; char user[maxNameLen];
WiFiEvent last_wifi_status;
} user_config_t; } user_config_t;
extern char rtc_init; extern char rtc_init;
extern uint32_t total_time; extern uint32_t total_time;
extern char strMac[16]; extern char strMac[16];
extern uint32_t power; extern uint32_t power;
extern system_config_t * sys_config; extern system_config_t* sys_config;
extern user_config_t * user_config; extern user_config_t* user_config;
extern char socket_status[32]; extern char socket_status[32];
extern mico_gpio_t Relay[Relay_NUM]; extern mico_gpio_t Relay[Relay_NUM];

14
TC1/user_wifi.c
View File

@@ -69,18 +69,28 @@ static void wifi_get_ip_callback(IPStatusTypedef *pnet, void * arg)
wifi_status = WIFI_STATE_CONNECTED; wifi_status = WIFI_STATE_CONNECTED;
user_function_cmd_received(1,"{\"cmd\":\"device report\"}"); user_function_cmd_received(1,"{\"cmd\":\"device report\"}");
} }
//wifi连接状态改变回调 //wifi连接状态改变回调
static void wifi_status_callback(WiFiEvent status, void *arg) static void wifi_status_callback(WiFiEvent status, void* arg)
{ {
if (status == NOTIFY_STATION_UP) //wifi连接成功 if (status == NOTIFY_STATION_UP) //wifi连接成功
{ {
user_config->last_wifi_status = status;
//wifi_status = WIFI_STATE_CONNECTED; //wifi_status = WIFI_STATE_CONNECTED;
} else if (status == NOTIFY_STATION_DOWN) //wifi断开 //关闭AP
OSStatus status = micoWlanSuspendSoftAP();
if (status != kNoErr)
{
os_log("close ap error[%d]", status);
}
}
else if (status == NOTIFY_STATION_DOWN) //wifi断开
{ {
wifi_status = WIFI_STATE_NOCONNECT; wifi_status = WIFI_STATE_NOCONNECT;
if (!mico_rtos_is_timer_running(&wifi_led_timer)) mico_rtos_start_timer(&wifi_led_timer); if (!mico_rtos_is_timer_running(&wifi_led_timer)) mico_rtos_start_timer(&wifi_led_timer);
} }
} }
//100ms定时器回调 //100ms定时器回调
static void wifi_led_timer_callback(void* arg) static void wifi_led_timer_callback(void* arg)
{ {

6
TC1/user_wifi.h
View File

@@ -1,12 +1,9 @@
#ifndef __USER_WIFI_H_ #ifndef __USER_WIFI_H_
#define __USER_WIFI_H_ #define __USER_WIFI_H_
#include "mico.h" #include "mico.h"
#include "micokit_ext.h" #include "micokit_ext.h"
enum { enum {
WIFI_STATE_FAIL, WIFI_STATE_FAIL,
WIFI_STATE_NOCONNECT, WIFI_STATE_NOCONNECT,
@@ -17,13 +14,10 @@ enum {
WIFI_STATE_EASYLINKING, WIFI_STATE_EASYLINKING,
}; };
extern char wifi_status; extern char wifi_status;
extern void wifi_init(void); extern void wifi_init(void);
extern void ap_init(void); extern void ap_init(void);
extern void wifi_start_easylink(void); extern void wifi_start_easylink(void);
extern void wifi_connect(char* wifi_ssid, char* wifi_key); extern void wifi_connect(char* wifi_ssid, char* wifi_key);
#endif #endif