Skip to content

Commit 1555225

Browse files
committed
fix(merge): New name and description for custom merge tool and change partitions table to variants folder
1 parent b07d38e commit 1555225

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

boards.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50553,8 +50553,8 @@ kodedot.name=kode dot
5055350553
kodedot.bootloader.tool=esptool_py
5055450554
kodedot.bootloader.tool.default=esptool_py
5055550555

50556-
kodedot.upload.tool=esptool_py_nomerge
50557-
kodedot.upload.tool.default=esptool_py_nomerge
50556+
kodedot.upload.tool=esptool_py_app_only
50557+
kodedot.upload.tool.default=esptool_py_app_only
5055850558
kodedot.upload.tool.network=esp_ota
5055950559

5056050560
kodedot.upload.maximum_size=8388608
@@ -50590,7 +50590,7 @@ kodedot.build.flash_size=16MB
5059050590
kodedot.build.flash_freq=80m
5059150591
kodedot.build.flash_mode=dio
5059250592

50593-
kodedot.build.partitions=kodedot_partitions
50593+
kodedot.build.custom_partitions=kodedot_partitions
5059450594

5059550595
kodedot.build.psram_type=qspi
5059650596
kodedot.build.defines=

platform.txt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -332,15 +332,17 @@ tools.dfu-util.upload.params.quiet=
332332
tools.dfu-util.upload.pattern="{path}/{cmd}" --device {vid.0}:{pid.0} -D "{build.path}/{build.project_name}.bin" -Q
333333

334334
## --------------------------------------------------------------------------
335-
## Custom tool for Kode Dot: esptool_py_nomerge
335+
## esptool_py_app_only is used to upload only the application image
336+
## It won't upload the bootloader or any other binary except for the main application
336337
## --------------------------------------------------------------------------
337-
tools.esptool_py_nomerge.path={runtime.tools.esptool_py.path}
338-
tools.esptool_py_nomerge.cmd=esptool
339-
tools.esptool_py_nomerge.cmd.windows=esptool.exe
338+
tools.esptool_py_app_only.path={runtime.tools.esptool_py.path}
339+
tools.esptool_py_app_only.cmd=esptool
340+
tools.esptool_py_app_only.cmd.windows=esptool.exe
340341

341-
tools.esptool_py_nomerge.upload.protocol=serial
342-
tools.esptool_py_nomerge.upload.params.verbose=
343-
tools.esptool_py_nomerge.upload.params.quiet=
342+
tools.esptool_py_app_only.upload.protocol=serial
343+
tools.esptool_py_app_only.upload.params.verbose=
344+
tools.esptool_py_app_only.upload.params.quiet=
344345

345-
tools.esptool_py_nomerge.upload.pattern_args=--chip {build.mcu} --port "{serial.port}" --baud {upload.speed} {upload.flags} --before default_reset --after hard_reset write_flash --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size {build.flash_size} {build.flash_offset} "{build.path}/{build.project_name}.bin" {upload.extra_flags}
346-
tools.esptool_py_nomerge.upload.pattern="{path}/{cmd}" {tools.esptool_py_nomerge.upload.pattern_args}
346+
tools.esptool_py_app_only.upload.pattern_args=--chip {build.mcu} --port "{serial.port}" --baud {upload.speed} {upload.flags} --before default_reset --after hard_reset write_flash --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size {build.flash_size} {build.flash_offset} "{build.path}/{build.project_name}.bin" {upload.extra_flags}
347+
348+
tools.esptool_py_app_only.upload.pattern="{path}/{cmd}" {tools.esptool_py_app_only.upload.pattern_args}

0 commit comments

Comments
 (0)