rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-14 11:29:26 +01:00
Code Issues Releases Activity

The "tool" for burning bootloader is now correctly selected from board

Browse Source 
preferences.
This commit is contained in:
Cristian Maglie 2013-03-11 19:08:02 +01:00
parent bed305a556
commit 8ef2fe3faf
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,18 +250,27 @@ public class BasicUploader extends Uploader {
} }
public boolean burnBootloader() throws RunnerException { public boolean burnBootloader() throws RunnerException {
String programmer = Preferences.get("programmer");
TargetPlatform targetPlatform = Base.getTargetPlatform(); TargetPlatform targetPlatform = Base.getTargetPlatform();
// Find preferences for the selected programmer
PreferencesMap programmerPrefs;
String programmer = Preferences.get("programmer");
if (programmer.contains(":")) { if (programmer.contains(":")) {
String[] split = programmer.split(":", 2); String[] split = programmer.split(":", 2);
targetPlatform = Base.getCurrentTargetPlatformFromPackage(split[0]); TargetPlatform platform = Base
.getCurrentTargetPlatformFromPackage(split[0]);
programmer = split[1]; programmer = split[1];
programmerPrefs = platform.getProgrammer(programmer);
} else {
programmerPrefs = targetPlatform.getProgrammer(programmer);
} }
// Build configuration for the current programmer
PreferencesMap prefs = Preferences.getMap(); PreferencesMap prefs = Preferences.getMap();
prefs.putAll(Base.getBoardPreferences()); prefs.putAll(Base.getBoardPreferences());
prefs.putAll(targetPlatform.getProgrammer(programmer)); prefs.putAll(programmerPrefs);
// Add configuration for bootloader tool
String toolName = prefs.get("bootloader.tool"); String toolName = prefs.get("bootloader.tool");
PreferencesMap toolPrefs = targetPlatform.getTool(toolName); PreferencesMap toolPrefs = targetPlatform.getTool(toolName);
if (toolPrefs.size() == 0) if (toolPrefs.size() == 0)
@ -277,12 +286,6 @@ public class BasicUploader extends Uploader {
} }
try { try {
// if (prefs.get("program.disable_flushing") == null
// || prefs.get("program.disable_flushing").toLowerCase().equals("false"))
// {
// flushSerialBuffer();
// }
String pattern = prefs.get("erase.pattern"); String pattern = prefs.get("erase.pattern");
String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true); String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
if (!executeUploadCommand(cmd)) if (!executeUploadCommand(cmd))