mirror of
https://github.com/arduino/Arduino.git
synced 2025-01-29 18:52:13 +01:00
Compiler: compiled sketch discovery was missing merged sketch
This commit is contained in:
parent
974fef1000
commit
bf3fc880ac
@ -182,7 +182,14 @@ public class Compiler implements MessageConsumer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static public File findCompiledSketch(PreferencesMap prefs) throws PreferencesMapException {
|
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().
|
Optional<File> sketch = paths.stream().
|
||||||
map(path -> StringReplacer.replaceFromMapping(path, prefs)).
|
map(path -> StringReplacer.replaceFromMapping(path, prefs)).
|
||||||
map(File::new).
|
map(File::new).
|
||||||
|
Loading…
x
Reference in New Issue
Block a user