arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Update to SDK 1.3.0

Browse Source
This commit is contained in:
Ivan Grokhotkov
2015-08-10 10:51:09 +03:00
parent cd69be7f8f
commit 7bfd425754
28 changed files with 195 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -666,7 +666,7 @@ bool ESP8266WiFiClass::hostname(String aHostname) {
//--------------------------------------------------------------
void wifi_wps_status_cb(WPS_CB_STATUS_t status)
void wifi_wps_status_cb(wps_cb_status status)
{
DEBUGV("wps cb status: %d\r\n", status);
switch (status) {
@ -682,6 +682,9 @@ void wifi_wps_status_cb(WPS_CB_STATUS_t status)
case WPS_CB_ST_TIMEOUT:
DEBUGV("wps TIMEOUT\n");
break;
case WPS_CB_ST_WEP:
DEBUGV("wps WEP\n");
break;
}
// todo user function to get status
@ -715,7 +718,7 @@ bool ESP8266WiFiClass::beginWPSConfig(void) {
return false;
}
if(!wifi_set_wps_cb(&wifi_wps_status_cb)) {
if(!wifi_set_wps_cb((wps_st_cb_t) &wifi_wps_status_cb)) {
DEBUGV("wps cb faild\n");
return false;
}

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

@ -44,7 +44,7 @@ public:
ESP8266WiFiClass();
void mode(WiFiMode);
/**
* Start Wifi connection
* if passphrase is set the most secure supported mode will be automatically selected
@ -95,7 +95,7 @@ public:
* param dns: Defined DNS
*/
void config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns);
/* Configure access point
*
* param local_ip: access point IP
@ -336,19 +336,19 @@ public:
/*
* Start SmartConfig
*
*/
*/
void beginSmartConfig();
/*
* Query SmartConfig status, to decide when stop config
*
*/
*/
bool smartConfigDone();
/*
* Stop SmartConfig
*
*/
*/
void stopSmartConfig();
friend class WiFiClient;
@ -366,7 +366,7 @@ protected:
bool _useApMode;
bool _useClientMode;
bool _useStaticIp;
static bool _scanAsync;
static bool _scanStarted;
static bool _scanComplete;