mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-30 16:24:09 +03:00
update AVR src
* java code not tested * Merge remote-tracking branch 'remotes/arduino/master' into esp8266 Conflicts: README.md app/src/processing/app/AbstractMonitor.java arduino-core/src/processing/app/Serial.java libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino libraries/WiFi/library.properties
This commit is contained in:
Markus Sattler
BIN
build/windows/dist/drivers/arduino.cat
vendored
BIN
build/windows/dist/drivers/arduino.cat
vendored
Binary file not shown.
72
build/windows/dist/drivers/arduino.inf
vendored
72
build/windows/dist/drivers/arduino.inf
vendored
@ -1,10 +1,37 @@
|
||||
; Copyright 2012 Blacklabel Development, Inc.
|
||||
;
|
||||
; Copyright 2015 Arduino LLC (http://www.arduino.cc/)
|
||||
;
|
||||
; Developed by Zach Eveland, Blacklabel Development, Inc.
|
||||
;
|
||||
; Arduino 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
;
|
||||
; As a special exception, you may use this file as part of a free software
|
||||
; library without restriction. Specifically, if other files instantiate
|
||||
; templates or use macros or inline functions from this file, or you compile
|
||||
; this file and link it with other files to produce an executable, this
|
||||
; file does not by itself cause the resulting executable to be covered by
|
||||
; the GNU General Public License. This exception does not however
|
||||
; invalidate any other reasons why the executable file might be covered by
|
||||
; the GNU General Public License.
|
||||
;
|
||||
|
||||
[Strings]
|
||||
DriverPackageDisplayName="Arduino USB Driver"
|
||||
ManufacturerName="Arduino LLC (www.arduino.cc)"
|
||||
ServiceName="USB RS-232 Emulation Driver"
|
||||
due.bossa.name="Bossa Program Port"
|
||||
bossa.name="Bossa Program Port"
|
||||
due.programming_port.name="Arduino Due Programming Port"
|
||||
due.sketch.name="Arduino Due"
|
||||
esplora.bootloader.name="Arduino Esplora bootloader"
|
||||
@ -19,15 +46,20 @@ megaADK.name="Arduino Mega ADK"
|
||||
megaADKrev3.name="Arduino Mega ADK"
|
||||
micro.bootloader.name="Arduino Micro bootloader"
|
||||
micro.sketch.name="Arduino Micro"
|
||||
uno.name="Arduino Uno"
|
||||
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"
|
||||
uno.name="Arduino Uno"
|
||||
unoR3.name="Arduino Uno"
|
||||
usbserial.name="Arduino USB Serial Light Adapter"
|
||||
yun.bootloader.name="Arduino Yun bootloader"
|
||||
yun.sketch.name="Arduino Yun"
|
||||
zero.edbg.name="Atmel Corp. EDBG CMSIS-DAP"
|
||||
zero.sketch.name="Arduino Zero"
|
||||
zero.bootloader.name="Arduino Zero bootloader"
|
||||
sme_fox.sketch.name="SmartEverything Fox"
|
||||
sme_fox.bootloader.name="SmartEverything Fox bootloader"
|
||||
|
||||
[DefaultInstall]
|
||||
CopyINF=arduino.inf
|
||||
@ -39,7 +71,7 @@ Signature="$Windows NT$"
|
||||
Provider=%ManufacturerName%
|
||||
DriverPackageDisplayName=%DriverPackageDisplayName%
|
||||
CatalogFile=arduino.cat
|
||||
DriverVer=01/04/2013,1.0.0.0
|
||||
DriverVer=06/15/2015,1.2.2.0
|
||||
|
||||
[Manufacturer]
|
||||
%ManufacturerName%=DeviceList, NTamd64, NTia64
|
||||
@ -49,7 +81,7 @@ FakeModemCopyFileSection=12
|
||||
DefaultDestDir=12
|
||||
|
||||
[DeviceList]
|
||||
%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
|
||||
%bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
|
||||
%due.programming_port.name%=DriverInstall, USB\VID_2341&PID_003D
|
||||
%due.sketch.name%=DriverInstall, USB\VID_2341&PID_003E&MI_00
|
||||
%esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C
|
||||
@ -64,18 +96,23 @@ DefaultDestDir=12
|
||||
%megaADKrev3.name%=DriverInstall, USB\VID_2341&PID_0044
|
||||
%micro.bootloader.name%=DriverInstall, USB\VID_2341&PID_0037
|
||||
%micro.sketch.name%=DriverInstall, USB\VID_2341&PID_8037&MI_00
|
||||
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
|
||||
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
|
||||
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
|
||||
%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
|
||||
%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
|
||||
%robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
|
||||
%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
|
||||
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
|
||||
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
|
||||
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
|
||||
%yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
|
||||
%yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
|
||||
%zero.edbg.name%=DriverInstall, USB\VID_03EB&PID_2157&MI_01
|
||||
%zero.sketch.name%=DriverInstall, USB\VID_2341&PID_804D&MI_00
|
||||
%zero.bootloader.name%=DriverInstall, USB\VID_2341&PID_004D
|
||||
%sme_fox.sketch.name%=DriverInstall, USB\VID_2341&PID_E002&MI_00
|
||||
%sme_fox.bootloader.name%=DriverInstall, USB\VID_2341&PID_E001
|
||||
|
||||
[DeviceList.NTamd64]
|
||||
%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
|
||||
%bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
|
||||
%due.programming_port.name%=DriverInstall, USB\VID_2341&PID_003D
|
||||
%due.sketch.name%=DriverInstall, USB\VID_2341&PID_003E&MI_00
|
||||
%esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C
|
||||
@ -99,8 +136,16 @@ DefaultDestDir=12
|
||||
%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
|
||||
%yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
|
||||
%yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
|
||||
%zero.edbg.name%=DriverInstall, USB\VID_03EB&PID_2157&MI_01
|
||||
%zero.sketch.name%=DriverInstall, USB\VID_2341&PID_804D&MI_00
|
||||
%zero.bootloader.name%=DriverInstall, USB\VID_2341&PID_004D
|
||||
%sme_fox.sketch.name%=DriverInstall, USB\VID_2341&PID_E002&MI_00
|
||||
%sme_fox.bootloader.name%=DriverInstall, USB\VID_2341&PID_E001
|
||||
|
||||
[DeviceList.NTia64]
|
||||
%bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
|
||||
%due.programming_port.name%=DriverInstall, USB\VID_2341&PID_003D
|
||||
%due.sketch.name%=DriverInstall, USB\VID_2341&PID_003E&MI_00
|
||||
%esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C
|
||||
%esplora.sketch.name%=DriverInstall, USB\VID_2341&PID_803C&MI_00
|
||||
%leonardo.bootloader.name%=DriverInstall, USB\VID_2341&PID_0036
|
||||
@ -122,6 +167,11 @@ DefaultDestDir=12
|
||||
%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
|
||||
%yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
|
||||
%yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
|
||||
%zero.edbg.name%=DriverInstall, USB\VID_03EB&PID_2157&MI_01
|
||||
%zero.sketch.name%=DriverInstall, USB\VID_2341&PID_804D&MI_00
|
||||
%zero.bootloader.name%=DriverInstall, USB\VID_2341&PID_004D
|
||||
%sme_fox.sketch.name%=DriverInstall, USB\VID_2341&PID_E002&MI_00
|
||||
%sme_fox.bootloader.name%=DriverInstall, USB\VID_2341&PID_E001
|
||||
|
||||
[DriverInstall]
|
||||
include=mdmcpq.inf,usb.inf
|
||||
|
||||
@ -3,15 +3,9 @@
|
||||
<headerType>gui</headerType>
|
||||
<jar>lib</jar>
|
||||
<outfile>arduino.exe</outfile>
|
||||
<errTitle></errTitle>
|
||||
<cmdLine></cmdLine>
|
||||
<chdir>.</chdir>
|
||||
<priority>normal</priority>
|
||||
<downloadUrl>http://java.sun.com/javase/downloads/</downloadUrl>
|
||||
<supportUrl></supportUrl>
|
||||
<customProcName>false</customProcName>
|
||||
<stayAlive>false</stayAlive>
|
||||
<manifest></manifest>
|
||||
<errTitle>Arduino</errTitle>
|
||||
<downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads/index.html</downloadUrl>
|
||||
<icon>application.ico</icon>
|
||||
<classPath>
|
||||
<mainClass>processing.app.Base</mainClass>
|
||||
@ -34,7 +28,6 @@
|
||||
<cp>lib/jackson-module-mrbean-2.2.3.jar</cp>
|
||||
<cp>lib/java-semver-0.8.0.jar</cp>
|
||||
<cp>lib/jmdns-3.4.1.jar</cp>
|
||||
<cp>lib/jna.jar</cp>
|
||||
<cp>lib/jsch-0.1.50.jar</cp>
|
||||
<cp>lib/jssc-2.8.0.jar</cp>
|
||||
<cp>lib/pde.jar</cp>
|
||||
@ -46,6 +39,14 @@
|
||||
<opt>-splash:./lib/splash.png</opt>
|
||||
<opt>-Dsun.java2d.d3d=false</opt>
|
||||
</jre>
|
||||
<versionInfo>
|
||||
<fileDescription>Arduino IDE</fileDescription>
|
||||
<copyright>Arduino LLC</copyright>
|
||||
<productName>Arduino</productName>
|
||||
<companyName>Arduino LLC</companyName>
|
||||
<internalName>arduino</internalName>
|
||||
<originalFilename>arduino.exe</originalFilename>
|
||||
</versionInfo>
|
||||
<messages>
|
||||
<startupErr>An error occurred while starting the application.</startupErr>
|
||||
<bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
|
||||
|
||||
@ -3,15 +3,9 @@
|
||||
<headerType>console</headerType>
|
||||
<jar>lib</jar>
|
||||
<outfile>arduino_debug.exe</outfile>
|
||||
<errTitle></errTitle>
|
||||
<cmdLine></cmdLine>
|
||||
<chdir>.</chdir>
|
||||
<priority>normal</priority>
|
||||
<downloadUrl>http://java.sun.com/javase/downloads/</downloadUrl>
|
||||
<supportUrl></supportUrl>
|
||||
<customProcName>false</customProcName>
|
||||
<stayAlive>false</stayAlive>
|
||||
<manifest></manifest>
|
||||
<errTitle>Arduino</errTitle>
|
||||
<downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads/index.html</downloadUrl>
|
||||
<icon>application.ico</icon>
|
||||
<classPath>
|
||||
<mainClass>processing.app.Base</mainClass>
|
||||
@ -34,7 +28,6 @@
|
||||
<cp>lib/jackson-module-mrbean-2.2.3.jar</cp>
|
||||
<cp>lib/java-semver-0.8.0.jar</cp>
|
||||
<cp>lib/jmdns-3.4.1.jar</cp>
|
||||
<cp>lib/jna.jar</cp>
|
||||
<cp>lib/jsch-0.1.50.jar</cp>
|
||||
<cp>lib/jssc-2.8.0.jar</cp>
|
||||
<cp>lib/pde.jar</cp>
|
||||
@ -45,6 +38,14 @@
|
||||
<runtimeBits>32</runtimeBits>
|
||||
<opt>-Dsun.java2d.d3d=false</opt>
|
||||
</jre>
|
||||
<versionInfo>
|
||||
<fileDescription>Arduino IDE</fileDescription>
|
||||
<copyright>Arduino LLC</copyright>
|
||||
<productName>Arduino</productName>
|
||||
<companyName>Arduino LLC</companyName>
|
||||
<internalName>arduino</internalName>
|
||||
<originalFilename>arduino.exe</originalFilename>
|
||||
</versionInfo>
|
||||
<messages>
|
||||
<startupErr>An error occurred while starting the application.</startupErr>
|
||||
<bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
|
||||
|
||||
Reference in New Issue
Block a user