Skip to content

Commit 1f9ee61

Browse files
authored
Update to esptool.py v5.0.0-dev (#197)
1 parent ee24881 commit 1f9ee61

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

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)