arduino
diff --git a/‎.project
-17 b/‎.project
-17
diff --git a/‎app/.classpath
+3-11 b/‎app/.classpath
+3-11
diff --git a/‎app/src/processing/app/debug/AvrdudeUploader.java
100755100644 b/‎app/src/processing/app/debug/AvrdudeUploader.java
100755100644
diff --git a/‎app/src/processing/app/debug/BossaCUploader.java
+104 b/‎app/src/processing/app/debug/BossaCUploader.java
+104
diff --git a/‎app/src/processing/app/debug/Sizer.java
+53-40 b/‎app/src/processing/app/debug/Sizer.java
+53-40
diff --git a/‎app/src/processing/app/debug/Uploader.java
100755100644 b/‎app/src/processing/app/debug/Uploader.java
100755100644
diff --git a/‎build/linux/dist/tools/bossac
54.6 KB b/‎build/linux/dist/tools/bossac
54.6 KB
diff --git a/‎build/linux/dist/tools/bossac64
56.9 KB b/‎build/linux/dist/tools/bossac64
56.9 KB
diff --git a/‎build/macosx/dist/CodeSourcery_arm.zip
34 MB b/‎build/macosx/dist/CodeSourcery_arm.zip
34 MB
diff --git a/‎build/macosx/dist/bossac
76.6 KB b/‎build/macosx/dist/bossac
76.6 KB
diff --git a/‎build/macosx/template.dmg.gz
288 KB b/‎build/macosx/template.dmg.gz
288 KB
diff --git a/‎build/windows/CodeSourcery_arm.zip
45.7 MB b/‎build/windows/CodeSourcery_arm.zip
45.7 MB
diff --git a/‎build/windows/bossac.exe
211 KB b/‎build/windows/bossac.exe
211 KB
diff --git a/‎build/windows/dist/drivers/bossa.inf
+48 b/‎build/windows/dist/drivers/bossa.inf
+48
diff --git a/‎hardware/sam/boards.txt
+54 b/‎hardware/sam/boards.txt
+54
@@ -2,19 +2,11 @@
 <classpath>
 	<classpathentry excluding="processing/app/tools/format/" kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/dxf"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/net"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/opengl">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="opengl/library"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/pdf"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/serial"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/video"/>
 	<classpathentry kind="lib" path="lib/antlr.jar"/>
 	<classpathentry kind="lib" path="lib/jna.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
+	<classpathentry kind="lib" path="lib/apple.jar"/>
+	<classpathentry kind="lib" path="lib/RXTXcomm.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -0,0 +1,104 @@
+/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+ AvrdudeUploader - uploader implementation using avrdude
+ Part of the Arduino project - http://www.arduino.cc/
+
+ Copyright (c) 2011 Cristian Maglie
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ $Id$
+ */
+
+package processing.app.debug;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import processing.app.Base;
+import processing.app.Preferences;
+import processing.app.SerialException;
+
+public class BossaCUploader extends Uploader {
+
+  public boolean uploadUsingPreferences(String buildPath, String className,
+                                        boolean usingProgrammer)
+      throws RunnerException, SerialException {
+    List<String> commandDownloader = new ArrayList<String>();
+    String port = Preferences.get("serial.port");
+    if (port.startsWith("/dev/"))
+      port = port.substring(5);
+    commandDownloader.add("--port=" + port);
+    commandDownloader.add("-e");
+    commandDownloader.add("-w");
+    commandDownloader.add("-v");
+    commandDownloader.add("-b");
+    commandDownloader.add(buildPath + File.separator + className + ".bin");
+
+    return bossac(commandDownloader);
+  }
+
+  public boolean burnBootloader() {
+    return true;
+  }
+
+  public boolean bossac(Collection params) throws RunnerException {
+    List commandDownloader = new ArrayList();
+    commandDownloader.add("bossac");
+
+    if (verbose || Preferences.getBoolean("upload.verbose")) {
+      commandDownloader.add("-i");
+      commandDownloader.add("-d");
+    }
+    commandDownloader.addAll(params);
+
+    return executeUploadCommand(commandDownloader);
+  }
+
+  protected boolean executeUploadCommand(List<String> cmdParams)
+      throws RunnerException {
+
+    try {
+      String avrBasePath = Base.getHardwarePath() + "/tools/";
+
+      String[] cmdArray = cmdParams.toArray(new String[0]);
+      cmdArray[0] = avrBasePath + cmdArray[0];
+
+      if (verbose || Preferences.getBoolean("upload.verbose")) {
+        for (String cmd : cmdArray)
+          System.out.print(cmd + " ");
+        System.out.println();
+      }
+
+      Process bossac = Runtime.getRuntime().exec(cmdArray);
+      new MessageSiphon(bossac.getInputStream(), this);
+      new MessageSiphon(bossac.getErrorStream(), this);
+
+      // wait for the process to finish. if interrupted
+      // before waitFor returns, continue waiting
+      int result = bossac.waitFor();
+      if (result != 0)
+        return false;
+      return true;
+    } catch (Exception e) {
+      e.printStackTrace();
+      return false;
+    }
+  }
+
+}
@@ -1,93 +1,106 @@
 /* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-  Sizer - computes the size of a .hex file
-  Part of the Arduino project - http://www.arduino.cc/
+ Sizer - computes the size of a .hex file
+ Part of the Arduino project - http://www.arduino.cc/
 
-  Copyright (c) 2006 David A. Mellis
+ Copyright (c) 2006 David A. Mellis
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
-  $Id$
-*/
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-package processing.app.debug;
+ $Id$
+ */
 
-import processing.app.Base;
+package processing.app.debug;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.text.MessageFormat;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.StringTokenizer;
 
 public class Sizer implements MessageConsumer {
   private String buildPath, sketchName;
+
   private String firstLine;
+
   private long size;
+
   private RunnerException exception;
 
-  public Sizer(String buildPath, String sketchName) {
+  private Map<String, String> prefs;
+
+  public Sizer(String buildPath, String sketchName,
+               Map<String, String> prefs) {
     this.buildPath = buildPath;
     this.sketchName = sketchName;
+    this.prefs = prefs;
   }
-  
+
   public long computeSize() throws RunnerException {
-    String avrBasePath = Base.getAvrBasePath();
-    String commandSize[] = new String[] {
-      avrBasePath + "avr-size",
-      " "
-    };
-    
-    commandSize[1] = buildPath + File.separator + sketchName + ".hex";
+    String args[] = new String[3];
+    args[0] = prefs.get("compiler.path");
+    args[1] = prefs.get("compiler.size.cmd");
+    args[2] = buildPath + File.separator + sketchName;
+
+    String recipe = prefs.get("recipe.size.pattern");
+    MessageFormat compileFormat = new MessageFormat(recipe);
+    String command = compileFormat.format(args);
+    String[] commandArray = command.split("\\|");
 
     int r = 0;
     try {
       exception = null;
       size = -1;
       firstLine = null;
-      Process process = Runtime.getRuntime().exec(commandSize);
+      Process process = Runtime.getRuntime().exec(commandArray);
       MessageSiphon in = new MessageSiphon(process.getInputStream(), this);
       MessageSiphon err = new MessageSiphon(process.getErrorStream(), this);
 
       boolean running = true;
 
-      while(running) {
+      while (running) {
         try {
           if (in.thread != null)
             in.thread.join();
           if (err.thread != null)
             err.thread.join();
           r = process.waitFor();
           running = false;
-        } catch (InterruptedException intExc) { }
+        } catch (InterruptedException intExc) {
+        }
       }
     } catch (Exception e) {
       // The default Throwable.toString() never returns null, but apparently
       // some sub-class has overridden it to do so, thus we need to check for
-      // it.  See: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1166589459
-      exception = new RunnerException(
-        (e.toString() == null) ? e.getClass().getName() + r : e.toString() + r);
+      // it. See: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1166589459
+      if (e.toString() == null)
+        exception = new RunnerException(e.getClass().getName() + r);
+      else
+        exception = new RunnerException(e.toString() + r);
     }
-    
+
     if (exception != null)
       throw exception;
-      
+
     if (size == -1)
       throw new RunnerException(firstLine);
-      
+
     return size;
   }
-  
+
   public void message(String s) {
     if (firstLine == null)
       firstLine = s;
 
@@ -0,0 +1,48 @@
+[Version]                                                       ; Version section
+Signature="$Chicago$"                                           ; All Windows versions
+Class=Ports                                                     ; This is a serial port driver
+ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}                ; Associated GUID
+Provider=%SHUMATECH%                                            ; Driver is provided by SHUMATECH
+DriverVer=05/18/2011,1.0                                        ; Driver version
+
+[DestinationDirs]                                               ; DestinationDirs section
+DefaultDestDir=12                                               ; Default install directory is \drivers or \IOSubSys
+
+[Manufacturer]                                                  ; Manufacturer section
+%SHUMATECH%=ShumaTech,NTamd64                                   ; Only one manufacturer (SHUMATECH), models section is named
+                                                                ; ShumaTech
+
+[ShumaTech]                                                     ; Models section corresponding to SHUMATECH
+%BOSSA%=BOSSA.Install,USB\VID_03EB&PID_6124                     ; Identifies a device with Vendor ID (03EBh) and
+                                                                ; Product ID equal to 6124h. Corresponding Install section
+                                                                ; is named BOSSA.Install
+
+[ShumaTech.NTamd64]                                             ; Models section corresponding to SHUMATECH
+%BOSSA%=BOSSA.Install,USB\VID_03EB&PID_6124                     ; Identifies a device with Vendor ID (03EBh) and
+                                                                ; Product ID equal to 6124h. Corresponding Install section
+                                                                ; is named BOSSA.Install
+
+[BOSSA.Install]                                                 ; Install section
+include=mdmcpq.inf
+CopyFiles=FakeModemCopyFileSection
+AddReg=BOSSA.AddReg                                             ; Registry keys to add are listed in BOSSA.AddReg
+
+[BOSSA.AddReg]                                                  ; AddReg section
+HKR,,DevLoader,,*ntkern
+HKR,,NTMPDriver,,usbser.sys
+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+
+[BOSSA.Install.Services]                                        ; Services section
+AddService=usbser,0x00000002,BOSSA.AddService                   ; Assign usbser as the PnP driver for the device
+
+[BOSSA.AddService]                                              ; Service install section
+DisplayName=%USBSer%                                            ; Name of the serial driver
+ServiceType=1                                                   ; Service kernel driver
+StartType=3                                                     ; Driver is started by the PnP manager
+ErrorControl=1                                                  ; Warn about errors
+ServiceBinary=%12%\usbser.sys                                   ; Driver filename
+
+[Strings]                                                       ; Strings section
+SHUMATECH="ShumaTech"                                           ; String value for the SHUMATECH symbol
+BOSSA="BOSSA Program Port"                                      ; String value for the BOSSA symbol
+USBSer="USB Serial Driver"                                      ; String value for the USBSer symbol
@@ -0,0 +1,54 @@
+##############################################################
+
+sam3s_ek.name=Atmel SAM3S-EK
+sam3s_ek.platform=sam
+sam3s_ek.upload.protocol=sam-ba
+sam3s_ek.upload.maximum_size=49152
+sam3s_ek.upload.speed=115200
+sam3s_ek.bootloader.path=sam3s_boot
+sam3s_ek.bootloader.file=sam3s_boot.bin
+sam3s_ek.build.mcu=cortex-m3
+sam3s_ek.build.f_cpu=64000000L
+sam3s_ek.build.core=sam
+sam3s_ek.build.pins=sam3s_ek
+
+##############################################################
+
+sam3u_ek.name=Atmel SAM3U-EK
+sam3u_ek.platform=sam
+sam3u_ek.upload.protocol=sam-ba
+sam3u_ek.upload.maximum_size=49152
+sam3u_ek.upload.speed=115200
+sam3u_ek.bootloader.path=sam3u_boot
+sam3u_ek.bootloader.file=sam3u_boot.bin
+sam3u_ek.build.mcu=cortex-m3
+sam3u_ek.build.f_cpu=96000000L
+sam3u_ek.build.core=sam
+sam3u_ek.build.pins=sam3u_ek
+
+##############################################################
+
+arduino_due.name=Arduino Due
+arduino_due.platform=sam
+arduino_due.uploader=bossac
+arduino_due.upload.maximum_size=49152
+arduino_due.upload.speed=115200
+#arduino_due.bootloader.path=sam3u_boot
+#arduino_due.bootloader.file=sam3u_boot.bin
+arduino_due.build.mcu=cortex-m3
+arduino_due.build.f_cpu=96000000L
+arduino_due.build.core=sam
+arduino_due.build.pins=arduino_due
+arduino_due.build.extra_flags=-D__SAM3U4E__
+arduino_due.build.extra_include_dirs=system/libsam|system/libsam/include|system/CMSIS/Include|system/libsam/cmsis/sam3u/source/templates|system/libsam/cmsis/sam3u/include
+arduino_due.core.extra_source_dirs=sam
+arduino_due.system.extra_source_dirs=libsam/source|libsam/cmsis/sam3u/source/templates|libsam/cmsis/sam3u/source/templates/gcc
+arduino_due.variants.extra_source_dirs=arduino_due|common
+#hardware/sam/system/libsam/source/
+#hardware/sam/system/libsam/cmsis/sam3u/source/
+#hardware/sam/variants/arduino_due
+#hardware/sam/variants/common
+#hardware/sam/cores/sam
+arduino_due.build.ldscript=linker_scripts/gcc/flash.ld
+
+