Merge branch 'idf-4.0-prep' of https://github.com/espressif/arduino-esp32 into idf-release/v4.0

Author: me-no-dev

libraries/WiFi/src/ETH.cpp

@@ -69,6 +69,7 @@ extern void tcpipInit();
 //}
 
 
+
 // Event handler for Ethernet
 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()
     :initialized(false)
     ,staticIP(false)
+    ,eth_handle(NULL)
     ,started(false)
     ,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();
 
-    esp_event_loop_create_default();
     tcpip_adapter_set_default_eth_handlers();
     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));

libraries/WiFi/src/WiFiGeneric.cpp

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

libraries/WiFi/src/WiFiSTA.cpp

@@ -693,6 +693,7 @@ bool WiFiSTAClass::beginSmartConfig() {
 
     esp_err_t err;
 #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();
     err = esp_smartconfig_start(&conf);
 #else
@@ -727,6 +728,45 @@ bool WiFiSTAClass::smartConfigDone() {
     return _smartConfigDone;
 }
 
+#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
+const char * sc_type_strings[] = {
+    "ESPTOUCH",
+    "AIRKISS",
+    "ESPTOUCH_AIRKISS"
+};
+#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",
@@ -735,16 +775,9 @@ const char * sc_status_strings[] = {
     "LINK",
     "LINK_OVER"
 };
-
-const char * sc_type_strings[] = {
-    "ESPTOUCH",
-    "AIRKISS",
-    "ESPTOUCH_AIRKISS"
-};
 #endif
 
 void WiFiSTAClass::_smartConfigCallback(uint32_t st, void* result) {
-#ifndef ESP_IDF_VERSION_MAJOR //todo
     smartconfig_status_t status = (smartconfig_status_t) st;
     log_d("Status: %s", sc_status_strings[st % 5]);
     if (status == SC_STATUS_GETTING_SSID_PSWD) {
@@ -768,5 +801,5 @@ void WiFiSTAClass::_smartConfigCallback(uint32_t st, void* result) {
         }
         WiFi.stopSmartConfig();
     }
-#endif
 }
+#endif

libraries/WiFi/src/WiFiSTA.h

@@ -26,6 +26,9 @@
 
 #include "WiFiType.h"
 #include "WiFiGeneric.h"
+#ifdef ESP_IDF_VERSION_MAJOR
+#include "esp_event.h"
+#endif
 
 
 class WiFiSTAClass
@@ -98,7 +101,11 @@ class WiFiSTAClass
 protected:
     static bool _smartConfigStarted;
     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);
+#endif
 
 };