arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-08-01 03:47:23 +03:00
Code Activity

Simplified boards.txt file

Browse Source
This commit is contained in:
Cristian Maglie
2012-05-25 17:31:55 +02:00
parent 3f4cbe887d
commit 3fe9246f60
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/processing/app/debug/BasicUploader.java
View File

@ -124,11 +124,14 @@ public class BasicUploader extends Uploader {
prefs.putAll(Base.getBoardPreferences());
prefs.putAll(targetPlatform.getProgrammer(programmer));
prefs.putAll(targetPlatform.getTool(prefs.get("bootloader.tool")));
if (verbose)
if (verbose) {
prefs.put("erase.verbose", prefs.get("erase.params.verbose"));
prefs.put("bootloader.verbose", prefs.get("bootloader.params.verbose"));
else
} else {
prefs.put("erase.verbose", prefs.get("erase.params.quiet"));
prefs.put("bootloader.verbose", prefs.get("bootloader.params.quiet"));
}
try {
// if (prefs.get("program.disable_flushing") == null
// || prefs.get("program.disable_flushing").toLowerCase().equals("false"))
@ -136,13 +139,11 @@ public class BasicUploader extends Uploader {
// flushSerialBuffer();
// }
prefs.put("bootloader.params", prefs.get("bootloader.erase.params"));
String pattern = prefs.get("bootloader.pattern");
String pattern = prefs.get("erase.pattern");
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
if (!executeUploadCommand(cmd))
return false;
prefs.put("bootloader.params", prefs.get("bootloader.write.params"));
pattern = prefs.get("bootloader.pattern");
cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
return executeUploadCommand(cmd);