Skip to content

Commit cee4ef3

Browse files
committed
less static stuff
1 parent 64326f9 commit cee4ef3

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

libraries/ESP8266WiFi/src/ESP8266WiFi.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ int ESP8266WiFiClass::begin() {
230230
wifi_station_connect();
231231
ETS_UART_INTR_ENABLE();
232232

233-
// TODO is static ip not stored in SDK?
234233
if(!_useStaticIp) {
235234
wifi_station_dhcpc_start();
236235
}
@@ -600,10 +599,11 @@ int ESP8266WiFiClass::softAPdisconnect(bool wifioff) {
600599
*conf.ssid = 0;
601600
*conf.password = 0;
602601
ETS_UART_INTR_DISABLE();
603-
if(_persistent)
602+
if(_persistent) {
604603
wifi_softap_set_config(&conf);
605-
else
604+
} else {
606605
wifi_softap_set_config_current(&conf);
606+
}
607607
ETS_UART_INTR_ENABLE();
608608

609609
if(wifioff) {
@@ -1266,7 +1266,7 @@ void ESP8266WiFiClass::printDiag(Print& p) {
12661266
p.print("Auto connect: ");
12671267
p.println(wifi_station_get_auto_connect());
12681268

1269-
static struct station_config conf;
1269+
struct station_config conf;
12701270
wifi_station_get_config(&conf);
12711271

12721272
const char* ssid = reinterpret_cast<const char*>(conf.ssid);

libraries/ESP8266WiFi/src/ESP8266WiFi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ class ESP8266WiFiClass {
179179
WiFiPhyMode_t getPhyMode();
180180

181181
void persistent(bool persistent);
182+
182183
bool mode(WiFiMode_t);
183184
WiFiMode_t getMode();
184185

tools/sdk/include/user_interface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ bool wifi_set_opmode_current(uint8 opmode);
164164
uint8 wifi_get_broadcast_if(void);
165165
bool wifi_set_broadcast_if(uint8 interface);
166166

167-
struct bss_info {
167+
typedef struct bss_info {
168168
STAILQ_ENTRY(bss_info) next;
169169

170170
uint8 bssid[6];
@@ -177,7 +177,7 @@ struct bss_info {
177177
sint16 freq_offset;
178178
sint16 freqcal_val;
179179
uint8 *esp_mesh_ie;
180-
};
180+
} bss_info_t;
181181

182182
typedef struct _scaninfo {
183183
STAILQ_HEAD(, bss_info) *pbss;

0 commit comments

Comments
 (0)