Skip to content

Commit 4d029de

Browse files
championswimmerFederico Fissore
authored andcommitted
saveHex: rename recipe.hex -> recipe.output
Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
1 parent 4acfc0c commit 4d029de

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

app/src/processing/app/Editor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Part of the Processing project - http://processing.org
55
66
Copyright (c) 2004-09 Ben Fry and Casey Reas
7-
Copyright (c) 2001-04 Massachusetts Institute of Technol("Expoogy
7+
Copyright (c) 2001-04 Massachusetts Institute of Technology
88
99
This program is free software; you can redistribute it and/or modify
1010
it under the terms of the GNU General Public License version 2

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,9 +1160,9 @@ void saveHex() throws RunnerException {
11601160

11611161
String[] cmdArray;
11621162
try {
1163-
String tmp_file = prefs.getOrExcept("recipe.hex.tmp_file");
1163+
String tmp_file = prefs.getOrExcept("recipe.output.tmp_file");
11641164
tmp_file = StringReplacer.replaceFromMapping(tmp_file, dict);
1165-
String save_file = prefs.getOrExcept("recipe.hex.save_file");
1165+
String save_file = prefs.getOrExcept("recipe.output.save_file");
11661166
save_file = StringReplacer.replaceFromMapping(save_file, dict);
11671167

11681168
File hexFile = new File(prefs.get("build.path") + "/" + tmp_file);

hardware/arduino/avr/platform.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ recipe.objcopy.eep.pattern="{compiler.path}{compiler.objcopy.cmd}" {compiler.obj
7272
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"
7373

7474
## Save hex
75-
recipe.hex.tmp_file={build.project_name}.hex
76-
recipe.hex.save_file={build.project_name}.{build.variant}.hex
75+
recipe.output.tmp_file={build.project_name}.hex
76+
recipe.output.save_file={build.project_name}.{build.variant}.hex
7777

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

hardware/arduino/sam/platform.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f
7676
recipe.objcopy.bin.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"
7777

7878
## Save hex
79-
recipe.hex.tmp_file={build.project_name}.bin
80-
recipe.hex.save_file={build.project_name}.{build.variant}.bin
79+
recipe.output.tmp_file={build.project_name}.bin
80+
recipe.output.save_file={build.project_name}.{build.variant}.bin
8181

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

0 commit comments

Comments
 (0)