Merge pull request #3 from espressif/master

chasing

Author: stickbreaker

Diff for: cores/esp32/esp32-hal-gpio.c

@@ -24,7 +24,7 @@
 #include "soc/gpio_struct.h"
 #include "soc/rtc_io_reg.h"
 
-const int8_t esp32_adc2gpio[20] = {36, -1, -1, 39, 32, 33, 34, 35, -1, -1, 4, 0, 2, 15, 13, 12, 14, 27, 25, 26};
+const int8_t esp32_adc2gpio[20] = {36, 37, 38, 39, 32, 33, 34, 35, -1, -1, 4, 0, 2, 15, 13, 12, 14, 27, 25, 26};
 
 const DRAM_ATTR esp32_gpioMux_t esp32_gpioMux[GPIO_PIN_COUNT]={
     {0x44, 11, 11, 1},
@@ -64,8 +64,8 @@ const DRAM_ATTR esp32_gpioMux_t esp32_gpioMux[GPIO_PIN_COUNT]={
     {0x14, 4, 6, -1},
     {0x18, 5, 7, -1},
     {0x04, 0, 0, -1},
-    {0x08, 1, -1, -1},
-    {0x0c, 2, -1, -1},
+    {0x08, 1, 1, -1},
+    {0x0c, 2, 2, -1},
     {0x10, 3, 3, -1}
 };
 

Diff for: libraries/HTTPClient/src/HTTPClient.cpp

@@ -994,7 +994,7 @@ int HTTPClient::handleHeaderResponse()
             if((millis() - lastDataTime) > _tcpTimeout) {
                 return HTTPC_ERROR_READ_TIMEOUT;
             }
-            delay(0);
+            delay(10);
         }
     }
 

Diff for: libraries/WiFi/src/WiFiSTA.cpp

@@ -625,6 +625,7 @@ void WiFiSTAClass::_smartConfigCallback(uint32_t st, void* result) {
     } else if (status == SC_STATUS_LINK) {
         wifi_sta_config_t *sta_conf = reinterpret_cast<wifi_sta_config_t *>(result);
         log_d("SSID: %s", (char *)(sta_conf->ssid));
+        sta_conf->bssid_set = 0;
         esp_wifi_set_config(WIFI_IF_STA, (wifi_config_t *)sta_conf);
         esp_wifi_connect();
         _smartConfigDone = true;