Skip to content

Commit d108a6e

Browse files
committed
Update to SDK 1.3.0
1 parent c7d4e49 commit d108a6e

28 files changed

+198
-118
lines changed

hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ bool ESP8266WiFiClass::hostname(String aHostname) {
666666

667667
//--------------------------------------------------------------
668668

669-
void wifi_wps_status_cb(WPS_CB_STATUS_t status)
669+
void wifi_wps_status_cb(wps_cb_status status)
670670
{
671671
DEBUGV("wps cb status: %d\r\n", status);
672672
switch (status) {
@@ -682,6 +682,9 @@ void wifi_wps_status_cb(WPS_CB_STATUS_t status)
682682
case WPS_CB_ST_TIMEOUT:
683683
DEBUGV("wps TIMEOUT\n");
684684
break;
685+
case WPS_CB_ST_WEP:
686+
DEBUGV("wps WEP\n");
687+
break;
685688
}
686689
// todo user function to get status
687690

@@ -715,7 +718,7 @@ bool ESP8266WiFiClass::beginWPSConfig(void) {
715718
return false;
716719
}
717720

718-
if(!wifi_set_wps_cb(&wifi_wps_status_cb)) {
721+
if(!wifi_set_wps_cb((wps_st_cb_t) &wifi_wps_status_cb)) {
719722
DEBUGV("wps cb faild\n");
720723
return false;
721724
}

hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ESP8266WiFiClass
4444
ESP8266WiFiClass();
4545

4646
void mode(WiFiMode);
47-
47+
4848
/**
4949
* Start Wifi connection
5050
* if passphrase is set the most secure supported mode will be automatically selected
@@ -95,7 +95,7 @@ class ESP8266WiFiClass
9595
* param dns: Defined DNS
9696
*/
9797
void config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns);
98-
98+
9999
/* Configure access point
100100
*
101101
* param local_ip: access point IP
@@ -336,19 +336,19 @@ class ESP8266WiFiClass
336336
/*
337337
* Start SmartConfig
338338
*
339-
*/
339+
*/
340340
void beginSmartConfig();
341-
341+
342342
/*
343343
* Query SmartConfig status, to decide when stop config
344344
*
345-
*/
345+
*/
346346
bool smartConfigDone();
347347

348348
/*
349349
* Stop SmartConfig
350350
*
351-
*/
351+
*/
352352
void stopSmartConfig();
353353

354354
friend class WiFiClient;
@@ -366,7 +366,7 @@ class ESP8266WiFiClass
366366
bool _useApMode;
367367
bool _useClientMode;
368368
bool _useStaticIp;
369-
369+
370370
static bool _scanAsync;
371371
static bool _scanStarted;
372372
static bool _scanComplete;

0 commit comments

Comments
 (0)