Skip to content

Commit 5128a06

Browse files
committed
Merge pull request #2614 from championswimmer/ide-1.6.0-renamerecipe
rename hex -> output
2 parents fc82553 + 79a74aa commit 5128a06

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

arduino-core/src/processing/app/debug/Compiler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ public boolean compile(boolean _verbose) throws RunnerException, PreferencesMapE
405405

406406
// 6. build the .hex file
407407
progressListener.progress(80);
408-
runRecipe("recipe.objcopy.hex.pattern");
408+
runRecipe("recipe.objcopy.output.pattern");
409409

410410
progressListener.progress(90);
411411
return true;

hardware/arduino/avr/platform.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f
6565
recipe.objcopy.eep.pattern="{compiler.path}{compiler.objcopy.cmd}" {compiler.objcopy.eep.flags} {compiler.objcopy.eep.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.eep"
6666

6767
## Create hex
68-
recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
68+
recipe.objcopy.output.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
6969

7070
## Compute size
7171
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"

hardware/arduino/sam/platform.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f
6969
recipe.objcopy.eep.pattern=
7070

7171
## Create hex
72-
recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin"
72+
recipe.objcopy.output.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin"
7373

7474
## Compute size
7575
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"

0 commit comments

Comments
 (0)