v1.10.0 for ESP32 core v2.0.6

khoih-prog · web-flow · commit 5489666a319d · 2022-12-22T14:24:15.000-05:00
### Releases v1.10.0

1. Fix compile errors for new ESP32 core `v2.0.6`
diff --git a/examples/AWS_IoT/defines.h b/examples/AWS_IoT/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/AdvancedWebServer/defines.h b/examples/AdvancedWebServer/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/HelloServer/defines.h b/examples/HelloServer/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/HelloServer2/defines.h b/examples/HelloServer2/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/HttpBasicAuth/defines.h b/examples/HttpBasicAuth/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/MQTTClient_Auth/defines.h b/examples/MQTTClient_Auth/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/MQTTClient_Basic/defines.h b/examples/MQTTClient_Basic/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/MQTTClient_SSL/defines.h b/examples/MQTTClient_SSL/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/MQTTClient_SSL_Auth/defines.h b/examples/MQTTClient_SSL_Auth/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/MQTTClient_SSL_Complex/defines.h b/examples/MQTTClient_SSL_Complex/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/MQTTS_ThingStream/defines.h b/examples/MQTTS_ThingStream/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/MQTT_ThingStream/defines.h b/examples/MQTT_ThingStream/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/PostServer/defines.h b/examples/PostServer/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/SimpleAuthentication/defines.h b/examples/SimpleAuthentication/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/UdpNTPClient/defines.h b/examples/UdpNTPClient/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/UdpSendReceive/defines.h b/examples/UdpSendReceive/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/WebClient/defines.h b/examples/WebClient/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/WebClientMulti_SSL/defines.h b/examples/WebClientMulti_SSL/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/WebClientRepeating/defines.h b/examples/WebClientRepeating/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/WebClientRepeating_ESP/defines.h b/examples/WebClientRepeating_ESP/defines.h
@@ -81,11 +81,13 @@
       #define USING_SPI2                          true
 
       #if USING_SPI2
-        #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-        #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-        #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-        #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
-
+        // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+        // For ESP32 core v2.0.6+
+        #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+        #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+        #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+        #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
+  
         #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
       #else
diff --git a/examples/WebClient_ESP/defines.h b/examples/WebClient_ESP/defines.h
@@ -81,11 +81,13 @@
       //#define USING_SPI2                          true
 
       #if USING_SPI2
-        #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-        #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-        #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-        #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
-
+        // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+        // For ESP32 core v2.0.6+
+        #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+        #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+        #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+        #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
+  
         #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
       #else
diff --git a/examples/WebClient_SSL/defines.h b/examples/WebClient_SSL/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
diff --git a/examples/WebServer/defines.h b/examples/WebServer/defines.h
@@ -445,10 +445,12 @@
     //#define USING_SPI2                          true
 
     #if USING_SPI2
-      #define PIN_MISO          HSPI_IOMUX_PIN_NUM_MISO
-      #define PIN_MOSI          HSPI_IOMUX_PIN_NUM_MOSI
-      #define PIN_SCK           HSPI_IOMUX_PIN_NUM_CLK
-      #define PIN_SS            HSPI_IOMUX_PIN_NUM_CS
+      // HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
+      // For ESP32 core v2.0.6+
+      #define PIN_MISO          SPI2_IOMUX_PIN_NUM_MISO
+      #define PIN_MOSI          SPI2_IOMUX_PIN_NUM_MOSI
+      #define PIN_SCK           SPI2_IOMUX_PIN_NUM_CLK
+      #define PIN_SS            SPI2_IOMUX_PIN_NUM_CS
 
       #define SHIELD_TYPE       "W5x00 using Ethernet_Generic Library on SPI2"
 
