From cee4ef307856858eb624a2dcd9f236ef3ca9ab50 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Mon, 28 Dec 2015 19:46:20 +0100
Subject: [PATCH] less static stuff

---
 libraries/ESP8266WiFi/src/ESP8266WiFi.cpp | 8 ++++----
 libraries/ESP8266WiFi/src/ESP8266WiFi.h   | 1 +
 tools/sdk/include/user_interface.h        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
index b8742d9be..ee38217ef 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
@@ -230,7 +230,6 @@ int ESP8266WiFiClass::begin() {
     wifi_station_connect();
     ETS_UART_INTR_ENABLE();
 
-    // TODO is static ip not stored in SDK?
     if(!_useStaticIp) {
         wifi_station_dhcpc_start();
     }
@@ -600,10 +599,11 @@ int ESP8266WiFiClass::softAPdisconnect(bool wifioff) {
     *conf.ssid = 0;
     *conf.password = 0;
     ETS_UART_INTR_DISABLE();
-    if(_persistent)
+    if(_persistent) {
         wifi_softap_set_config(&conf);
-    else
+    } else {
         wifi_softap_set_config_current(&conf);
+    }
     ETS_UART_INTR_ENABLE();
 
     if(wifioff) {
@@ -1266,7 +1266,7 @@ void ESP8266WiFiClass::printDiag(Print& p) {
     p.print("Auto connect: ");
     p.println(wifi_station_get_auto_connect());
 
-    static struct station_config conf;
+    struct station_config conf;
     wifi_station_get_config(&conf);
 
     const char* ssid = reinterpret_cast<const char*>(conf.ssid);
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.h b/libraries/ESP8266WiFi/src/ESP8266WiFi.h
index 3bd23b016..ebdfe4b65 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFi.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.h
@@ -179,6 +179,7 @@ class ESP8266WiFiClass {
         WiFiPhyMode_t getPhyMode();
 
         void persistent(bool persistent);
+
         bool mode(WiFiMode_t);
         WiFiMode_t getMode();
 
diff --git a/tools/sdk/include/user_interface.h b/tools/sdk/include/user_interface.h
index c29443e54..5ecf3a868 100644
--- a/tools/sdk/include/user_interface.h
+++ b/tools/sdk/include/user_interface.h
@@ -164,7 +164,7 @@ bool wifi_set_opmode_current(uint8 opmode);
 uint8 wifi_get_broadcast_if(void);
 bool wifi_set_broadcast_if(uint8 interface);
 
-struct bss_info {
+typedef struct bss_info {
     STAILQ_ENTRY(bss_info)     next;
 
     uint8 bssid[6];
@@ -177,7 +177,7 @@ struct bss_info {
     sint16 freq_offset;
     sint16 freqcal_val;
 	uint8 *esp_mesh_ie;
-};
+} bss_info_t;
 
 typedef struct _scaninfo {
     STAILQ_HEAD(, bss_info) *pbss;