feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

get smart config to work as well

Browse Source
This commit is contained in:
me-no-dev
2020-01-27 17:34:30 +02:00
parent 92db9730e0
commit f14a85311f
4 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/WiFi/src/ETH.cpp
View File

@ -69,6 +69,7 @@ extern void tcpipInit();
//} //}
// Event handler for Ethernet // Event handler for Ethernet
void ETHClass::eth_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) void ETHClass::eth_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data)
{ {
@ -118,6 +119,7 @@ static void _eth_phy_power_enable(bool enable)
ETHClass::ETHClass() ETHClass::ETHClass()
:initialized(false) :initialized(false)
,staticIP(false) ,staticIP(false)
,eth_handle(NULL)
,started(false) ,started(false)
,eth_link(ETH_LINK_DOWN) ,eth_link(ETH_LINK_DOWN)
{ {
@ -131,7 +133,6 @@ bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_typ
tcpipInit(); tcpipInit();
esp_event_loop_create_default();
tcpip_adapter_set_default_eth_handlers(); tcpip_adapter_set_default_eth_handlers();
esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, eth_event_handler, this); esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, eth_event_handler, this);
//ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_ETH_GOT_IP, &got_ip_event_handler, NULL)); //ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_ETH_GOT_IP, &got_ip_event_handler, NULL));

1
libraries/WiFi/src/WiFiGeneric.cpp
View File

@ -128,6 +128,7 @@ void tcpipInit(){
if(esp_efuse_mac_get_default(mac) == ESP_OK){ if(esp_efuse_mac_get_default(mac) == ESP_OK){
esp_base_mac_addr_set(mac); esp_base_mac_addr_set(mac);
} }
esp_event_loop_create_default();
#endif #endif
tcpip_adapter_init(); tcpip_adapter_init();
} }

53
libraries/WiFi/src/WiFiSTA.cpp
View File

@ -688,6 +688,7 @@ bool WiFiSTAClass::beginSmartConfig() {
esp_err_t err; esp_err_t err;
#ifdef ESP_IDF_VERSION_MAJOR #ifdef ESP_IDF_VERSION_MAJOR
esp_event_handler_register(SC_EVENT, ESP_EVENT_ANY_ID, _smartConfigCallback, this);
smartconfig_start_config_t conf = SMARTCONFIG_START_CONFIG_DEFAULT(); smartconfig_start_config_t conf = SMARTCONFIG_START_CONFIG_DEFAULT();
err = esp_smartconfig_start(&conf); err = esp_smartconfig_start(&conf);
#else #else
@ -723,14 +724,6 @@ bool WiFiSTAClass::smartConfigDone() {
} }
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
const char * sc_status_strings[] = {
"WAIT",
"FIND_CHANNEL",
"GETTING_SSID_PSWD",
"LINK",
"LINK_OVER"
};
const char * sc_type_strings[] = { const char * sc_type_strings[] = {
"ESPTOUCH", "ESPTOUCH",
"AIRKISS", "AIRKISS",
@ -738,8 +731,48 @@ const char * sc_type_strings[] = {
}; };
#endif #endif
#ifdef ESP_IDF_VERSION_MAJOR //todo
void WiFiSTAClass::_smartConfigCallback(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data){
smartconfig_event_t event = (smartconfig_event_t)event_id;
switch(event){
case SC_EVENT_SCAN_DONE:
log_d("smartconfig has finished to scan for APs");
break;
case SC_EVENT_FOUND_CHANNEL:
log_d("smartconfig has found the channel of the target AP");
break;
case SC_EVENT_GOT_SSID_PSWD:
{
log_d("smartconfig got the SSID and password");
smartconfig_event_got_ssid_pswd_t * data = (smartconfig_event_got_ssid_pswd_t*)event_data;
log_d("Type: %s", sc_type_strings[data->type]);
log_d("SSID: %s", (const char *)data->ssid);
log_d("Password: %s", (const char *)data->password);
log_d("Sender IP: " IPSTR, data->cellphone_ip[3], data->cellphone_ip[2], data->cellphone_ip[1], data->cellphone_ip[0]);
WiFi.begin((const char *)data->ssid, (const char *)data->password);
}
break;
case SC_EVENT_SEND_ACK_DONE:
log_d("smartconfig has sent ACK to the sender");
WiFi.stopSmartConfig();
break;
default: break;
}
}
#else
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
const char * sc_status_strings[] = {
"WAIT",
"FIND_CHANNEL",
"GETTING_SSID_PSWD",
"LINK",
"LINK_OVER"
};
#endif
void WiFiSTAClass::_smartConfigCallback(uint32_t st, void* result) { void WiFiSTAClass::_smartConfigCallback(uint32_t st, void* result) {
#ifndef ESP_IDF_VERSION_MAJOR //todo
smartconfig_status_t status = (smartconfig_status_t) st; smartconfig_status_t status = (smartconfig_status_t) st;
log_d("Status: %s", sc_status_strings[st % 5]); log_d("Status: %s", sc_status_strings[st % 5]);
if (status == SC_STATUS_GETTING_SSID_PSWD) { if (status == SC_STATUS_GETTING_SSID_PSWD) {
@ -763,5 +796,5 @@ void WiFiSTAClass::_smartConfigCallback(uint32_t st, void* result) {
} }
WiFi.stopSmartConfig(); WiFi.stopSmartConfig();
} }
#endif
} }
#endif

7
libraries/WiFi/src/WiFiSTA.h
View File

@ -26,6 +26,9 @@
#include "WiFiType.h" #include "WiFiType.h"
#include "WiFiGeneric.h" #include "WiFiGeneric.h"
#ifdef ESP_IDF_VERSION_MAJOR
#include "esp_event.h"
#endif
class WiFiSTAClass class WiFiSTAClass
@ -98,7 +101,11 @@ public:
protected: protected:
static bool _smartConfigStarted; static bool _smartConfigStarted;
static bool _smartConfigDone; static bool _smartConfigDone;
#ifdef ESP_IDF_VERSION_MAJOR //todo
static void _smartConfigCallback(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data);
#else
static void _smartConfigCallback(uint32_t status, void* result); static void _smartConfigCallback(uint32_t status, void* result);
#endif
}; };