Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit 28e5c42

Browse files
khoih-progkhoih-prog
authored
v2.4.0 for ESP32 core v2.0.6
### Releases v2.4.0 1. Fix compile errors for new ESP32 core `v2.0.6`
1 parent db0f69a commit 28e5c42

File tree

27 files changed

+46291
-124
lines changed

27 files changed

+46291
-124
lines changed

‎examples/AdvancedWebServer/AdvancedWebServer.ino‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void drawGraph()
113113
out.reserve(ORIGINAL_STR_LEN);
114114
}
115115

116-
116+
117117
#if (MULTIPLY_FACTOR == 2)
118118

119119
out = F( "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"610\" height=\"150\">\n" \
@@ -124,20 +124,20 @@ void drawGraph()
124124

125125
out = F( "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"1210\" height=\"150\">\n" \
126126
"<rect width=\"1210\" height=\"150\" fill=\"rgb(250, 230, 210)\" stroke-width=\"3\" stroke=\"rgb(0, 0, 0)\" />\n" \
127-
"<g stroke=\"blue\">\n");
127+
"<g stroke=\"blue\">\n");
128128

129129
#elif (MULTIPLY_FACTOR == 6)
130130

131131
out = F( "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"1810\" height=\"150\">\n" \
132132
"<rect width=\"1810\" height=\"150\" fill=\"rgb(250, 230, 210)\" stroke-width=\"3\" stroke=\"rgb(0, 0, 0)\" />\n" \
133-
"<g stroke=\"blue\">\n");
133+
"<g stroke=\"blue\">\n");
134134

135135
#else // (MULTIPLY_FACTOR == 1)
136136

137137
out = F( "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"310\" height=\"150\">\n" \
138138
"<rect width=\"310\" height=\"150\" fill=\"rgb(250, 230, 210)\" stroke-width=\"3\" stroke=\"rgb(0, 0, 0)\" />\n" \
139-
"<g stroke=\"blue\">\n");
140-
139+
"<g stroke=\"blue\">\n");
140+
141141
#endif
142142

143143
char temp[70];
@@ -241,9 +241,10 @@ void initEthernet()
241241
//Ethernet.init(20); // Teensy++ 2.0
242242
//Ethernet.init(15); // ESP8266 with Adafruit Featherwing Ethernet
243243
//Ethernet.init(33); // ESP32 with Adafruit Featherwing Ethernet
244+
//Ethernet.init(34); // ESP32_S2 with W5500 Ethernet
244245

245246
#ifndef USE_THIS_SS_PIN
246-
#define USE_THIS_SS_PIN 5 //22 // For ESP32
247+
#define USE_THIS_SS_PIN SS //7 //5 //10 //22 // For ESP32
247248
#endif
248249

249250
ET_LOGWARN1(F("ESP32 setCsPin:"), USE_THIS_SS_PIN);

‎examples/AdvancedWebServer/defines.h‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#define DEBUG_ETHERNET_WEBSERVER_PORT SerialDebug
2424

2525
// Debug Level from 0 to 4
26-
#define _ETG_LOGLEVEL_ 3
27-
#define _ETHERNET_WEBSERVER_LOGLEVEL_ 1
26+
#define _ETG_LOGLEVEL_ 1
27+
#define _ETHERNET_WEBSERVER_LOGLEVEL_ 3
2828

2929
#define USING_SPI2 false //true
3030

@@ -350,7 +350,7 @@
350350

351351
#elif ETHERNET_USE_RPIPICO
352352

353-
#define MULTIPLY_FACTOR 4
353+
#define MULTIPLY_FACTOR 6
354354

355355
// Default pin 17 to SS/CS
356356
#if defined(ARDUINO_ARCH_MBED)
@@ -443,9 +443,9 @@
443443
//#define USE_THIS_SS_PIN 22 //21 //5 //4 //2 //15
444444

445445
// Only one if the following to be true
446-
#define USE_ETHERNET_GENERIC true
446+
#define USE_ETHERNET_GENERIC false //true
447447
#define USE_ETHERNET_ESP8266 false
448-
#define USE_ETHERNET_ENC false
448+
#define USE_ETHERNET_ENC true //false
449449
#define USE_CUSTOM_ETHERNET false
450450

451451
////////////////////////////
@@ -483,10 +483,12 @@
483483
//#define USING_SPI2 true
484484

485485
#if USING_SPI2
486-
#define PIN_MISO HSPI_IOMUX_PIN_NUM_MISO
487-
#define PIN_MOSI HSPI_IOMUX_PIN_NUM_MOSI
488-
#define PIN_SCK HSPI_IOMUX_PIN_NUM_CLK
489-
#define PIN_SS HSPI_IOMUX_PIN_NUM_CS
486+
// HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
487+
// For ESP32 core v2.0.6+
488+
#define PIN_MISO SPI2_IOMUX_PIN_NUM_MISO
489+
#define PIN_MOSI SPI2_IOMUX_PIN_NUM_MOSI
490+
#define PIN_SCK SPI2_IOMUX_PIN_NUM_CLK
491+
#define PIN_SS SPI2_IOMUX_PIN_NUM_CS
490492

491493
#define SHIELD_TYPE "W5x00 using Ethernet_Generic Library on SPI2"
492494

‎examples/AdvancedWebServer_ESP32_SPI2/debug.cfg‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# SPDX-License-Identifier: GPL-2.0-or-later
2+
#
3+
# Example OpenOCD configuration file for ESP32-WROVER-KIT board.
4+
#
5+
# For example, OpenOCD can be started for ESP32 debugging on
6+
#
7+
# openocd -f board/esp32-wrover-kit-3.3v.cfg
8+
#
9+
10+
# Source the JTAG interface configuration file
11+
source [find interface/ftdi/esp32_devkitj_v1.cfg]
12+
set ESP32_FLASH_VOLTAGE 3.3
13+
# Source the ESP32 configuration file
14+
source [find target/esp32.cfg]

‎examples/AdvancedWebServer_ESP32_SPI2/debug_custom.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"name":"Arduino on ESP32",
3+
"toolchainPrefix":"xtensa-esp32-elf",
4+
"svdFile":"esp32.svd",
5+
"request":"attach",
6+
"postAttachCommands":[
7+
"set remote hardware-watchpoint-limit 2",
8+
"monitor reset halt",
9+
"monitor gdb_sync",
10+
"thb setup",
11+
"c"
12+
],
13+
"overrideRestartCommands":[
14+
"monitor reset halt",
15+
"monitor gdb_sync",
16+
"thb setup",
17+
"c"
18+
]
19+
}

‎examples/AdvancedWebServer_ESP32_SPI2/defines.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,12 @@
5353
#include <soc/spi_pins.h>
5454

5555
#if USING_SPI2
56-
#define PIN_MISO HSPI_IOMUX_PIN_NUM_MISO
57-
#define PIN_MOSI HSPI_IOMUX_PIN_NUM_MOSI
58-
#define PIN_SCK HSPI_IOMUX_PIN_NUM_CLK
59-
#define PIN_SS HSPI_IOMUX_PIN_NUM_CS
56+
// HSPI_IOMUX_PIN_NUM_???? deprecated from core v2.0.6+
57+
// For ESP32 core v2.0.6+
58+
#define PIN_MISO SPI2_IOMUX_PIN_NUM_MISO
59+
#define PIN_MOSI SPI2_IOMUX_PIN_NUM_MOSI
60+
#define PIN_SCK SPI2_IOMUX_PIN_NUM_CLK
61+
#define PIN_SS SPI2_IOMUX_PIN_NUM_CS
6062

6163
#define SHIELD_TYPE "W5x00 using Ethernet_Generic Library on SPI2"
6264

0 commit comments

Comments
 (0)