From 79a74aa66736795ce5ae6b524f0379904c64b213 Mon Sep 17 00:00:00 2001 From: Arnav Gupta Date: Tue, 10 Feb 2015 04:31:51 +0530 Subject: [PATCH] rename hex -> output using generic term 'output', because for samx32, output is .bin format and not .hex Signed-off-by: Arnav Gupta --- arduino-core/src/processing/app/debug/Compiler.java | 2 +- hardware/arduino/avr/platform.txt | 2 +- hardware/arduino/sam/platform.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arduino-core/src/processing/app/debug/Compiler.java b/arduino-core/src/processing/app/debug/Compiler.java index 652d7c77fcf..48e5250b8a5 100644 --- a/arduino-core/src/processing/app/debug/Compiler.java +++ b/arduino-core/src/processing/app/debug/Compiler.java @@ -405,7 +405,7 @@ public boolean compile(boolean _verbose) throws RunnerException, PreferencesMapE // 6. build the .hex file progressListener.progress(80); - runRecipe("recipe.objcopy.hex.pattern"); + runRecipe("recipe.objcopy.output.pattern"); progressListener.progress(90); return true; diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt index 834774614ef..04499b097d0 100644 --- a/hardware/arduino/avr/platform.txt +++ b/hardware/arduino/avr/platform.txt @@ -65,7 +65,7 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f 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" ## Create hex -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" +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" ## Compute size recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf" diff --git a/hardware/arduino/sam/platform.txt b/hardware/arduino/sam/platform.txt index 85522faf4d0..ce95c886abb 100644 --- a/hardware/arduino/sam/platform.txt +++ b/hardware/arduino/sam/platform.txt @@ -69,7 +69,7 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f recipe.objcopy.eep.pattern= ## Create hex -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" +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" ## Compute size recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"