Merge commit 'b879f800176d9de247babd55b47e594742c42a27' into develop

Author: wamisnet

Kconfig

@@ -3,7 +3,6 @@ menu "Arduino Configuration"
 config ENABLE_ARDUINO_DEPENDS
     bool
     select LWIP_SO_RCVBUF
-    select BT_ENABLED
     select ETHERNET
     select WIFI_ENABLED
     select ESP32_PHY_CALIBRATION_AND_DATA_STORAGE

cores/esp32/Esp.cpp

@@ -212,3 +212,11 @@ bool EspClass::flashRead(uint32_t offset, uint32_t *data, size_t size)
 {
     return spi_flash_read(offset, (uint32_t*) data, size) == ESP_OK;
 }
+
+
+uint64_t EspClass::getEfuseMac(void)
+{
+    uint64_t _chipmacid;
+    esp_efuse_read_mac((uint8_t*) (&_chipmacid));
+    return _chipmacid;
+}

cores/esp32/Esp.h

@@ -76,6 +76,8 @@ class EspClass
     bool flashWrite(uint32_t offset, uint32_t *data, size_t size);
     bool flashRead(uint32_t offset, uint32_t *data, size_t size);
 
+    uint64_t getEfuseMac();
+
 };
 
 extern EspClass ESP;

cores/esp32/esp32-hal-bt.c

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#if CONFIG_BT_ENABLED
 
 #include "esp32-hal-bt.h"
 
@@ -62,5 +63,5 @@ bool btStop(){
     return false;
 }
 
-
+#endif
 

cores/esp32/esp32-hal-bt.h

@@ -17,6 +17,8 @@
 
 #include "esp32-hal.h"
 
+#if CONFIG_BT_ENABLED
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -29,4 +31,6 @@ bool btStop();
 }
 #endif
 
+#endif
+
 #endif /* _ESP32_ESP32_HAL_BT_H_ */

cores/esp32/esp32-hal-spi.c

@@ -332,11 +332,11 @@ void spiSetDataMode(spi_t * spi, uint8_t dataMode)
         break;
     case SPI_MODE2:
         spi->dev->pin.ck_idle_edge = 1;
-        spi->dev->user.ck_out_edge = 0;
+        spi->dev->user.ck_out_edge = 1;
         break;
     case SPI_MODE3:
         spi->dev->pin.ck_idle_edge = 1;
-        spi->dev->user.ck_out_edge = 1;
+        spi->dev->user.ck_out_edge = 0;
         break;
     case SPI_MODE0:
     default:

libraries/ESP32/examples/ChipID/GetChipID/GetChipID.ino

@@ -0,0 +1,14 @@
+uint64_t chipid;  
+
+void setup() {
+	Serial.begin(115200);
+}
+
+void loop() {
+	chipid=ESP.getEfuseMac();//The chip ID is essentially its MAC address(length: 6 bytes).
+	Serial.printf("ESP32 Chip ID = %04X",(uint16_t)(chipid>>32));//print High 2 bytes
+	Serial.printf("%08X\n",(uint32_t)chipid);//print Low 4bytes.
+
+	delay(3000);
+
+}

libraries/WiFi/src/WiFiClient.h

@@ -23,6 +23,8 @@
 
 #include "Arduino.h"
 #include "Client.h"
+#undef min
+#undef max
 #include <memory>
 
 class WiFiClientSocketHandle;