noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compiler: compiled sketch discovery was missing merged sketch

This commit is contained in:
Federico Fissore 2015-07-07 16:42:03 +02:00
parent 974fef1000
commit bf3fc880ac
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arduino-core/src/processing/app/debug/Compiler.java
View File

@ -182,7 +182,14 @@ public class Compiler implements MessageConsumer {
}
static public File findCompiledSketch(PreferencesMap prefs) throws PreferencesMapException {
List<String> paths = Arrays.asList("{build.path}/{build.project_name}.hex", "{build.path}/{build.project_name}.bin");
List<String> paths = Arrays.asList(
"{build.path}/sketch/{build.project_name}.with_bootloader.hex",
"{build.path}/sketch/{build.project_name}.hex",
"{build.path}/{build.project_name}.with_bootloader.hex",
"{build.path}/{build.project_name}.hex",
"{build.path}/sketch/{build.project_name}.bin",
"{build.path}/{build.project_name}.bin"
);
Optional<File> sketch = paths.stream().
map(path -> StringReplacer.replaceFromMapping(path, prefs)).
map(File::new).