Skip to content

Commit 6dfbdbc

Browse files
committed
fix WiFi.config not being applied
fixes: espressif#143
1 parent 3c7d0e9 commit 6dfbdbc

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

libraries/WiFi/src/WiFiSTA.cpp

+10-7
Original file line numberDiff line numberDiff line change
@@ -135,20 +135,20 @@ wl_status_t WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_
135135
esp_wifi_set_config(WIFI_IF_STA, &conf);
136136
}
137137

138-
139-
140138
if(channel > 0 && channel <= 13) {
141139
esp_wifi_set_channel(channel, WIFI_SECOND_CHAN_NONE);
142140
}
143141

144-
if(!_useStaticIp) {
145-
tcpip_adapter_dhcpc_start(TCPIP_ADAPTER_IF_STA);
146-
}
147-
148142
if(connect) {
149143
esp_wifi_connect();
150144
}
151145

146+
if(!_useStaticIp) {
147+
tcpip_adapter_dhcpc_start(TCPIP_ADAPTER_IF_STA);
148+
} else {
149+
tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_STA);
150+
}
151+
152152
return status();
153153
}
154154

@@ -173,7 +173,10 @@ wl_status_t WiFiSTAClass::begin()
173173

174174
if(!_useStaticIp) {
175175
tcpip_adapter_dhcpc_start(TCPIP_ADAPTER_IF_STA);
176+
} else {
177+
tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_STA);
176178
}
179+
177180
return status();
178181
}
179182

@@ -204,7 +207,7 @@ bool WiFiSTAClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subne
204207
info.netmask.addr = static_cast<uint32_t>(subnet);
205208

206209
tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_STA);
207-
if(tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_STA, &info)) {
210+
if(tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_STA, &info) == ESP_OK) {
208211
_useStaticIp = true;
209212
} else {
210213
return false;

0 commit comments

Comments
 (0)