arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

less static stuff

Browse Source
This commit is contained in:
Markus Sattler 2015-12-28 19:46:20 +01:00
parent 64326f9573
commit cee4ef3078
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,7 +230,6 @@ int ESP8266WiFiClass::begin() {
wifi_station_connect(); wifi_station_connect();
ETS_UART_INTR_ENABLE(); ETS_UART_INTR_ENABLE();
// TODO is static ip not stored in SDK?
if(!_useStaticIp) { if(!_useStaticIp) {
wifi_station_dhcpc_start(); wifi_station_dhcpc_start();
} }
@ -600,10 +599,11 @@ int ESP8266WiFiClass::softAPdisconnect(bool wifioff) {
*conf.ssid = 0; *conf.ssid = 0;
*conf.password = 0; *conf.password = 0;
ETS_UART_INTR_DISABLE(); ETS_UART_INTR_DISABLE();
if(_persistent) if(_persistent) {
wifi_softap_set_config(&conf); wifi_softap_set_config(&conf);
else } else {
wifi_softap_set_config_current(&conf); wifi_softap_set_config_current(&conf);
}
ETS_UART_INTR_ENABLE(); ETS_UART_INTR_ENABLE();
if(wifioff) { if(wifioff) {
@ -1266,7 +1266,7 @@ void ESP8266WiFiClass::printDiag(Print& p) {
p.print("Auto connect: "); p.print("Auto connect: ");
p.println(wifi_station_get_auto_connect()); p.println(wifi_station_get_auto_connect());
static struct station_config conf; struct station_config conf;
wifi_station_get_config(&conf); wifi_station_get_config(&conf);
const char* ssid = reinterpret_cast<const char*>(conf.ssid); const char* ssid = reinterpret_cast<const char*>(conf.ssid);

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

@ -179,6 +179,7 @@ class ESP8266WiFiClass {
WiFiPhyMode_t getPhyMode(); WiFiPhyMode_t getPhyMode();
void persistent(bool persistent); void persistent(bool persistent);
bool mode(WiFiMode_t); bool mode(WiFiMode_t);
WiFiMode_t getMode(); WiFiMode_t getMode();

4
tools/sdk/include/user_interface.h
View File

@ -164,7 +164,7 @@ bool wifi_set_opmode_current(uint8 opmode);
uint8 wifi_get_broadcast_if(void); uint8 wifi_get_broadcast_if(void);
bool wifi_set_broadcast_if(uint8 interface); bool wifi_set_broadcast_if(uint8 interface);
struct bss_info { typedef struct bss_info {
STAILQ_ENTRY(bss_info) next; STAILQ_ENTRY(bss_info) next;
uint8 bssid[6]; uint8 bssid[6];
@ -177,7 +177,7 @@ struct bss_info {
sint16 freq_offset; sint16 freq_offset;
sint16 freqcal_val; sint16 freqcal_val;
uint8 *esp_mesh_ie; uint8 *esp_mesh_ie;
}; } bss_info_t;
typedef struct _scaninfo { typedef struct _scaninfo {
STAILQ_HEAD(, bss_info) *pbss; STAILQ_HEAD(, bss_info) *pbss;