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

Allowing per-board specification of upload.using. If not given for a board, falls back on the global preference.

This commit is contained in:
David A. Mellis 2008-07-14 02:09:43 +00:00
parent d349f4bd7c
commit b45d4b5e01
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/AvrdudeUploader.java
View File

@ -39,10 +39,15 @@ public class AvrdudeUploader extends Uploader {
// XXX: add support for uploading sketches using a programmer
public boolean uploadUsingPreferences(String buildPath, String className)
throws RunnerException {
if (Preferences.get("upload.using").equals("bootloader")) {
String uploadUsing = Preferences.get("boards." + Preferences.get("board") + ".upload.using");
if (uploadUsing == null) {
// fall back on global preference
uploadUsing = Preferences.get("upload.using");
}
if (uploadUsing.equals("bootloader")) {
return uploadViaBootloader(buildPath, className);
} else {
Collection params = getProgrammerCommands(Preferences.get("upload.using"));
Collection params = getProgrammerCommands(uploadUsing);
params.add("-Uflash:w:" + buildPath + File.separator + className + ".hex:i");
return avrdude(params);
}