From b45d4b5e011ff0db677b810fb88bc4bc9303aa3d Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Mon, 14 Jul 2008 02:09:43 +0000
Subject: [PATCH] Allowing per-board specification of upload.using.  If not
 given for a board, falls back on the global preference.

---
 app/AvrdudeUploader.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/AvrdudeUploader.java b/app/AvrdudeUploader.java
index 27b1c2b91..20d4c774e 100755
--- a/app/AvrdudeUploader.java
+++ b/app/AvrdudeUploader.java
@@ -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);
     }