From 3fe9246f603bacc09f0e9b9495469570e78c46d2 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Fri, 25 May 2012 17:31:55 +0200
Subject: [PATCH] Simplified boards.txt file

---
 app/src/processing/app/debug/BasicUploader.java | 13 +++++++------
 hardware/arduino/avr/boards.txt                 | 14 ++++++++------
 hardware/arduino/avr/platform.txt               |  6 +++++-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/src/processing/app/debug/BasicUploader.java b/app/src/processing/app/debug/BasicUploader.java
index 76a4aea19..cb369d657 100644
--- a/app/src/processing/app/debug/BasicUploader.java
+++ b/app/src/processing/app/debug/BasicUploader.java
@@ -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);
diff --git a/hardware/arduino/avr/boards.txt b/hardware/arduino/avr/boards.txt
index c6124e03b..b6d742589 100644
--- a/hardware/arduino/avr/boards.txt
+++ b/hardware/arduino/avr/boards.txt
@@ -14,9 +14,7 @@ uno.bootloader.high_fuses=0xDE
 uno.bootloader.extended_fuses=0x05
 uno.bootloader.unlock_bits=0x3F
 uno.bootloader.lock_bits=0x0F
-uno.bootloader.erase.params=-e -Ulock:w:{bootloader.unlock_bits}:m -Uefuse:w:{bootloader.extended_fuses}:m -Uhfuse:w:{bootloader.high_fuses}:m -Ulfuse:w:{bootloader.low_fuses}:m
-uno.bootloader.write.params=-Uflash:w:{bootloader.file}:i -Ulock:w:{bootloader.lock_bits}:m
-uno.bootloader.file={runtime.ide.path}/hardware/arduino/avr/optiboot/optiboot_atmega328.hex
+uno.bootloader.file=optiboot/optiboot_atmega328.hex
 
 uno.build.mcu=atmega328p
 uno.build.f_cpu=16000000L
@@ -153,24 +151,28 @@ mega.build.variant=mega
 ##############################################################
 
 leonardo.name=Arduino Leonardo
+leonardo.upload.tool=avrdude
 leonardo.upload.protocol=avr109
 leonardo.upload.maximum_size=28672
 leonardo.upload.speed=57600
 leonardo.upload.disable_flushing=true
+leonardo.upload.use_1200bps_touch=true
+
+leonardo.bootloader.tool=avrdude
 leonardo.bootloader.low_fuses=0xff
 leonardo.bootloader.high_fuses=0xd8
 leonardo.bootloader.extended_fuses=0xcb
-leonardo.bootloader.path=caterina
-leonardo.bootloader.file=Caterina-Leonardo.hex
+leonardo.bootloader.file=caterina/Caterina-Leonardo.hex
 leonardo.bootloader.unlock_bits=0x3F
 leonardo.bootloader.lock_bits=0x2F
+
 leonardo.build.mcu=atmega32u4
 leonardo.build.f_cpu=16000000L
 leonardo.build.vid=0x2341
 leonardo.build.pid=0x8036
 leonardo.build.core=arduino
 leonardo.build.variant=leonardo
-leonardo.build.extra_flags=-DUSB_VID={build.vid} -DDUSB_PID={build.pid}
+leonardo.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
 
 ##############################################################
 
diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
index 8d2acdd21..fcf425f72 100644
--- a/hardware/arduino/avr/platform.txt
+++ b/hardware/arduino/avr/platform.txt
@@ -62,7 +62,11 @@ tools.avrdude.program.params.verbose=-v -v -v -v
 tools.avrdude.program.params.quiet=-q -q
 tools.avrdude.program.pattern="{path}/{cmd}" "-C{config.path}" {program.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{build.path}/{build.project_name}.hex:i"
 
+tools.avrdude.erase.params.verbose=-v -v -v -v
+tools.avrdude.erase.params.quiet=-q -q
+tools.avrdude.erase.pattern="{path}/{cmd}" "-C{config.path}" {erase.verbose} -p{build.mcu} -c{protocol} {program.extra_params} -e -Ulock:w:{bootloader.unlock_bits}:m -Uefuse:w:{bootloader.extended_fuses}:m -Uhfuse:w:{bootloader.high_fuses}:m -Ulfuse:w:{bootloader.low_fuses}:m
+
 tools.avrdude.bootloader.params.verbose=-v -v -v -v
 tools.avrdude.bootloader.params.quiet=-q -q
-tools.avrdude.bootloader.pattern="{path}/{cmd}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} {bootloader.params}
+tools.avrdude.bootloader.pattern="{path}/{cmd}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{runtime.ide.path}/hardware/arduino/avr/bootloaders/{bootloader.file}:i" -Ulock:w:{bootloader.lock_bits}:m