Skip to content

Commit 6de7f16

Browse files
hathachhathach
authored
update adafruit boards for 2.0 (espressif#5718)
1 parent 1688b7c commit 6de7f16

File tree

13 files changed

+107
-59
lines changed

13 files changed

+107
-59
lines changed

‎boards.txt‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3910,6 +3910,13 @@ adafruit_metro_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0
39103910
adafruit_metro_esp32s2.menu.DFUOnBoot.dfu=Enabled
39113911
adafruit_metro_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
39123912

3913+
adafruit_metro_esp32s2.menu.UploadMode.cdc=Internal USB
3914+
adafruit_metro_esp32s2.menu.UploadMode.cdc.upload.use_1200bps_touch=true
3915+
adafruit_metro_esp32s2.menu.UploadMode.cdc.upload.wait_for_upload_port=true
3916+
adafruit_metro_esp32s2.menu.UploadMode.default=UART0
3917+
adafruit_metro_esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false
3918+
adafruit_metro_esp32s2.menu.UploadMode.default.upload.wait_for_upload_port=false
3919+
39133920
adafruit_metro_esp32s2.menu.PSRAM.enabled=Enabled
39143921
adafruit_metro_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
39153922
adafruit_metro_esp32s2.menu.PSRAM.disabled=Disabled
@@ -4024,11 +4031,11 @@ adafruit_metro_esp32s2.menu.DebugLevel.verbose.build.code_debug=5
40244031

40254032
adafruit_magtag29_esp32s2.name=Adafruit MagTag 2.9"
40264033
adafruit_magtag29_esp32s2.vid.0=0x239A
4027-
adafruit_magtag29_esp32s2.pid.0=0x80DF
4034+
adafruit_magtag29_esp32s2.pid.0=0x80E5
40284035
adafruit_magtag29_esp32s2.vid.1=0x239A
4029-
adafruit_magtag29_esp32s2.pid.1=0x00DF
4036+
adafruit_magtag29_esp32s2.pid.1=0x00E5
40304037
adafruit_magtag29_esp32s2.vid.1=0x239A
4031-
adafruit_magtag29_esp32s2.pid.1=0x80E0
4038+
adafruit_magtag29_esp32s2.pid.1=0x80E6
40324039

40334040
adafruit_magtag29_esp32s2.upload.tool=esptool_py
40344041
adafruit_magtag29_esp32s2.upload.maximum_size=1310720
@@ -4075,6 +4082,13 @@ adafruit_magtag29_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0
40754082
adafruit_magtag29_esp32s2.menu.DFUOnBoot.dfu=Enabled
40764083
adafruit_magtag29_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
40774084

4085+
adafruit_magtag29_esp32s2.menu.UploadMode.cdc=Internal USB
4086+
adafruit_magtag29_esp32s2.menu.UploadMode.cdc.upload.use_1200bps_touch=true
4087+
adafruit_magtag29_esp32s2.menu.UploadMode.cdc.upload.wait_for_upload_port=true
4088+
adafruit_magtag29_esp32s2.menu.UploadMode.default=UART0
4089+
adafruit_magtag29_esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false
4090+
adafruit_magtag29_esp32s2.menu.UploadMode.default.upload.wait_for_upload_port=false
4091+
40784092
adafruit_magtag29_esp32s2.menu.PSRAM.enabled=Enabled
40794093
adafruit_magtag29_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
40804094
adafruit_magtag29_esp32s2.menu.PSRAM.disabled=Disabled
@@ -4240,6 +4254,13 @@ adafruit_funhouse_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0
42404254
adafruit_funhouse_esp32s2.menu.DFUOnBoot.dfu=Enabled
42414255
adafruit_funhouse_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
42424256

4257+
adafruit_funhouse_esp32s2.menu.UploadMode.cdc=Internal USB
4258+
adafruit_funhouse_esp32s2.menu.UploadMode.cdc.upload.use_1200bps_touch=true
4259+
adafruit_funhouse_esp32s2.menu.UploadMode.cdc.upload.wait_for_upload_port=true
4260+
adafruit_funhouse_esp32s2.menu.UploadMode.default=UART0
4261+
adafruit_funhouse_esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false
4262+
adafruit_funhouse_esp32s2.menu.UploadMode.default.upload.wait_for_upload_port=false
4263+
42434264
adafruit_funhouse_esp32s2.menu.PSRAM.enabled=Enabled
42444265
adafruit_funhouse_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
42454266
adafruit_funhouse_esp32s2.menu.PSRAM.disabled=Disabled

‎variants/adafruit_feather_esp32s2/bootloader.bin‎

-1.5 KB
Binary file not shown.

‎variants/adafruit_feather_esp32s2/pins_arduino.h‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#include <stdint.h>
55

66

7-
#define USB_VID 0x239A
8-
#define USB_PID 0x80EB
9-
#define USB_MANUFACTURER "Adafruit"
10-
#define USB_PRODUCT "Adafruit Feather ESP32-S2"
11-
#define USB_SERIAL ""
7+
#define USB_VID 0x239A
8+
#define USB_PID 0x80EB
9+
#define USB_MANUFACTURER "Adafruit"
10+
#define USB_PRODUCT "Feather ESP32-S2"
11+
#define USB_SERIAL "" // Empty string for MAC adddress
1212

1313

1414
#define EXTERNAL_NUM_INTERRUPTS 46
@@ -19,12 +19,12 @@
1919
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2020
#define digitalPinHasPWM(p) (p < 46)
2121

22-
static const uint8_t PIN_NEOPIXEL = 33;
23-
static const uint8_t PIN_NEOPIXEL_POWER = 21;
24-
static const uint8_t LED_BUILTIN = 13;
22+
#define LED_BUILTIN 13
2523

26-
static const uint8_t TX = 39;
27-
static const uint8_t RX = 38;
24+
#define PIN_NEOPIXEL 33
25+
#define NEOPIXEL_NUM 1 // number of neopixels
26+
#define NEOPIXEL_POWER 21 // power pin
27+
#define NEOPIXEL_POWER_ON HIGH // power pin state when on
2828

2929
static const uint8_t SDA = 3;
3030
static const uint8_t SCL = 4;
@@ -41,6 +41,12 @@ static const uint8_t A3 = 15;
4141
static const uint8_t A4 = 14;
4242
static const uint8_t A5 = 8;
4343

44+
45+
46+
47+
static const uint8_t TX = 43;
48+
static const uint8_t RX = 44;
49+
4450
static const uint8_t T1 = 1;
4551
static const uint8_t T2 = 2;
4652
static const uint8_t T3 = 3;

‎variants/adafruit_feather_esp32s2/tinyuf2.bin‎

2.34 KB
Binary file not shown.

‎variants/adafruit_funhouse_esp32s2/bootloader.bin‎

-1.48 KB
Binary file not shown.

‎variants/adafruit_funhouse_esp32s2/pins_arduino.h‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
#include <stdint.h>
55

66

7-
#define USB_VID 0x239A
8-
#define USB_PID 0x80F9
9-
10-
#define USB_MANUFACTURER "Adafruit"
11-
#define USB_PRODUCT "Adafruit Funhouse ESP32-S2"
12-
#define USB_SERIAL ""
7+
#define USB_VID 0x239A
8+
#define USB_PID 0x80F9
9+
#define USB_MANUFACTURER "Adafruit"
10+
#define USB_PRODUCT "Funhouse ESP32-S2"
11+
#define USB_SERIAL "" // Empty string for MAC adddress
1312

1413

1514
#define EXTERNAL_NUM_INTERRUPTS 46
@@ -20,24 +19,27 @@
2019
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2120
#define digitalPinHasPWM(p) (p < 46)
2221

22+
#define LED_BUILTIN 37
23+
24+
#define PIN_BUTTON1 3
25+
#define PIN_BUTTON2 4
26+
#define PIN_BUTTON3 5
27+
#define PIN_BUTTON4 0 // BOOT0 switch
28+
2329
static const uint8_t PIN_DOTSTAR_DATA = 14;
2430
static const uint8_t PIN_DOTSTAR_CLOCK = 15;
25-
static const uint8_t LED_BUILTIN = 37;
2631

27-
static const uint8_t TX = 2;
28-
static const uint8_t RX = 3;
32+
static const uint8_t TFT_BACKLIGHT = 21;
33+
static const uint8_t TFT_DC = 39;
34+
static const uint8_t TFT_CS = 40;
35+
static const uint8_t TFT_RESET = 41;
2936

30-
static const uint8_t TFT_BACKLIGHT = 21;
31-
static const uint8_t TFT_DC = 39;
32-
static const uint8_t TFT_CS = 40;
33-
static const uint8_t TFT_RESET = 41;
34-
35-
static const uint8_t SPEAKER = 42;
36-
static const uint8_t BUTTON_DOWN = 3;
37-
static const uint8_t BUTTON_SELECT = 4;
38-
static const uint8_t BUTTON_UP = 5;
39-
static const uint8_t SENSOR_PIR = 16;
40-
static const uint8_t SENSOR_LIGHT = 18;
37+
static const uint8_t SPEAKER = 42;
38+
static const uint8_t BUTTON_DOWN = PIN_BUTTON1;
39+
static const uint8_t BUTTON_SELECT = PIN_BUTTON2;
40+
static const uint8_t BUTTON_UP = PIN_BUTTON3;
41+
static const uint8_t SENSOR_PIR = 16;
42+
static const uint8_t SENSOR_LIGHT = 18;
4143

4244
static const uint8_t SDA = 34;
4345
static const uint8_t SCL = 33;
@@ -49,9 +51,16 @@ static const uint8_t MISO = 37;
4951

5052
static const uint8_t A0 = 17;
5153
static const uint8_t A1 = 2;
52-
static const uint8_t A2 = 3;
54+
static const uint8_t A2 = 1;
5355
static const uint8_t A3 = 18; // light sensor
5456

57+
58+
59+
60+
61+
static const uint8_t TX = 43;
62+
static const uint8_t RX = 44;
63+
5564
static const uint8_t T1 = 1;
5665
static const uint8_t T2 = 2;
5766
static const uint8_t T3 = 3;

‎variants/adafruit_funhouse_esp32s2/tinyuf2.bin‎

3.83 KB
Binary file not shown.

‎variants/adafruit_magtag29_esp32s2/bootloader.bin‎

-1.47 KB
Binary file not shown.

‎variants/adafruit_magtag29_esp32s2/pins_arduino.h‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#include <stdint.h>
55

66

7-
#define USB_VID 0x239A
8-
#define USB_PID 0x80DF
9-
#define USB_MANUFACTURER "Adafruit"
10-
#define USB_PRODUCT "EPD MagTag 2.9\" ESP32-S2"
11-
#define USB_SERIAL ""
7+
#define USB_VID 0x239A
8+
#define USB_PID 0x80E5
9+
#define USB_MANUFACTURER "Adafruit"
10+
#define USB_PRODUCT "EPD MagTag 2.9\" ESP32-S2"
11+
#define USB_SERIAL "" // Empty string for MAC adddress
1212

1313

1414
#define EXTERNAL_NUM_INTERRUPTS 46
@@ -19,22 +19,31 @@
1919
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2020
#define digitalPinHasPWM(p) (p < 46)
2121

22-
static const uint8_t PIN_NEOPIXEL = 1; // D1
23-
static const uint8_t NEOPIXEL_POWER = 21;
22+
#define LED_BUILTIN 13
2423

25-
static const uint8_t LED_BUILTIN = 13;
24+
#define PIN_NEOPIXEL 1 // D1
25+
#define NEOPIXEL_NUM 4 // number of neopixels
26+
#define NEOPIXEL_POWER 21 // power pin
27+
#define NEOPIXEL_POWER_ON LOW // power pin state when on
2628

27-
static const uint8_t EPD_BUSY = 5;
29+
30+
#define PIN_BUTTON1 15
31+
#define PIN_BUTTON2 14
32+
#define PIN_BUTTON3 12
33+
#define PIN_BUTTON4 11
34+
#define PIN_BUTTON5 0 // BOOT0 switch
35+
36+
static const uint8_t EPD_BUSY = 5;
2837
static const uint8_t EPD_RESET = 6;
29-
static const uint8_t EPD_DC = 7;
30-
static const uint8_t EPD_CS = 8;
38+
static const uint8_t EPD_DC = 7;
39+
static const uint8_t EPD_CS = 8;
3140

3241
static const uint8_t ACCEL_IRQ = 9;
3342

34-
static const uint8_t BUTTON_A = 15;
35-
static const uint8_t BUTTON_B = 14;
36-
static const uint8_t BUTTON_C = 12;
37-
static const uint8_t BUTTON_D = 11;
43+
static const uint8_t BUTTON_A = PIN_BUTTON1;
44+
static const uint8_t BUTTON_B = PIN_BUTTON2;
45+
static const uint8_t BUTTON_C = PIN_BUTTON3;
46+
static const uint8_t BUTTON_D = PIN_BUTTON4;
3847

3948
static const uint8_t LIGHT_SENSOR = 3;
4049
static const uint8_t BATT_MONITOR = 4;
@@ -52,8 +61,8 @@ static const uint8_t MISO = 37;
5261

5362

5463

55-
static const uint8_t TX = 37;
56-
static const uint8_t RX = 38;
64+
static const uint8_t TX = 43;
65+
static const uint8_t RX = 44;
5766

5867

5968
static const uint8_t A0 = 17;

‎variants/adafruit_magtag29_esp32s2/tinyuf2.bin‎

2.33 KB
Binary file not shown.

0 commit comments

Comments
 (0)