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

Merge branch 'master' into esp8266

Browse Source 
* master: (148 commits)
  Update revision log
  Cherry picked fix from 87865ac19d
  Updated revision log
  Added dependencies for AStylej.dll
  Updated translations
  Update revision log
  Temporary fix for pulseIn() regression.
  Added README.adoc for the library manager project
  Fixed some libraries metadata.
  Temporary disabled DefaultTargetTest under certain conditions
  Updated translation from transifex
  Updated some translation strings
  Fixed test
  sam: Fixed initialization of UART/USART mode register
  update revision log
  Fixed NPE when import menu are empty
  Fixed NPE when currently selected platform is no more installed.
  Optimized FileUtils.recursiveDelete(File) function
  Fixed a bunch of simple warnings in java code
  Removed unused classes Commander.java and Webserver.java
  ...
This commit is contained in:
Ivan Grokhotkov
2015-01-26 02:35:02 +03:00
parent bfafcf8c6a 379df90b30
commit 95f969cb7c
466 changed files with 45281 additions and 108472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
build/build.xml
View File

@ -39,7 +39,7 @@
<!-- Libraries required for running arduino -->
<fileset dir=".." id="runtime.jars">
<include name="core/core.jar" />
<include name="arduino-core/arduino-core.jar" />
<include name="app/pde.jar" />
<include name="app/lib/commons-codec-1.7.jar" />
<include name="app/lib/commons-exec-1.1.jar" />
@ -84,12 +84,12 @@
<!-- - - - - - - - - - - - - - - - - - -->
<target name="subprojects-clean">
<subant buildpath="../core" target="clean"/>
<subant buildpath="../arduino-core" target="clean"/>
<subant buildpath="../app" target="clean"/>
</target>
<target name="subprojects-build">
<subant buildpath="../core" target="build"/>
<subant buildpath="../arduino-core" target="build"/>
<subant buildpath="../app" target="build"/>
</target>
@ -171,17 +171,17 @@
<echo message="Latest revision detected in shared/revision.txt is: ${revision}" />
<!-- figure out the revision number in base.java -->
<loadfile srcfile="../app/src/processing/app/Base.java"
<loadfile srcfile="../arduino-core/src/processing/app/BaseNoGui.java"
property="revision.base">
<filterchain>
<tokenfilter>
<linetokenizer />
<containsregex pattern="String VERSION_NAME = "/>
<replaceregex pattern="[^0-9]*" flags="g" replace=""/>
<replaceregex pattern=".*&quot;(.*)&quot;.*" flags="g" replace="\1"/>
</tokenfilter>
</filterchain>
</loadfile>
<echo message="Revision in Base.java is: ${revision.base}" />
<echo message=" Revision in BaseNoGui.java is: ${revision.base}" />
</target>
<!-- - - - - - - - -->
@ -279,8 +279,8 @@
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.0.3/" />
<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.04.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.04.zip" />
<param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
<param name="final_folder" value="${staging_folder}/libastylej" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
@ -506,8 +506,8 @@
<chmod perm="755" file="linux/work/arduino" />
<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.04.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.04.zip" />
<param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
<param name="final_folder" value="${staging_folder}/libastylej" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
@ -608,7 +608,7 @@
</target>
<target name="linux-dist" depends="build"
description="Build .tar.gz of linux version">
description="Build .tar.xz of linux version">
<!--get src="http://dev.processing.org/build/jre-tools-6u18-linux-i586.tgz"
dest="linux/jre.tgz"
@ -637,10 +637,10 @@
<move file="linux/work" tofile="linux/arduino-${version}" />
<exec executable="tar" dir="linux">
<arg value="-z"/>
<arg value="--lzma"/>
<arg value="-c"/>
<arg value="-f"/>
<arg value="arduino-${version}-${platform}.tgz"/>
<arg value="arduino-${version}-${platform}.tar.xz"/>
<arg value="arduino-${version}"/>
</exec>
@ -650,16 +650,16 @@
=======================================================
Arduino for Linux was built. Grab the archive from
build/linux/arduino-${version}-${platform}.tgz
build/linux/arduino-${version}-${platform}.tar.xz
=======================================================
</echo>
</target>
<target name="linux32-dist" depends="linux-dist"
description="Build .tar.gz of linux version" />
description="Build .tar.xz of linux version" />
<target name="linux64-dist" depends="linux-dist"
description="Build .tar.gz of linux version" />
description="Build .tar.xz of linux version" />
<!-- - - - - - - - -->
<!-- Windows -->
@ -735,12 +735,14 @@
</antcall>
<antcall target="unzip">
<param name="archive_file" value="./libastylej-2.04.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.04.zip" />
<param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
<param name="final_folder" value="${staging_folder}/libastylej" />
<param name="dest_folder" value="${staging_folder}" />
</antcall>
<copy file="windows/libastylej/AStylej.dll" todir="windows/work/lib" />
<copy file="windows/msvcp100.dll" todir="windows/work" />
<copy file="windows/msvcr100.dll" todir="windows/work" />
<!-- Copy bossac.exe tool -->
<copy todir="windows/work/hardware/tools">

1
build/libastylej-2.04.zip.sha
View File

@ -1 +0,0 @@
e62f8ff81296ca8bd46237e4254420394069d698

1
build/libastylej-2.05.zip.sha Normal file
View File

@ -0,0 +1 @@
2cd093d3da2b0204a666d90440f513b717c9f80c

2
build/macosx/template.app/Contents/Info.plist
View File

@ -94,7 +94,7 @@
<!-- In 0149, removed /System/Library/Java from the CLASSPATH because
it can cause problems if users have installed weird files there.
http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
<string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/jssc-2.8.0.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jna.jar</string>
<string>$JAVAROOT/pde.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/jssc-2.8.0.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jna.jar</string>
<key>JVMArchs</key>
<array>

2
build/shared/examples/05.Control/IfStatementConditional/IfStatementConditional.ino
View File

@ -3,7 +3,7 @@
This example demonstrates the use of if() statements.
It reads the state of a potentiometer (an analog input) and turns on an LED
only if the LED goes above a certain threshold level. It prints the analog value
only if the potentiometer goes above a certain threshold level. It prints the analog value
regardless of the level.
The circuit:

48
build/shared/revisions.txt
View File

@ -1,13 +1,41 @@
ARDUINO 1.5.9
ARDUINO 1.6.0rc2 - 2015.01.20
[ide]
* Reenabled speed of 38400 on serial monitor
* Improved Find/Replace dialog layout (Eberhard Fahle)
* Fixed missing .dll error on some Windows box
[core]
* Arduino "boolean" type is now mapped to "bool" instead of "uint8_t" (Christopher Andrews)
* sam: HardwareSerial now has buffered transmission (Collin Kidder)
* sam: HardwareSerial fixed modes (parity, data bits, stop bits) (bluesign2k)
* avr: Fixed regression in pulseIn() function accuracy
[libraries]
* GSM: minor changes and bug fix (https://github.com/arduino/Arduino/pull/2546)
The following changes are included also in the Arduino IDE 1.0.7:
[ide]
* Mitigated Serial Monitor resource exhaustion when the connected device sends a lot of data (Paul Stoffregen)
ARDUINO 1.6.0rc1 - 2014.12.11
* IDE internals have been refactored and sorted out. (Claudio Indellicati)
https://github.com/arduino/Arduino/pull/2328
The builder and the GUI now have clearly separated source code making it easier
for IDE developers to maintain and propose patch.
From a user point of view nothing changes and the IDE should behave exactly as before.
[ide]
* Autosave on sketch Upload/Verify (Fulvio Ieva)
* Sketch build process: fixed full rebuild on windows even if not needed
* Sketch build process: core.a rebuild only if needed (Matthijs Kooijman)
* Updated AStyle formatter to v2.04: http://astyle.sourceforge.net/notes.html
* Updated AStyle formatter to v2.05: http://astyle.sourceforge.net/notes.html
* Improved avrdude verbose upload (Matthijs Kooijman)
* (Mac OSX) Add Exported UTI for ino files, allows quick look to view the content of the file and external editors to syntax highlight as C++ (Matt Lloyd)
* (Mac OSX) Add Exported UTI for ino files, allows quick look to view the
content of the file and external editors to syntax highlight as C++ (Matt Lloyd)
[core]
* sam: added -MMD flag to let gcc produce dependency files (full rebuild on Arduino Due is now triggered only if needed)
@ -16,6 +44,7 @@ ARDUINO 1.5.9
* LiquidCrystal: added setRowOffsets function to support different LCD hardware configurations (Mark Sproul)
* LiquidCrystal: various improvements and optimizations (Matthijs Kooijman)
* Fixed PROGMEM error in Robot_Control/examples/explore/R06_Wheel_Calibration
* SD: Fixed SPI transaction mismatch (Paul Stoffregen)
The following changes are included also in the Arduino IDE 1.0.7:
@ -359,12 +388,19 @@ ARDUINO 1.5 BETA - 2012.10.22
ARDUINO 1.0.7
[libraries]
* Backported GSM from IDE 1.5.x
* EthernetClien: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
* Backported SPI Transaction API from IDE 1.5.x (Paul Stoffregen)
* Backported GSM from IDE 1.5.x: fix build regression
* Backported Ethernet from IDE 1.5.x
* Backported SD from IDE 1.5.x
* Backported SPI from IDE 1.5.x
* EthernetClient: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
[core]
* Fixed missing NOT_AN_INTERRUPT constant in digitalPinToInterrupt() macro
* Fixed regression in HardwareSerial::available() introduced with https://github.com/arduino/Arduino/pull/2057
* Fixed performance regression in HardwareSerial::available() introduced with https://github.com/arduino/Arduino/pull/2057
[ide]
* Mitigated Serial Monitor resource exhaustion when the connected device sends a lot of data (Paul Stoffregen)
ARDUINO 1.0.6 - 2014.09.16

2
build/windows/launcher/config.xml
View File

@ -15,8 +15,8 @@
<icon>application.ico</icon>
<classPath>
<mainClass>processing.app.Base</mainClass>
<cp>lib/arduino-core.jar</cp>
<cp>lib/pde.jar</cp>
<cp>lib/core.jar</cp>
<cp>lib/jna.jar</cp>
<cp>lib/ecj.jar</cp>
<cp>lib/jssc-2.8.0.jar</cp>

2
build/windows/launcher/config_debug.xml
View File

@ -15,8 +15,8 @@
<icon>application.ico</icon>
<classPath>
<mainClass>processing.app.Base</mainClass>
<cp>lib/arduino-core.jar</cp>
<cp>lib/pde.jar</cp>
<cp>lib/core.jar</cp>
<cp>lib/jna.jar</cp>
<cp>lib/ecj.jar</cp>
<cp>lib/jssc-2.8.0.jar</cp>

BIN
build/windows/msvcp100.dll Normal file
View File

Binary file not shown.

BIN
build/windows/msvcr100.dll Normal file
View File

Binary file not shown.