Skip to content

Commit e18d8b9

Browse files
Stanimir-PetevP-R-O-C-H-Y
Stanimir-Petev
and
P-R-O-C-H-Y
authored
Added support for 2 new Olimex boards and updated 3 existing ones (espressif#9264)
* Added new Olimex boards Added variants for ESP32-H2-DevKit-LiPo and ESP32-SBC-FabGL boards * Changes on the ESP32-POE and POE-ISO Added menu for selection of the: 1) PSRAM enabled/disabled 2) Flash size 4/16 MB 3) Flash mode QIO/DIO 4) Partition Scheme additional options * Updated pins_arduino.h for ESP32 POE, POE-ISO and Gateway Due to the latest changes in the ethernet library/examples (espressif#9242) full package of definitions of the ethernet macros is for each board that has non-default values. For POE and POE-ISO is added a preprocessor condition #if defined BOARD_HAS_PSRAM due to our specific hardware because GPIO 16 and 17 are in use when PSRAM is enabled. * Update boards.txt Removed the -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw fix flags as suggested by Jason2866 and me-no-dev * Update boards.txt Reverted changes for ESP32-POE and ESP32-POE-ISO * Update boards.txt Rearrange of the enable/disable entries of the PSRAM option for ESP32-SBC-FabGL to be enabled by default. --------- Co-authored-by: Jan Procházka <[email protected]>
1 parent f2a5041 commit e18d8b9

File tree

6 files changed

+619
-28
lines changed

6 files changed

+619
-28
lines changed

Diff for: ‎boards.txt

+499-22
Large diffs are not rendered by default.

Diff for: ‎variants/esp32-gateway/pins_arduino.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
#include <stdint.h>
55

66
#if defined (ARDUINO_ESP32_GATEWAY_E) || defined (ARDUINO_ESP32_GATEWAY_F)
7-
#define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
8-
#define ETH_PHY_POWER 5
7+
#define ETH_PHY_TYPE ETH_PHY_LAN8720
8+
#define ETH_PHY_ADDR 0
9+
#define ETH_PHY_MDC 23
10+
#define ETH_PHY_MDIO 18
11+
#define ETH_PHY_POWER 5
12+
#define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
913
#endif
1014

1115
static const uint8_t LED_BUILTIN = 33;

Diff for: ‎variants/esp32-poe-iso/pins_arduino.h

+15-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,17 @@
33

44
#include <stdint.h>
55

6-
#define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
7-
#define ETH_PHY_POWER 12
6+
#define ETH_PHY_TYPE ETH_PHY_LAN8720
7+
#define ETH_PHY_ADDR 0
8+
#define ETH_PHY_MDC 23
9+
#define ETH_PHY_MDIO 18
10+
#define ETH_PHY_POWER 12
11+
#if defined BOARD_HAS_PSRAM // when PSRAM is enabled pins 16 and 17 are used for the PSRAM and alternative pins are used for respectively I2C SCL and Ethernet Clock GPIO
12+
#define ETH_CLK_MODE ETH_CLOCK_GPIO0_OUT
13+
#else
14+
#define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
15+
#endif
16+
817

918
static const uint8_t KEY_BUILTIN = 34;
1019

@@ -18,7 +27,11 @@ static const uint8_t RX = 3;
1827
#define RX2 35 // ext2 pin 3
1928

2029
static const uint8_t SDA = 13;
30+
#if defined BOARD_HAS_PSRAM // when PSRAM is enabled pins 16 and 17 are used for the PSRAM and alternative pins are used for respectively I2C SCL and Ethernet Clock GPIO
31+
static const uint8_t SCL = 33;
32+
#else
2133
static const uint8_t SCL = 16;
34+
#endif
2235

2336
static const uint8_t SS = 5;
2437
static const uint8_t MOSI = 2;

Diff for: ‎variants/esp32-poe/pins_arduino.h

+15-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,17 @@
33

44
#include <stdint.h>
55

6-
#define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
7-
#define ETH_PHY_POWER 12
6+
#define ETH_PHY_TYPE ETH_PHY_LAN8720
7+
#define ETH_PHY_ADDR 0
8+
#define ETH_PHY_MDC 23
9+
#define ETH_PHY_MDIO 18
10+
#define ETH_PHY_POWER 12
11+
#if defined BOARD_HAS_PSRAM // when PSRAM is enabled pins 16 and 17 are used for the PSRAM and alternative pins are used for respectively I2C SCL and Ethernet Clock GPIO
12+
#define ETH_CLK_MODE ETH_CLOCK_GPIO0_OUT
13+
#else
14+
#define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
15+
#endif
16+
817

918
static const uint8_t KEY_BUILTIN = 34;
1019

@@ -18,7 +27,11 @@ static const uint8_t RX = 3;
1827
#define RX2 35 // ext2 pin 3
1928

2029
static const uint8_t SDA = 13;
30+
#if defined BOARD_HAS_PSRAM // when PSRAM is enabled pins 16 and 17 are used for the PSRAM and alternative pins are used for respectively I2C SCL and Ethernet Clock GPIO
31+
static const uint8_t SCL = 33;
32+
#else
2133
static const uint8_t SCL = 16;
34+
#endif
2235

2336
static const uint8_t SS = 5;
2437
static const uint8_t MOSI = 2;

Diff for: ‎variants/esp32-sbc-fabgl/pins_arduino.h

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
static const uint8_t TX = 1;
7+
static const uint8_t RX = 3;
8+
9+
static const uint8_t SDA = 21;
10+
static const uint8_t SCL = 22;
11+
12+
static const uint8_t SS = 5;
13+
static const uint8_t MOSI = 23;
14+
static const uint8_t MISO = 19;
15+
static const uint8_t SCK = 18;
16+
17+
static const uint8_t A0 = 36;
18+
static const uint8_t A3 = 39;
19+
static const uint8_t A4 = 32;
20+
static const uint8_t A5 = 33;
21+
static const uint8_t A6 = 34;
22+
static const uint8_t A7 = 35;
23+
static const uint8_t A10 = 4;
24+
static const uint8_t A11 = 0;
25+
static const uint8_t A12 = 2;
26+
static const uint8_t A13 = 15;
27+
static const uint8_t A14 = 13;
28+
static const uint8_t A15 = 12;
29+
static const uint8_t A16 = 14;
30+
static const uint8_t A17 = 27;
31+
static const uint8_t A18 = 25;
32+
static const uint8_t A19 = 26;
33+
34+
static const uint8_t T0 = 4;
35+
static const uint8_t T1 = 0;
36+
static const uint8_t T2 = 2;
37+
static const uint8_t T3 = 15;
38+
static const uint8_t T4 = 13;
39+
static const uint8_t T5 = 12;
40+
static const uint8_t T6 = 14;
41+
static const uint8_t T7 = 27;
42+
static const uint8_t T8 = 33;
43+
static const uint8_t T9 = 32;
44+
45+
static const uint8_t DAC1 = 25;
46+
static const uint8_t DAC2 = 26;
47+
48+
#endif /* Pins_Arduino_h */

Diff for: ‎variants/esp32h2-devkit-lipo/pins_arduino.h

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
#include "soc/soc_caps.h"
6+
7+
#define PIN_NEOPIXEL 8
8+
// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
9+
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
10+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
11+
#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN
12+
// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
13+
#define RGB_BUILTIN LED_BUILTIN
14+
#define RGB_BRIGHTNESS 64
15+
16+
17+
static const uint8_t KEY_BUILTIN = 9;
18+
19+
static const uint8_t TX = 24;
20+
static const uint8_t RX = 23;
21+
22+
static const uint8_t SDA = 12;
23+
static const uint8_t SCL = 22;
24+
25+
static const uint8_t SS = 0;
26+
static const uint8_t MOSI = 25;
27+
static const uint8_t MISO = 11;
28+
static const uint8_t SCK = 10;
29+
30+
static const uint8_t A0 = 1;
31+
static const uint8_t A1 = 2;
32+
static const uint8_t A2 = 3;
33+
static const uint8_t A3 = 4;
34+
static const uint8_t A4 = 5;
35+
36+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)