Skip to content

Commit 39ee7d4

Browse files
Jason2866Jason2866
authored
Update esptool.py v5.0.0-dev and boards.json
1 parent 2d25c1b commit 39ee7d4

22 files changed

+120
-44
lines changed

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
Espressif Systems is a privately held, fabless semiconductor company renowned for delivering cost-effective wireless communication microcontrollers. Their innovative solutions are widely adopted in mobile devices and Internet of Things (IoT) applications around the globe.
88

99
## General
10-
1110
* Issues with boards (wrong / missing). All issues caused from boards will not be fixed from the maintainer(s). A PR needs to be provided against branch `develop` to solve.
1211
* No support for the Arduino Nora Nano board, issues needs to be solved by the community
1312
## IDE Preparation

‎boards/esp32-s3-devkitc1-n16r2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"platforms": [
4343
"espressif32"
4444
],
45-
"name": "Espressif ESP32-S3-DevKitC-1-N8R8 (16 MB Flash Quad, 2 MB PSRAM Quad)",
45+
"name": "Espressif ESP32-S3-DevKitC-1-N16R2 (16 MB Flash Quad, 2 MB PSRAM Quad)",
4646
"upload": {
4747
"flash_size": "8MB",
4848
"maximum_ram_size": 327680,

‎boards/esp32-s3-devkitc1-n4r2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"platforms": [
4343
"espressif32"
4444
],
45-
"name": "Espressif ESP32-S3-DevKitC-1-N8R8 (4 MB Flash Quad, 2 MB PSRAM Quad)",
45+
"name": "Espressif ESP32-S3-DevKitC-1-N4R2 (4 MB Flash Quad, 2 MB PSRAM Quad)",
4646
"upload": {
4747
"flash_size": "8MB",
4848
"maximum_ram_size": 327680,

‎boards/esp32-s3-devkitc1-n4r8.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"platforms": [
4343
"espressif32"
4444
],
45-
"name": "Espressif ESP32-S3-DevKitC-1-N8R8 (4 MB Flash Quad, 8 MB PSRAM Octal)",
45+
"name": "Espressif ESP32-S3-DevKitC-1-N4R8 (4 MB Flash Quad, 8 MB PSRAM Octal)",
4646
"upload": {
4747
"flash_size": "8MB",
4848
"maximum_ram_size": 327680,

‎boards/esp32-s3-devkitc1-n8r2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"platforms": [
4343
"espressif32"
4444
],
45-
"name": "Espressif ESP32-S3-DevKitC-1-N8R8 (8 MB Flash Quad, 2 MB PSRAM quad)",
45+
"name": "Espressif ESP32-S3-DevKitC-1-N8R2 (8 MB Flash Quad, 2 MB PSRAM quad)",
4646
"upload": {
4747
"flash_size": "8MB",
4848
"maximum_ram_size": 327680,

‎boards/feenove-esp32-s3-n8r8.json renamed to ‎boards/freenove-esp32-s3-n8r8.json

File renamed without changes.

‎boards/um_bling.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
"flash_size": "8MB",
4242
"maximum_ram_size": 327680,
4343
"maximum_size": 8388608,
44-
"use_1200bps_touch": true,
45-
"wait_for_upload_port": true,
4644
"require_upload_port": true,
4745
"speed": 460800
4846
},

‎boards/um_edges3_d.json

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"build": {
3+
"arduino":{
4+
"partitions": "default_8MB.csv",
5+
"memory_type": "qio_qspi"
6+
},
7+
"core": "esp32",
8+
"extra_flags": [
9+
"-DARDUINO_EDGES3[D]",
10+
"-DBOARD_HAS_PSRAM",
11+
"-DARDUINO_USB_CDC_ON_BOOT=1",
12+
"-DARDUINO_USB_MODE=1",
13+
"-DARDUINO_RUNNING_CORE=1",
14+
"-DARDUINO_EVENT_RUNNING_CORE=1"
15+
],
16+
"f_cpu": "240000000L",
17+
"f_flash": "80000000L",
18+
"flash_mode": "qio",
19+
"hwids": [
20+
[
21+
"0X303A",
22+
"0x82DC"
23+
]
24+
],
25+
"mcu": "esp32s3",
26+
"variant": "um_edges3_d"
27+
},
28+
"connectivity": [
29+
"bluetooth",
30+
"wifi"
31+
],
32+
"debug": {
33+
"openocd_target": "esp32s3.cfg"
34+
},
35+
"frameworks": [
36+
"arduino",
37+
"espidf"
38+
],
39+
"name": "Unexpected Maker EDGES3[D]",
40+
"upload": {
41+
"flash_size": "8MB",
42+
"maximum_ram_size": 327680,
43+
"maximum_size": 8388608,
44+
"require_upload_port": true,
45+
"speed": 460800
46+
},
47+
"url": "https://unexpectedmaker.com/",
48+
"vendor": "Unexpected Maker"
49+
}

‎boards/um_feathers2.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
"flash_size": "16MB",
3737
"maximum_ram_size": 327680,
3838
"maximum_size": 16777216,
39-
"use_1200bps_touch": true,
40-
"wait_for_upload_port": true,
4139
"require_upload_port": true,
4240
"speed": 921600
4341
},

‎boards/um_feathers2_neo.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
"flash_size": "4MB",
3737
"maximum_ram_size": 327680,
3838
"maximum_size": 4194304,
39-
"use_1200bps_touch": true,
40-
"wait_for_upload_port": true,
4139
"require_upload_port": true,
4240
"speed": 921600
4341
},

‎boards/um_feathers3.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
"flash_size": "16MB",
4242
"maximum_ram_size": 327680,
4343
"maximum_size": 16777216,
44-
"use_1200bps_touch": true,
45-
"wait_for_upload_port": true,
4644
"require_upload_port": true,
4745
"speed": 460800
4846
},

‎boards/um_feathers3_neo.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
"flash_size": "8MB",
4242
"maximum_ram_size": 327680,
4343
"maximum_size": 8388608,
44-
"use_1200bps_touch": true,
45-
"wait_for_upload_port": true,
4644
"require_upload_port": true,
4745
"speed": 460800
4846
},

‎boards/um_nanos3.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
"flash_size": "8MB",
4242
"maximum_ram_size": 327680,
4343
"maximum_size": 8388608,
44-
"use_1200bps_touch": true,
45-
"wait_for_upload_port": true,
4644
"require_upload_port": true,
4745
"speed": 460800
4846
},

‎boards/um_omgs3.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
"flash_size": "8MB",
4242
"maximum_ram_size": 327680,
4343
"maximum_size": 8388608,
44-
"use_1200bps_touch": true,
45-
"wait_for_upload_port": true,
4644
"require_upload_port": true,
4745
"speed": 460800
4846
},

‎boards/um_pros3.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
"flash_size": "16MB",
4242
"maximum_ram_size": 327680,
4343
"maximum_size": 16777216,
44-
"use_1200bps_touch": true,
45-
"wait_for_upload_port": true,
4644
"require_upload_port": true,
4745
"speed": 460800
4846
},

‎boards/um_rmp.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
"flash_size": "4MB",
3737
"maximum_ram_size": 327680,
3838
"maximum_size": 4194304,
39-
"use_1200bps_touch": true,
40-
"wait_for_upload_port": true,
4139
"require_upload_port": true,
4240
"speed": 921600
4341
},

‎boards/um_squixl.json

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"partitions": "default_16MB.csv",
5+
"memory_type": "qio_opi"
6+
},
7+
"core": "esp32",
8+
"extra_flags": [
9+
"-DBOARD_HAS_PSRAM",
10+
"-DARDUINO_SQUIXL",
11+
"-DARDUINO_USB_CDC_ON_BOOT=1",
12+
"-DARDUINO_USB_MODE=1",
13+
"-DARDUINO_RUNNING_CORE=1",
14+
"-DARDUINO_EVENT_RUNNING_CORE=1"
15+
],
16+
"f_cpu": "240000000L",
17+
"f_flash": "80000000L",
18+
"flash_mode": "qio",
19+
"hwids": [
20+
[
21+
"0x303A",
22+
"0x82DF"
23+
]
24+
],
25+
"mcu": "esp32s3",
26+
"variant": "um_squixl"
27+
},
28+
"connectivity": [
29+
"bluetooth",
30+
"wifi"
31+
],
32+
"debug": {
33+
"openocd_target": "esp32s3.cfg"
34+
},
35+
"frameworks": [
36+
"arduino",
37+
"espidf"
38+
],
39+
"name": "Unexpected Maker SQUiXL",
40+
"upload": {
41+
"flash_size": "16MB",
42+
"maximum_ram_size": 327680,
43+
"maximum_size": 8388608,
44+
"require_upload_port": true,
45+
"speed": 460800
46+
},
47+
"url": "https://unexpectedmaker.com/shop/squixl",
48+
"vendor": "Unexpected Maker"
49+
}

‎boards/um_tinys2.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
"flash_size": "4MB",
3838
"maximum_ram_size": 327680,
3939
"maximum_size": 4194304,
40-
"use_1200bps_touch": true,
41-
"wait_for_upload_port": true,
4240
"require_upload_port": true,
4341
"speed": 921600
4442
},

‎boards/um_tinys3.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
"flash_size": "8MB",
4242
"maximum_ram_size": 327680,
4343
"maximum_size": 8388608,
44-
"use_1200bps_touch": true,
45-
"wait_for_upload_port": true,
4644
"require_upload_port": true,
4745
"speed": 460800
4846
},

‎builder/frameworks/espidf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ def _get_installed_standard_pip_packages():
8989
"wheel": ">=0.35.1",
9090
"rich-click": ">=1.8.6",
9191
"PyYAML": ">=6.0.2",
92+
"intelhex": ">=2.3.0",
9293
"rich": ">=14.0.0",
9394
"esp-idf-size": ">=1.6.1"
9495
}

‎builder/main.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ def __fetch_fs_size(target, source, env):
270270
"--chip", mcu,
271271
"--port", '"$UPLOAD_PORT"'
272272
],
273-
ERASECMD='"$PYTHONEXE" "$OBJCOPY" $ERASEFLAGS erase_flash',
273+
ERASECMD='"$PYTHONEXE" "$OBJCOPY" $ERASEFLAGS erase-flash',
274274

275275
# mkspiffs package contains two different binaries for IDF and Arduino
276276
MKFSTOOL="mk%s" % filesystem
@@ -323,9 +323,9 @@ def check_lib_archive_exists():
323323
action=env.VerboseAction(" ".join([
324324
'"$PYTHONEXE" "$OBJCOPY"',
325325
"--chip", mcu, "elf2image",
326-
"--flash_mode", "${__get_board_flash_mode(__env__)}",
327-
"--flash_freq", "${__get_board_f_image(__env__)}",
328-
"--flash_size", board.get("upload.flash_size", "4MB"),
326+
"--flash-mode", "${__get_board_flash_mode(__env__)}",
327+
"--flash-freq", "${__get_board_f_image(__env__)}",
328+
"--flash-size", board.get("upload.flash_size", "4MB"),
329329
"-o", "$TARGET", "$SOURCES"
330330
]), "Building $TARGET"),
331331
suffix=".bin"
@@ -479,12 +479,12 @@ def firmware_metrics(target, source, env):
479479
"--chip", mcu,
480480
"--port", '"$UPLOAD_PORT"',
481481
"--baud", "$UPLOAD_SPEED",
482-
"--before", board.get("upload.before_reset", "default_reset"),
483-
"--after", board.get("upload.after_reset", "hard_reset"),
484-
"write_flash", "-z",
485-
"--flash_mode", "${__get_board_flash_mode(__env__)}",
486-
"--flash_freq", "${__get_board_f_image(__env__)}",
487-
"--flash_size", "detect"
482+
"--before", board.get("upload.before_reset", "default-reset"),
483+
"--after", board.get("upload.after_reset", "hard-reset"),
484+
"write-flash", "-z",
485+
"--flash-mode", "${__get_board_flash_mode(__env__)}",
486+
"--flash-freq", "${__get_board_f_image(__env__)}",
487+
"--flash-size", "detect"
488488
],
489489
UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $ESP32_APP_OFFSET $SOURCE'
490490
)
@@ -497,12 +497,12 @@ def firmware_metrics(target, source, env):
497497
"--chip", mcu,
498498
"--port", '"$UPLOAD_PORT"',
499499
"--baud", "$UPLOAD_SPEED",
500-
"--before", board.get("upload.before_reset", "default_reset"),
501-
"--after", board.get("upload.after_reset", "hard_reset"),
502-
"write_flash", "-z",
503-
"--flash_mode", "${__get_board_flash_mode(__env__)}",
504-
"--flash_freq", "${__get_board_f_image(__env__)}",
505-
"--flash_size", "detect",
500+
"--before", board.get("upload.before_reset", "default-reset"),
501+
"--after", board.get("upload.after_reset", "hard-reset"),
502+
"write-flash", "-z",
503+
"--flash-mode", "${__get_board_flash_mode(__env__)}",
504+
"--flash-freq", "${__get_board_f_image(__env__)}",
505+
"--flash-size", "detect",
506506
"$FS_START"
507507
],
508508
UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $SOURCE',

‎platform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"type": "uploader",
9393
"optional": false,
9494
"owner": "pioarduino",
95-
"version": "https://github.com/pioarduino/esptool/releases/download/v4.8.11/esptool.zip"
95+
"version": "https://github.com/pioarduino/esptool/releases/download/v5.0.0-dev/esptool.zip"
9696
},
9797
"tl-install": {
9898
"type": "tool",

0 commit comments

Comments
 (0)