1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00

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
  ...
This commit is contained in:
Ivan Grokhotkov
2015-03-27 11:17:58 +03:00
206 changed files with 54576 additions and 5229 deletions

View File

@ -0,0 +1 @@
e089689f38dbd98acca2e7ae4e1219773afbeecd

View File

@ -1 +0,0 @@
21577a37f6f438a25903a3338c448385c0c87aeb

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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

View File

@ -0,0 +1 @@
17bf4f25babaf70bdb68fd3464be163eb769c074

View File

@ -0,0 +1,2 @@
-Xms128M
-Xmx1024M

View File

@ -32,7 +32,6 @@
<minVersion>1.6.0</minVersion>
<maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference>
<opt>-Xms128m -Xmx128m</opt>
</jre>
<splash>
<file>about.bmp</file>

View File

@ -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>