arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

add softAPdisconnect function ``int softAPdisconnect(bool wifioff = false);``

Browse Source 
external mode calls now change the use flags
see #529
This commit is contained in:
Markus Sattler
2015-07-13 10:50:41 +02:00
parent b54a98ba03
commit fe9ef36861
2 changed files with 69 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
View File

@ -55,6 +55,30 @@ void ESP8266WiFiClass::mode(WiFiMode m)
if(wifi_get_opmode() == (uint8)m) { if(wifi_get_opmode() == (uint8)m) {
return; return;
} }
if((m & WIFI_AP)) {
_useApMode = true;
} else {
_useApMode = false;
}
if((m & WIFI_STA)) {
_useClientMode = true;
} else {
_useClientMode = false;
}
ETS_UART_INTR_DISABLE();
wifi_set_opmode(m);
ETS_UART_INTR_ENABLE();
}
void ESP8266WiFiClass::_mode(WiFiMode m)
{
if(wifi_get_opmode() == (uint8)m) {
return;
}
ETS_UART_INTR_DISABLE(); ETS_UART_INTR_DISABLE();
wifi_set_opmode(m); wifi_set_opmode(m);
ETS_UART_INTR_ENABLE(); ETS_UART_INTR_ENABLE();
@ -69,10 +93,10 @@ int ESP8266WiFiClass::begin(const char* ssid, const char *passphrase, int32_t ch
if(_useApMode) { if(_useApMode) {
// turn on AP+STA mode // turn on AP+STA mode
mode(WIFI_AP_STA); _mode(WIFI_AP_STA);
} else { } else {
// turn on STA mode // turn on STA mode
mode(WIFI_STA); _mode(WIFI_STA);
} }
if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) { if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) {
@ -156,6 +180,31 @@ void ESP8266WiFiClass::config(IPAddress local_ip, IPAddress gateway, IPAddress s
_useStaticIp = true; _useStaticIp = true;
} }
int ESP8266WiFiClass::softAPdisconnect(bool wifioff)
{
struct softap_config conf;
*conf.ssid = 0;
*conf.password = 0;
ETS_UART_INTR_DISABLE();
wifi_softap_set_config(&conf);
wifi_station_disconnect();
ETS_UART_INTR_ENABLE();
if(wifioff) {
_useApMode = false;
if( _useClientMode) {
// turn on AP
_mode(WIFI_STA);
} else {
// turn wifi off
_mode(WIFI_OFF);
}
}
return 0;
}
int ESP8266WiFiClass::disconnect(bool wifioff) int ESP8266WiFiClass::disconnect(bool wifioff)
{ {
struct station_config conf; struct station_config conf;
@ -171,10 +220,10 @@ int ESP8266WiFiClass::disconnect(bool wifioff)
if(_useApMode) { if(_useApMode) {
// turn on AP // turn on AP
mode(WIFI_AP); _mode(WIFI_AP);
} else { } else {
// turn wifi off // turn wifi off
mode(WIFI_OFF); _mode(WIFI_OFF);
} }
} }
@ -192,10 +241,10 @@ void ESP8266WiFiClass::softAP(const char* ssid, const char* passphrase, int chan
_useApMode = true; _useApMode = true;
if(_useClientMode) { if(_useClientMode) {
// turn on AP+STA mode // turn on AP+STA mode
mode(WIFI_AP_STA); _mode(WIFI_AP_STA);
} else { } else {
// turn on STA mode // turn on STA mode
mode(WIFI_AP); _mode(WIFI_AP);
} }
if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) { if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) {
@ -417,10 +466,10 @@ int8_t ESP8266WiFiClass::scanNetworks(bool async)
if(_useApMode) { if(_useApMode) {
// turn on AP+STA mode // turn on AP+STA mode
mode(WIFI_AP_STA); _mode(WIFI_AP_STA);
} else { } else {
// turn on STA mode // turn on STA mode
mode(WIFI_STA); _mode(WIFI_STA);
} }
int status = wifi_station_get_connect_status(); int status = wifi_station_get_connect_status();
@ -645,10 +694,10 @@ bool ESP8266WiFiClass::beginWPSConfig(void) {
if(_useApMode) { if(_useApMode) {
// turn on AP+STA mode // turn on AP+STA mode
mode(WIFI_AP_STA); _mode(WIFI_AP_STA);
} else { } else {
// turn on STA mode // turn on STA mode
mode(WIFI_STA); _mode(WIFI_STA);
} }
disconnect(); disconnect();
@ -693,10 +742,10 @@ void ESP8266WiFiClass::beginSmartConfig()
if(_useApMode) { if(_useApMode) {
// turn on AP+STA mode // turn on AP+STA mode
mode(WIFI_AP_STA); _mode(WIFI_AP_STA);
} else { } else {
// turn on STA mode // turn on STA mode
mode(WIFI_STA); _mode(WIFI_STA);
} }
_smartConfigStarted = true; _smartConfigStarted = true;

8
libraries/ESP8266WiFi/src/ESP8266WiFi.h
View File

@ -104,6 +104,13 @@ public:
*/ */
void softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet); void softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet);
/*
* Disconnect from the network (close AP)
*
* return: one value of wl_status_t enum
*/
int softAPdisconnect(bool wifioff = false);
/* /*
* Disconnect from the network * Disconnect from the network
* *
@ -348,6 +355,7 @@ public:
friend class WiFiServer; friend class WiFiServer;
protected: protected:
void _mode(WiFiMode);
static void _scanDone(void* result, int status); static void _scanDone(void* result, int status);
void * _getScanInfoByIndex(int i); void * _getScanInfoByIndex(int i);
static void _smartConfigCallback(uint32_t status, void* result); static void _smartConfigCallback(uint32_t status, void* result);