Merge 1.6.1 into esp8266

* commit 'b8b2869753d488bfd203615637e1de3912589a92': (68 commits) Updated revisions.txt Fixed wrong path in successful message arduino-core: restored debug info in class files Fixed NPE in case of missing boardData Added missing translations Added windows drivers Added warning for uncertified boards Update revision.txt update revisions.txt SoftwareSerial: match bool API with HardwareSerial Fix to save as to parent folder is needed by all OSs, not just Mac Update revision.txt MacOSX: previous better IDE was missing some pieces. Added MacOSX: better IDE Updated revisions.txt NEW button now behaves as clicking File -> New menu entry. Fixes #2685 Windows: bundled JRE updated to 8u31 build.xml now uses unzip target Added .getParentFile() to saveas for mac. This prevents saving into the sketch itself Compound edits weren't part of the undo/redo dance An undoable action marks the sketh as modified ...
2025-07-30 16:24:09 +03:00 · 2015-03-27 11:17:58 +03:00
parent 22ea72a2d6 b8b2869753
commit c540bbab00
206 changed files with 54576 additions and 5229 deletions
--- a/build/build.xml
+++ b/build/build.xml
@ -5,13 +5,13 @@
  <!--echo message="os.version = ${os.version}" /-->

  <!-- Sets properties for macosx/windows/linux depending on current system -->
-  <condition property="platform" value="macosx-java-latest"><os family="mac" /></condition>
  <condition property="platform" value="macosx">
    <and>
      <os family="mac" />
      <matches string="${os.version}" pattern="^10.[56]." />
    </and>
  </condition>
+  <condition property="platform" value="macosx-java-latest"><os family="mac" /></condition>
  <condition property="platform" value="windows"><os family="windows" /></condition>
  <condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
  <condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
@ -256,36 +256,36 @@

  <target name="macosx-java-latest-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea.jar.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea.jar.zip" />
-      <param name="final_folder" value="${staging_folder}/appbundler" />
-      <param name="dest_folder" value="${staging_folder}/appbundler" />
+      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino2.jar.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea-arduino2.jar.zip" />
+      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
+      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
    </antcall>

    <mkdir dir="${staging_folder}/work" />

-    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler/appbundler-1.0ea.jar"/>
+    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino2/appbundler-1.0ea-arduino2.jar"/>

-    <bundleapp outputDirectory="${staging_folder}/work"
-               name="Arduino"
-               displayName="Arduino"
-               executableName="Arduino"
-               identifier="cc.arduino.Arduino"
-               signature="Pde1"
-               icon="macosx/template.app/Contents/Resources/processing.icns"
-               copyright="Arduino LLC"
-               getInfo="${version}"
-               shortVersion="${version}"
-               version="${revision}"
-               mainClassName="processing.app.Base"
-               minimumsystem="10.7"
-               highresolutioncapable="true">
+    <bundleapp
+            jvmRequired="1.7"
+            outputdirectory="${staging_folder}/work"
+            name="Arduino"
+            displayname="Arduino"
+            executablename="Arduino"
+            identifier="cc.arduino.Arduino"
+            shortversion="${version}"
+            version="${revision}"
+            signature="Pde1"
+            icon="macosx/template.app/Contents/Resources/processing.icns"
+            mainclassname="processing.app.Base"
+            copyright="Arduino LLC"
+            minimumsystemversion="10.7"
+            highresolutioncapable="true">

      <arch name="x86_64"/>
      <arch name="i386"/>

      <classpath refid="runtime.jars"/>
-      <classpath file="./macosx/template.app/Contents/Resources/Java/quaqua.jar"/>

      <option value="-Dapple.awt.application.name=Arduino" />
      <option value="-Dapple.laf.useScreenMenuBar=true"/>
@ -304,12 +304,12 @@
      <!--<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>-->

      <!-- Workaround since the icon parameter for bundleapp doesn't work -->
-      <option value="-Xdock:icon=Contents/Resources/processing.icns"/>
+      <option value="-Xdock:name=Arduino"/>
      <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Arduino"/>
      <option value="-Dfile.encoding=UTF-8"/>

      <option value="-Xms128M"/>
-      <option value="-Xmx256M"/>
+      <option value="-Xmx1024M"/>

      <bundledocument extensions="ino,c,cpp,h"
                      icon="macosx/template.app/Contents/Resources/pde.icns"
@ -322,8 +322,6 @@
    <copy todir="${staging_folder}/work/${staging_hardware_folder}/../">
      <fileset dir="shared" includes="lib/**" />
      <fileset file="shared/revisions.txt" />
-      <file file="macosx/template.app/Contents/Resources/Java/quaqua.jar"/>
-      <fileset file="macosx/template.app/Contents/Resources/Java/libquaqua*" />
    </copy>

    <antcall target="macosx-build-common"/>
@ -334,8 +332,8 @@

    <!-- Unzip AVR tools -->
    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-mac32-gcc-4.8.1.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-mac32-gcc-4.8.1.zip" />
+      <param name="archive_file" value="${staging_folder}/avr-toolchain-mac32-3.4.5.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-mac32-3.4.5.zip" />
      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
    </antcall>
@ -352,7 +350,7 @@

    <antcall target="untar">
      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
-      <param name="archive_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
    </antcall>
@ -370,7 +368,7 @@
    
    <antcall target="unzip">
      <param name="archive_file" value="./libastylej-2.05.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" />
      <param name="final_folder" value="${staging_folder}/libastylej" />
      <param name="dest_folder" value="${staging_folder}" />
    </antcall>
@ -614,7 +612,7 @@

    <antcall target="unzip">
      <param name="archive_file" value="./libastylej-2.05.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" />
      <param name="final_folder" value="${staging_folder}/libastylej" />
      <param name="dest_folder" value="${staging_folder}" />
    </antcall>
@ -626,15 +624,15 @@
    <!-- Unzip ARM tools -->
    <antcall target="untar">
      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
-      <param name="archive_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
    </antcall>

    <!-- Unzip AVR tools -->
    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux32-gcc-4.8.1.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-linux32-gcc-4.8.1.zip" />
+      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux32-3.4.5.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-linux32-3.4.5.zip" />
      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
    </antcall>
@ -644,15 +642,15 @@
    <!-- Unzip ARM tools -->
    <antcall target="untar">
      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
-      <param name="archive_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
    </antcall>

    <!-- Unzip AVR tools -->
    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux64-gcc-4.8.1.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-linux64-gcc-4.8.1.zip" />
+      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux64-3.4.5.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-linux64-3.4.5.zip" />
      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
    </antcall>
@ -757,7 +755,7 @@
      =======================================================
      Arduino for Linux was built. Grab the archive from

-      build/linux/arduino-${version}-${platform}.tar.xz
+      linux/arduino-${version}-${platform}.tar.xz
      =======================================================
    </echo>
  </target>
@ -835,15 +833,15 @@

    <!-- Unzip AVR tools -->
    <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-win32-gcc-4.8.1.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-win32-gcc-4.8.1.zip" />
+      <param name="archive_file" value="${staging_folder}/avr-toolchain-win32-3.4.5.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-win32-3.4.5.zip" />
      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
    </antcall>

    <antcall target="unzip">
      <param name="archive_file" value="./libastylej-2.05.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" />
      <param name="final_folder" value="${staging_folder}/libastylej" />
      <param name="dest_folder" value="${staging_folder}" />
    </antcall>
@ -874,12 +872,12 @@

    <copy todir="windows/work">
      <fileset dir="windows/launcher"
-	       includes="about.bmp, application.ico, config.xml, config_debug.xml"/>
+	       includes="about.bmp, application.ico, config.xml, config_debug.xml, arduino.l4j.ini"/>
    </copy>
    <launch4j configFile="windows/work/config.xml" />
    <launch4j configFile="windows/work/config_debug.xml" />
-    <delete dir="windows/work"
-	    includes="about.bmp, application.ico, config.xml, config_debug.xml" />
+    <delete dir="windows/work" includes="about.bmp, application.ico, config.xml, config_debug.xml" />
+    <copy file="windows/work/arduino.l4j.ini" tofile="windows/work/arduino_debug.l4j.ini" />

    <!-- cygwin requires html, dll, and exe to have the +x flag -->
    <chmod perm="755">
@ -889,7 +887,7 @@
    <!-- Unzip ARM toolchain -->
    <antcall target="untar">
      <param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
-      <param name="archive_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
    </antcall>
@ -920,19 +918,12 @@
  <target name="windows-dist" depends="windows-build"
 	  description="Create .zip files of windows version">

-    <get src="http://downloads.arduino.cc/jre_7u40_windows_i586.zip" dest="windows/jre.zip" usetimestamp="true" skipexisting="true" />
-
-    <unzip dest="windows/work" src="windows/jre.zip" overwrite="false"/>
-
-    <!--
-    <zip basedir="windows/work" 
-	 prefix="arduino-${version}"
-	 destfile="windows/arduino-${version}.zip" />
-    <zip basedir="windows/work" 
-	 prefix="arduino-${version}"
-	 destfile="windows/arduino-${version}-expert.zip" 
-	 excludes="java/**" />
-    -->
+    <antcall target="unzip">
+      <param name="archive_file" value="windows/jre-8u31.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/jre-8u31.zip" />
+      <param name="final_folder" value="${staging_folder}/work/java" />
+      <param name="dest_folder" value="${staging_folder}/work/" />
+    </antcall>

    <zip destfile="windows/arduino-${version}-${platform}.zip" level="9">
      <zipfileset dir="windows/work"
--- a/build/linux/avr-toolchain-linux32-3.4.5.zip.sha
+++ b/build/linux/avr-toolchain-linux32-3.4.5.zip.sha
@ -0,0 +1 @@
+7be134b7daae4160f069725ab4924759c213b171
--- a/build/linux/avr-toolchain-linux32-gcc-4.8.1.zip.sha
+++ b/build/linux/avr-toolchain-linux32-gcc-4.8.1.zip.sha
@ -1 +0,0 @@
-60f9edb4dd033109e22ee9e87cb6f45efd15882e
--- a/build/linux/avr-toolchain-linux64-3.4.5.zip.sha
+++ b/build/linux/avr-toolchain-linux64-3.4.5.zip.sha
@ -0,0 +1 @@
+0c4f955273ba09fe9a5a9bd90b2e8713295ba4b4
--- a/build/linux/avr-toolchain-linux64-gcc-4.8.1.zip.sha
+++ b/build/linux/avr-toolchain-linux64-gcc-4.8.1.zip.sha
@ -1 +0,0 @@
-5b0131ac2ccf20637d16ecc40a0ef2fae48fe73a
--- a/build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha
+++ b/build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha
@ -0,0 +1 @@
+929bc65f3ba6ecb868254a6328f8502ad86fe4e5
--- a/build/macosx/appbundler-1.0ea.jar.zip.sha
+++ b/build/macosx/appbundler-1.0ea.jar.zip.sha
@ -1 +0,0 @@
-28b3ccde1631791575a11f73e5fd0097df566fe2
--- a/build/macosx/avr-toolchain-mac32-3.4.5.zip.sha
+++ b/build/macosx/avr-toolchain-mac32-3.4.5.zip.sha
@ -0,0 +1 @@
+7883269bd9ba654ed6ca943d983c02c8691b858b
--- a/build/macosx/avr-toolchain-mac32-gcc-4.8.1.zip.sha
+++ b/build/macosx/avr-toolchain-mac32-gcc-4.8.1.zip.sha
@ -1 +0,0 @@
-c1c15b14ede121884d17c0360e1f1ad15fb5c98f
--- a/build/macosx/template.app/Contents/Info.plist
+++ b/build/macosx/template.app/Contents/Info.plist
@ -81,7 +81,7 @@
      <key>VMOptions</key>
      <array>
        <string>-Xms128M</string>
-        <string>-Xmx256M</string>
+        <string>-Xmx1024M</string>
      </array>

      <key>MainClass</key>
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@ -1,4 +1,34 @@

+ARDUINO 1.6.1 - 2015.03.10
+
+[ide]
+* Improved Yun detection for upload via network (Ron Guest)
+* In platforms.txt "objcopy" recipe is no more tied to the "hex" format (Arnav Gupta)
+* /dev/cu.* serial ports are now filtered from the port list on MacOSX
+* Ports in ports list are now grouped by type
+* Upgraded avr-gcc toolchains to 3.4.5
+* Fixed: wrong parsing of boards.txt when using submenu and boards id with underscores
+* Windows: updated bundled JVM to latest 8u31
+* Windows: JVM memory settings can be customized editing arduino.l4j.ini and arduino_debug.l4j.ini files
+* "new" button now behaves as "File -> New..." menu: a new window with an empty sketch is created
+* Windows: opening a lonely sketch caused the IDE to crash. Fixed with a bounty on bountysource @gerito1
+* Bridge: fixed bug with multiple and failing YunClient.connect calls @sngl
+* Translations updated
+* Improved SoftSerial library and optimized its memory usage @matthijskooijman
+* Fixed: status board was not changing when using custom menu @PaulStoffregen
+* Fixed: better error message when using a busy serial device
+* Fixed: missing bool operator on EthernetClient
+* Fixed: missing bool operator on SoftSerial
+* MacOSX: back to native file dialogs and buttons, when using experimental version
+* MacOSX: command line interface now works also with java-latest version
+* Improved library name matching @PaulStoffregen. Avoids conflicts with libraries that bundle files equally named
+
+ARDUINO 1.6.0 - 2015.02.09
+
+[ide]
+* Updated help with the latest docs
+* Updated translations
+
 ARDUINO 1.6.0rc3 - 2015.02.03

 [ide]
--- a/build/windows/avr-toolchain-win32-3.4.5.zip.sha
+++ b/build/windows/avr-toolchain-win32-3.4.5.zip.sha
@ -0,0 +1 @@
+e089689f38dbd98acca2e7ae4e1219773afbeecd
--- a/build/windows/avr-toolchain-win32-gcc-4.8.1.zip.sha
+++ b/build/windows/avr-toolchain-win32-gcc-4.8.1.zip.sha
@ -1 +0,0 @@
-21577a37f6f438a25903a3338c448385c0c87aeb
--- a/build/windows/dist/cyggcc_s-1.dll
+++ b/build/windows/dist/cyggcc_s-1.dll
--- a/build/windows/dist/cygiconv-2.dll
+++ b/build/windows/dist/cygiconv-2.dll
--- a/build/windows/dist/cygwin1.dll
+++ b/build/windows/dist/cygwin1.dll
--- a/build/windows/dist/cygz.dll
+++ b/build/windows/dist/cygz.dll
--- a/build/windows/dist/drivers/arduino-org.cat
+++ b/build/windows/dist/drivers/arduino-org.cat
--- a/build/windows/dist/drivers/arduino-org.inf
+++ b/build/windows/dist/drivers/arduino-org.inf
@ -0,0 +1,168 @@
+; Copyright 2012 Blacklabel Development, Inc.
+
+[Strings]
+DriverPackageDisplayName="Arduino USB Driver"
+ManufacturerName="Arduino Srl (www.arduino.org)"
+ServiceName="USB RS-232 Emulation Driver"
+
+due.bossa.name="Bossa Program Port"
+due.programming_port.name="Arduino Due Programming Port"
+due.sketch.name="Arduino Due"
+esplora.bootloader.name="Arduino Esplora bootloader"
+esplora.sketch.name="Arduino Esplora"
+leonardo.bootloader.name="Arduino Leonardo bootloader"
+leonardo.sketch.name="Arduino Leonardo"
+lilypadUSB.bootloader.name="Arduino LilyPad USB bootloader"
+lilypadUSB.sketch.name="Arduino LilyPad USB"
+mega2560.name="Arduino Mega 2560"
+mega2560rev3.name="Arduino Mega 2560"
+megaADK.name="Arduino Mega ADK"
+megaADKrev3.name="Arduino Mega ADK"
+micro.bootloader.name="Arduino Micro bootloader"
+micro.sketch.name="Arduino Micro"
+unoR3.name="Arduino Uno"
+usbserial.name="Arduino USB Serial Light Adapter"
+robotControl.bootloader.name="Arduino Robot Control bootloader"
+robotControl.sketch.name="Arduino Robot"
+robotMotor.bootloader.name="Arduino Robot Motor bootloader"
+robotMotor.sketch.name="Arduino Robot"
+yun.bootloader.name="Arduino Yun bootloader"
+yun.sketch.name="Arduino Yun"
+
+zero_pro.edbg.name="Atmel Corp. EDBG USB Port"
+zero.usbport.name="Arduino Zero Native Port"
+zero_pro.usbport.name="Arduino Zero PRO Native Port"
+zero_boot.usbport.name="Arduino Zero (Bootloader Mode) - Native Port"
+zero_pro_boot.usbport.name="Arduino Zero PRO (Bootloader Mode) Native Port"
+
+[DefaultInstall]
+CopyINF=arduino-org.inf
+
+[Version]
+Class=Ports
+ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
+Signature="$Windows NT$"
+Provider=%ManufacturerName%
+DriverPackageDisplayName=%DriverPackageDisplayName%
+CatalogFile=arduino-org.cat
+DriverVer=02/27/2014,1.1.0.0
+
+[Manufacturer]
+%ManufacturerName%=DeviceList, NTamd64, NTia64
+
+[DestinationDirs]
+FakeModemCopyFileSection=12
+DefaultDestDir=12
+
+[DeviceList]
+%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
+%due.programming_port.name%=DriverInstall, USB\VID_2A03&PID_003D
+%due.sketch.name%=DriverInstall, USB\VID_2A03&PID_003E&MI_00
+%esplora.bootloader.name%=DriverInstall, USB\VID_2A03&PID_003C
+%esplora.sketch.name%=DriverInstall, USB\VID_2A03&PID_803C&MI_00
+%leonardo.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0036
+%leonardo.sketch.name%=DriverInstall, USB\VID_2A03&PID_8036&MI_00
+%lilypadUSB.bootloader.name%=DriverInstall, USB\VID_1B4F&PID_9207
+%lilypadUSB.sketch.name%=DriverInstall, USB\VID_1B4F&PID_9208&MI_00
+%mega2560rev3.name%=DriverInstall, USB\VID_2A03&PID_0042
+%mega2560.name%=DriverInstall, USB\VID_2A03&PID_0010
+%megaADK.name%=DriverInstall, USB\VID_2A03&PID_003F
+%megaADKrev3.name%=DriverInstall, USB\VID_2A03&PID_0044
+%micro.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0037
+%micro.sketch.name%=DriverInstall, USB\VID_2A03&PID_8037&MI_00
+%unoR3.name%=DriverInstall, USB\VID_2A03&PID_0043
+%usbserial.name%=DriverInstall, USB\VID_2A03&PID_003B
+%robotControl.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0038
+%robotControl.sketch.name%=DriverInstall, USB\VID_2A03&PID_8038&MI_00
+%robotMotor.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0039
+%robotMotor.sketch.name%=DriverInstall, USB\VID_2A03&PID_8039&MI_00
+%yun.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0041
+%yun.sketch.name%=DriverInstall, USB\VID_2A03&PID_8041&MI_00
+
+%zero_pro.edbg.name%=DriverInstall, USB\VID_03EB&PID_2111&MI_01
+%zero.usbport.name%=DriverInstall, USB\VID_2A03&PID_804E
+%zero_pro.usbport.name%=DriverInstall, USB\VID_2A03&PID_804D
+%zero_boot.usbport.name%=DriverInstall, USB\VID_2A03&PID_004E
+%zero_pro_boot.usbport.name%=DriverInstall, USB\VID_2A03&PID_004D
+
+[DeviceList.NTamd64]
+%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
+%due.programming_port.name%=DriverInstall, USB\VID_2A03&PID_003D
+%due.sketch.name%=DriverInstall, USB\VID_2A03&PID_003E&MI_00
+%esplora.bootloader.name%=DriverInstall, USB\VID_2A03&PID_003C
+%esplora.sketch.name%=DriverInstall, USB\VID_2A03&PID_803C&MI_00
+%leonardo.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0036
+%leonardo.sketch.name%=DriverInstall, USB\VID_2A03&PID_8036&MI_00
+%lilypadUSB.bootloader.name%=DriverInstall, USB\VID_1B4F&PID_9207
+%lilypadUSB.sketch.name%=DriverInstall, USB\VID_1B4F&PID_9208&MI_00
+%mega2560rev3.name%=DriverInstall, USB\VID_2A03&PID_0042
+%mega2560.name%=DriverInstall, USB\VID_2A03&PID_0010
+%megaADK.name%=DriverInstall, USB\VID_2A03&PID_003F
+%megaADKrev3.name%=DriverInstall, USB\VID_2A03&PID_0044
+%micro.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0037
+%micro.sketch.name%=DriverInstall, USB\VID_2A03&PID_8037&MI_00
+%unoR3.name%=DriverInstall, USB\VID_2A03&PID_0043
+%usbserial.name%=DriverInstall, USB\VID_2A03&PID_003B
+%robotControl.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0038
+%robotControl.sketch.name%=DriverInstall, USB\VID_2A03&PID_8038&MI_00
+%robotMotor.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0039
+%robotMotor.sketch.name%=DriverInstall, USB\VID_2A03&PID_8039&MI_00
+%yun.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0041
+%yun.sketch.name%=DriverInstall, USB\VID_2A03&PID_8041&MI_00
+
+%zero_pro.edbg.name%=DriverInstall, USB\VID_03EB&PID_2111&MI_01
+%zero_pro_boot.usbport.name%=DriverInstall, USB\VID_2A03&PID_004D
+%zero_boot.usbport.name%=DriverInstall, USB\VID_2A03&PID_004E
+%zero_pro.usbport.name%=DriverInstall, USB\VID_2A03&PID_804D
+%zero.usbport.name%=DriverInstall, USB\VID_2A03&PID_804E
+
+[DeviceList.NTia64]
+%esplora.bootloader.name%=DriverInstall, USB\VID_2A03&PID_003C
+%esplora.sketch.name%=DriverInstall, USB\VID_2A03&PID_803C&MI_00
+%leonardo.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0036
+%leonardo.sketch.name%=DriverInstall, USB\VID_2A03&PID_8036&MI_00
+%lilypadUSB.bootloader.name%=DriverInstall, USB\VID_1B4F&PID_9207
+%lilypadUSB.sketch.name%=DriverInstall, USB\VID_1B4F&PID_9208&MI_00
+%mega2560rev3.name%=DriverInstall, USB\VID_2A03&PID_0042
+%mega2560.name%=DriverInstall, USB\VID_2A03&PID_0010
+%megaADK.name%=DriverInstall, USB\VID_2A03&PID_003F
+%megaADKrev3.name%=DriverInstall, USB\VID_2A03&PID_0044
+%micro.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0037
+%micro.sketch.name%=DriverInstall, USB\VID_2A03&PID_8037&MI_00
+%unoR3.name%=DriverInstall, USB\VID_2A03&PID_0043
+%usbserial.name%=DriverInstall, USB\VID_2A03&PID_003B
+%robotControl.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0038
+%robotControl.sketch.name%=DriverInstall, USB\VID_2A03&PID_8038&MI_00
+%robotMotor.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0039
+%robotMotor.sketch.name%=DriverInstall, USB\VID_2A03&PID_8039&MI_00
+%yun.bootloader.name%=DriverInstall, USB\VID_2A03&PID_0041
+%yun.sketch.name%=DriverInstall, USB\VID_2A03&PID_8041&MI_00
+
+%zero_pro.edbg.name%=DriverInstall, USB\VID_03EB&PID_2111&MI_01
+%zero_pro_boot.usbport.name%=DriverInstall, USB\VID_2A03&PID_004D
+%zero_boot.usbport.name%=DriverInstall, USB\VID_2A03&PID_004E
+%zero_pro.usbport.name%=DriverInstall, USB\VID_2A03&PID_804D
+%zero.usbport.name%=DriverInstall, USB\VID_2A03&PID_804E
+
+[DriverInstall]
+include=mdmcpq.inf,usb.inf
+CopyFiles = FakeModemCopyFileSection
+AddReg=DriverAddReg
+
+[DriverAddReg]
+HKR,,DevLoader,,*ntkern 
+HKR,,NTMPDriver,,usbser.sys 
+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+
+[DriverInstall.Services]
+include=mdmcpq.inf
+AddService=usbser, 0x00000002, DriverService
+
+[DriverService]
+DisplayName=%ServiceName%
+ServiceType=1
+StartType=3
+ErrorControl=1
+ServiceBinary=%12%\usbser.sys
+LoadOrderGroup=Base
+
--- a/build/windows/jre-8u31.zip.sha
+++ b/build/windows/jre-8u31.zip.sha
@ -0,0 +1 @@
+17bf4f25babaf70bdb68fd3464be163eb769c074
--- a/build/windows/launcher/arduino.l4j.ini
+++ b/build/windows/launcher/arduino.l4j.ini
@ -0,0 +1,2 @@
+-Xms128M
+-Xmx1024M
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@ -32,7 +32,6 @@
    <minVersion>1.6.0</minVersion>
    <maxVersion></maxVersion>
    <jdkPreference>preferJre</jdkPreference>
-    <opt>-Xms128m -Xmx128m</opt>
  </jre>
  <splash>
    <file>about.bmp</file>
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@ -32,7 +32,6 @@
    <minVersion>1.6.0</minVersion>
    <maxVersion></maxVersion>
    <jdkPreference>preferJre</jdkPreference>
-    <opt>-Xms128m -Xmx128m</opt>
  </jre>
  <messages>
    <startupErr>An error occurred while starting the application.</startupErr>