Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 72eb3f3

Browse filesBrowse files
hathachhathach
authored
Add Adafruit esp32s2 boards with custom bootloader, partition and upload.extra_flags (espressif#5056)
done on behalf of @ladyada, this PR does: Add Adafruit FunHouse and upcoming Adafruit Feather Esp32s2 Update Adafruit magtag and metro esp32s2 to have tinyuf2 as factory app Also modify platform.txt as discussed in adafruit#2 + adafruit#3 + adafruit#4 to add support for Board/variant partition.csv, bootloader.bin ( priority is user sketch > variant > build.parition/boot ) upload.extra_flags to optionally flash tinyuf2 as factory application Remove duplicated parameter in running python script in linux and windows Please review and let me know if you want any changes. Notes: tinyuf2 is a uf2 bootloader for multiple platforms. For esp32s2, it is an factory app to perform uf2 firmware update.
1 parent 66b11ff commit 72eb3f3
Copy full SHA for 72eb3f3

File tree

Expand file treeCollapse file tree

16 files changed

+602
-7
lines changed
Filter options
Expand file treeCollapse file tree

16 files changed

+602
-7
lines changed

‎boards.txt

Copy file name to clipboardExpand all lines: boards.txt
+407Lines changed: 407 additions & 0 deletions
Large diffs are not rendered by default.

‎platform.txt

Copy file name to clipboardExpand all lines: platform.txt
+16-7Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,18 @@ build.loop_core=
111111
build.event_core=
112112
build.extra_flags=-DESP32 -DCORE_DEBUG_LEVEL={build.code_debug} {build.loop_core} {build.event_core} {build.defines} {build.extra_flags.{build.mcu}}
113113

114-
# Check if custom partitions exist
114+
# Check if custom partitions exist: source > variant > build.partitions
115115
recipe.hooks.prebuild.1.pattern=bash -c "[ ! -f "{build.source.path}"/partitions.csv ] || cp -f "{build.source.path}"/partitions.csv "{build.path}"/partitions.csv"
116-
recipe.hooks.prebuild.2.pattern=bash -c "[ -f "{build.path}"/partitions.csv ] || cp "{runtime.platform.path}"/tools/partitions/{build.partitions}.csv "{build.path}"/partitions.csv"
116+
recipe.hooks.prebuild.2.pattern=bash -c "[ -f "{build.path}"/partitions.csv ] || [ ! -f "{build.variant.path}"/partitions.csv ] || cp "{build.variant.path}"/partitions.csv "{build.path}"/partitions.csv"
117+
recipe.hooks.prebuild.3.pattern=bash -c "[ -f "{build.path}"/partitions.csv ] || cp "{runtime.platform.path}"/tools/partitions/{build.partitions}.csv "{build.path}"/partitions.csv"
118+
117119
recipe.hooks.prebuild.1.pattern.windows=cmd /c if exist "{build.source.path}\partitions.csv" COPY /y "{build.source.path}\partitions.csv" "{build.path}\partitions.csv"
118-
recipe.hooks.prebuild.2.pattern.windows=cmd /c if not exist "{build.path}\partitions.csv" COPY "{runtime.platform.path}\tools\partitions\{build.partitions}.csv" "{build.path}\partitions.csv"
120+
recipe.hooks.prebuild.2.pattern.windows=cmd /c if not exist "{build.path}\partitions.csv" if exist "{build.variant.path}\partitions.csv" COPY "{build.variant.path}\partitions.csv" "{build.path}\partitions.csv"
121+
recipe.hooks.prebuild.3.pattern.windows=cmd /c if not exist "{build.path}\partitions.csv" COPY "{runtime.platform.path}\tools\partitions\{build.partitions}.csv" "{build.path}\partitions.csv"
122+
123+
# Check if custom bootloader exist: source > variant > build.boot
124+
recipe.hooks.prebuild.4.pattern=bash -c "[ -f "{build.source.path}"/bootloader.bin ] && cp -f "{build.source.path}"/bootloader.bin "{build.path}"/{build.project_name}.bootloader.bin || ( [ -f "{build.variant.path}"/bootloader.bin ] && cp "{build.variant.path}"/bootloader.bin "{build.path}"/{build.project_name}.bootloader.bin || cp -f "{runtime.platform.path}"/tools/sdk/{build.mcu}/bin/bootloader_{build.boot}_{build.flash_freq}.bin "{build.path}"/{build.project_name}.bootloader.bin )"
125+
recipe.hooks.prebuild.4.pattern.windows=cmd /c IF EXIST "{build.source.path}\bootloader.bin" ( COPY /y "{build.source.path}\bootloader.bin" "{build.path}\{build.project_name}.bootloader.bin" ) ELSE ( IF EXIST "{build.variant.path}\bootloader.bin" ( COPY "{build.variant.path}\bootloader.bin" "{build.path}\{build.project_name}.bootloader.bin" ) ELSE ( COPY /y "{runtime.platform.path}\tools\sdk\{build.mcu}\bin\bootloader_{build.boot}_{build.flash_freq}.bin" "{build.path}\{build.project_name}.bootloader.bin" ) )
119126

120127
## Compile c files
121128
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" -DARDUINO_VARIANT="{build.variant}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
@@ -136,8 +143,9 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-Wl,--Map={build
136143
recipe.objcopy.partitions.bin.pattern={tools.gen_esp32part.cmd} -q "{build.path}/partitions.csv" "{build.path}/{build.project_name}.partitions.bin"
137144

138145
## Create bin
139-
recipe.objcopy.bin.pattern="{tools.esptool_py.path}/{tools.esptool_py.cmd}" --chip {build.mcu} elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.flash_freq}" --flash_size "{build.flash_size}" -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
140-
recipe.objcopy.bin.pattern.linux=python "{tools.esptool_py.path}/{tools.esptool_py.cmd}" --chip {build.mcu} elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.flash_freq}" --flash_size "{build.flash_size}" -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
146+
recipe.objcopy.bin.pattern_args=--chip {build.mcu} elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.flash_freq}" --flash_size "{build.flash_size}" -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
147+
recipe.objcopy.bin.pattern="{tools.esptool_py.path}/{tools.esptool_py.cmd}" {recipe.objcopy.bin.pattern_args}
148+
recipe.objcopy.bin.pattern.linux=python "{tools.esptool_py.path}/{tools.esptool_py.cmd}" {recipe.objcopy.bin.pattern_args}
141149

142150
## Save bin
143151
recipe.output.tmp_file={build.project_name}.{build.mcu}.bin
@@ -153,6 +161,7 @@ recipe.size.regex.data=^(?:\.dram0\.data|\.dram0\.bss|\.noinit)\s+([0-9]+).*
153161
tools.esptool_py.upload.protocol=esp32
154162
tools.esptool_py.upload.params.verbose=
155163
tools.esptool_py.upload.params.quiet=
156-
tools.esptool_py.upload.pattern="{path}/{cmd}" --chip {build.mcu} --port "{serial.port}" --baud {upload.speed} {upload.flags} --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" {build.bootloader_addr} "{runtime.platform.path}/tools/sdk/{build.mcu}/bin/bootloader_{build.boot}_{build.flash_freq}.bin" 0x10000 "{build.path}/{build.project_name}.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin"
157-
tools.esptool_py.upload.pattern.linux=python "{path}/{cmd}" --chip {build.mcu} --port "{serial.port}" --baud {upload.speed} {upload.flags} --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" {build.bootloader_addr} "{runtime.platform.path}/tools/sdk/{build.mcu}/bin/bootloader_{build.boot}_{build.flash_freq}.bin" 0x10000 "{build.path}/{build.project_name}.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin"
164+
tools.esptool_py.upload.pattern_args=--chip {build.mcu} --port "{serial.port}" --baud {upload.speed} {upload.flags} --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" {build.bootloader_addr} "{build.path}/{build.project_name}.bootloader.bin" 0x10000 "{build.path}/{build.project_name}.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin" {upload.extra_flags}
165+
tools.esptool_py.upload.pattern="{path}/{cmd}" {upload.pattern_args}
166+
tools.esptool_py.upload.pattern.linux=python "{path}/{cmd}" {upload.pattern_args}
158167
tools.esptool_py.upload.network_pattern={network_cmd} -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"

‎variants/adafruit_feather_esp32s2/bootloader.bin

Copy file name to clipboard
22.2 KB
Binary file not shown.

‎variants/adafruit_feather_esp32s2/partitions.csv

Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# ESP-IDF Partition Table
2+
# Name, Type, SubType, Offset, Size, Flags
3+
# bootloader.bin,, 0x1000, 32K
4+
# partition table, 0x8000, 4K
5+
6+
nvs, data, nvs, 0x9000, 20K,
7+
otadata, data, ota, 0xe000, 8K,
8+
ota_0, 0, ota_0, 0x10000, 1408K,
9+
ota_1, 0, ota_1, 0x170000, 1408K,
10+
uf2, app, factory,0x2d0000, 256K,
11+
ffat, data, fat, 0x310000, 960K,

‎variants/adafruit_feather_esp32s2/pins_arduino.h

Copy file name to clipboard
+62Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
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 ""
12+
13+
14+
#define EXTERNAL_NUM_INTERRUPTS 46
15+
#define NUM_DIGITAL_PINS 48
16+
#define NUM_ANALOG_INPUTS 20
17+
18+
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
19+
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
20+
#define digitalPinHasPWM(p) (p < 46)
21+
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;
25+
26+
static const uint8_t TX = 39;
27+
static const uint8_t RX = 38;
28+
29+
static const uint8_t SDA = 3;
30+
static const uint8_t SCL = 4;
31+
32+
static const uint8_t SS = 42;
33+
static const uint8_t MOSI = 35;
34+
static const uint8_t SCK = 36;
35+
static const uint8_t MISO = 37;
36+
37+
static const uint8_t A0 = 18;
38+
static const uint8_t A1 = 17;
39+
static const uint8_t A2 = 16;
40+
static const uint8_t A3 = 15;
41+
static const uint8_t A4 = 14;
42+
static const uint8_t A5 = 8;
43+
44+
static const uint8_t T1 = 1;
45+
static const uint8_t T2 = 2;
46+
static const uint8_t T3 = 3;
47+
static const uint8_t T4 = 4;
48+
static const uint8_t T5 = 5;
49+
static const uint8_t T6 = 6;
50+
static const uint8_t T7 = 7;
51+
static const uint8_t T8 = 8;
52+
static const uint8_t T9 = 9;
53+
static const uint8_t T10 = 10;
54+
static const uint8_t T11 = 11;
55+
static const uint8_t T12 = 12;
56+
static const uint8_t T13 = 13;
57+
static const uint8_t T14 = 14;
58+
59+
static const uint8_t DAC1 = 17;
60+
static const uint8_t DAC2 = 18;
61+
62+
#endif /* Pins_Arduino_h */

‎variants/adafruit_feather_esp32s2/tinyuf2.bin

Copy file name to clipboard
130 KB
Binary file not shown.

‎variants/adafruit_funhouse_esp32s2/bootloader.bin

Copy file name to clipboard
22.3 KB
Binary file not shown.

‎variants/adafruit_funhouse_esp32s2/partitions.csv

Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# ESP-IDF Partition Table
2+
# Name, Type, SubType, Offset, Size, Flags
3+
# bootloader.bin,, 0x1000, 32K
4+
# partition table, 0x8000, 4K
5+
6+
nvs, data, nvs, 0x9000, 20K,
7+
otadata, data, ota, 0xe000, 8K,
8+
ota_0, 0, ota_0, 0x10000, 1408K,
9+
ota_1, 0, ota_1, 0x170000, 1408K,
10+
uf2, app, factory,0x2d0000, 256K,
11+
ffat, data, fat, 0x310000, 960K,

‎variants/adafruit_funhouse_esp32s2/pins_arduino.h

Copy file name to clipboard
+73Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
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 ""
13+
14+
15+
#define EXTERNAL_NUM_INTERRUPTS 46
16+
#define NUM_DIGITAL_PINS 48
17+
#define NUM_ANALOG_INPUTS 20
18+
19+
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
20+
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
21+
#define digitalPinHasPWM(p) (p < 46)
22+
23+
static const uint8_t PIN_DOTSTAR_DATA = 14;
24+
static const uint8_t PIN_DOTSTAR_CLOCK = 15;
25+
static const uint8_t LED_BUILTIN = 37;
26+
27+
static const uint8_t TX = 2;
28+
static const uint8_t RX = 3;
29+
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;
41+
42+
static const uint8_t SDA = 34;
43+
static const uint8_t SCL = 33;
44+
45+
static const uint8_t SS = 40;
46+
static const uint8_t MOSI = 35;
47+
static const uint8_t SCK = 36;
48+
static const uint8_t MISO = 37;
49+
50+
static const uint8_t A0 = 17;
51+
static const uint8_t A1 = 2;
52+
static const uint8_t A2 = 3;
53+
static const uint8_t A3 = 18; // light sensor
54+
55+
static const uint8_t T1 = 1;
56+
static const uint8_t T2 = 2;
57+
static const uint8_t T3 = 3;
58+
static const uint8_t T4 = 4;
59+
static const uint8_t T5 = 5;
60+
static const uint8_t T6 = 6;
61+
static const uint8_t T7 = 7;
62+
static const uint8_t T8 = 8;
63+
static const uint8_t T9 = 9;
64+
static const uint8_t T10 = 10;
65+
static const uint8_t T11 = 11;
66+
static const uint8_t T12 = 12;
67+
static const uint8_t T13 = 13;
68+
static const uint8_t T14 = 14;
69+
70+
static const uint8_t DAC1 = 17;
71+
static const uint8_t DAC2 = 18;
72+
73+
#endif /* Pins_Arduino_h */

‎variants/adafruit_funhouse_esp32s2/tinyuf2.bin

Copy file name to clipboard
132 KB
Binary file not shown.

‎variants/adafruit_magtag29_esp32s2/bootloader.bin

Copy file name to clipboard
22.2 KB
Binary file not shown.

‎variants/adafruit_magtag29_esp32s2/partitions.csv

Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# ESP-IDF Partition Table
2+
# Name, Type, SubType, Offset, Size, Flags
3+
# bootloader.bin,, 0x1000, 32K
4+
# partition table, 0x8000, 4K
5+
6+
nvs, data, nvs, 0x9000, 20K,
7+
otadata, data, ota, 0xe000, 8K,
8+
ota_0, 0, ota_0, 0x10000, 1408K,
9+
ota_1, 0, ota_1, 0x170000, 1408K,
10+
uf2, app, factory,0x2d0000, 256K,
11+
ffat, data, fat, 0x310000, 960K,

‎variants/adafruit_magtag29_esp32s2/tinyuf2.bin

Copy file name to clipboard
130 KB
Binary file not shown.

‎variants/adafruit_metro_esp32s2/bootloader.bin

Copy file name to clipboard
22.2 KB
Binary file not shown.

‎variants/adafruit_metro_esp32s2/partitions.csv

Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# ESP-IDF Partition Table
2+
# Name, Type, SubType, Offset, Size, Flags
3+
# bootloader.bin,, 0x1000, 32K
4+
# partition table, 0x8000, 4K
5+
6+
nvs, data, nvs, 0x9000, 20K,
7+
otadata, data, ota, 0xe000, 8K,
8+
ota_0, 0, ota_0, 0x10000, 1408K,
9+
ota_1, 0, ota_1, 0x170000, 1408K,
10+
uf2, app, factory,0x2d0000, 256K,
11+
ffat, data, fat, 0x310000, 960K,

‎variants/adafruit_metro_esp32s2/tinyuf2.bin

Copy file name to clipboard
128 KB
Binary file not shown.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.