arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

add API for connect / reconnect management

Browse Source
This commit is contained in:
Markus Sattler 2015-12-29 21:01:48 +01:00
parent d9a7a816d5
commit 4a68612af8
2 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
View File

@ -91,9 +91,10 @@ bool ESP8266WiFiSTAClass::_useStaticIp = false;
* @param passphrase const char * Optional. Passphrase. Valid characters in a passphrase must be between ASCII 32-126 (decimal). * @param passphrase const char * Optional. Passphrase. Valid characters in a passphrase must be between ASCII 32-126 (decimal).
* @param bssid uint8_t[6] Optional. BSSID / MAC of AP * @param bssid uint8_t[6] Optional. BSSID / MAC of AP
* @param channel Optional. Channel of AP * @param channel Optional. Channel of AP
* @param connect Optional. call connect
* @return * @return
*/ */
wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_t channel, const uint8_t* bssid) { wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_t channel, const uint8_t* bssid, bool connect) {
if(!WiFi.enableSTA(true)) { if(!WiFi.enableSTA(true)) {
// enable STA failed // enable STA failed
@ -134,12 +135,17 @@ wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase,
} }
ETS_UART_INTR_DISABLE(); ETS_UART_INTR_DISABLE();
if(WiFi._persistent) { if(WiFi._persistent) {
wifi_station_set_config(&conf); wifi_station_set_config(&conf);
} else { } else {
wifi_station_set_config_current(&conf); wifi_station_set_config_current(&conf);
} }
wifi_station_connect();
if(connect) {
wifi_station_connect();
}
ETS_UART_INTR_ENABLE(); ETS_UART_INTR_ENABLE();
if(channel > 0 && channel <= 13) { if(channel > 0 && channel <= 13) {
@ -153,8 +159,8 @@ wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase,
return status(); return status();
} }
wl_status_t ESP8266WiFiSTAClass::begin(char* ssid, char *passphrase, int32_t channel, const uint8_t* bssid) { wl_status_t ESP8266WiFiSTAClass::begin(char* ssid, char *passphrase, int32_t channel, const uint8_t* bssid, bool connect) {
return begin((const char*) ssid, (const char*) passphrase, channel, bssid); return begin((const char*) ssid, (const char*) passphrase, channel, bssid, connect);
} }
/** /**
@ -261,6 +267,38 @@ bool ESP8266WiFiSTAClass::disconnect(bool wifioff) {
return ret; return ret;
} }
/**
* Setting the ESP8266 station to connect to the AP (which is recorded)
* automatically or not when powered on. Enable auto-connect by default.
* @param autoConnect bool
* @return if saved
*/
bool ESP8266WiFiSTAClass::setAutoConnect(bool autoConnect) {
bool ret;
ETS_UART_INTR_DISABLE();
ret = wifi_station_set_auto_connect(autoConnect);
ETS_UART_INTR_ENABLE();
return ret;
}
/**
* Checks if ESP8266 station mode will connect to AP
* automatically or not when it is powered on.
* @return auto connect
*/
bool ESP8266WiFiSTAClass::getAutoConnect() {
return (wifi_station_get_auto_connect() != 0);
}
/**
* Set whether reconnect or not when the ESP8266 station is disconnected from AP.
* @param autoReconnect
* @return
*/
bool ESP8266WiFiSTAClass::setAutoReconnect(bool autoReconnect) {
return wifi_station_set_reconnect_policy(autoReconnect);
}
/** /**
* Wait for WiFi connection to reach a result * Wait for WiFi connection to reach a result
* returns the status reached or disconnect if STA is off * returns the status reached or disconnect if STA is off

9
libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h
View File

@ -35,8 +35,8 @@ class ESP8266WiFiSTAClass {
public: public:
wl_status_t begin(const char* ssid, const char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL); wl_status_t begin(const char* ssid, const char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL, bool connect = true);
wl_status_t begin(char* ssid, char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL); wl_status_t begin(char* ssid, char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL, bool connect = true);
wl_status_t begin(); wl_status_t begin();
bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = (uint32_t)0x00000000, IPAddress dns2 = (uint32_t)0x00000000); bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = (uint32_t)0x00000000, IPAddress dns2 = (uint32_t)0x00000000);
@ -44,6 +44,11 @@ class ESP8266WiFiSTAClass {
bool reconnect(); bool reconnect();
bool disconnect(bool wifioff = false); bool disconnect(bool wifioff = false);
bool setAutoConnect(bool autoConnect);
bool getAutoConnect();
bool setAutoReconnect(bool autoReconnect);
uint8_t waitForConnectResult(); uint8_t waitForConnectResult();
// STA network info // STA network info