Skip to content

Commit 423c8c6

Browse files
YogoGitYogoGit
committed
Merge branch 'master' of https://github.com/arduino/Arduino 
2 parents 737671c + ae6a5d8 commit 423c8c6

File tree

5,420 files changed

+4420612
-261207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,420 files changed

+4420612
-261207
lines changed

‎.classpath

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,32 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry excluding="processing/app/tools/format/|processing/app/tools/format/src/|processing/app/Trace.java|processing/app/RunnerClassLoader.java" kind="src" path="app/src"/>
4+
<classpathentry kind="src" path="app/test"/>
45
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5-
<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
66
<classpathentry kind="lib" path="app/lib/antlr.jar"/>
77
<classpathentry kind="lib" path="app/lib/apple.jar"/>
88
<classpathentry kind="lib" path="app/lib/ecj.jar"/>
99
<classpathentry kind="lib" path="app/lib/jna.jar"/>
10-
<classpathentry kind="lib" path="app/lib/RXTXcomm.jar"/>
10+
<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
11+
<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
12+
<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>
13+
<classpathentry kind="lib" path="app/test-lib/fest-swing-1.2.jar"/>
14+
<classpathentry kind="lib" path="app/test-lib/fest-util-1.1.2.jar"/>
15+
<classpathentry kind="lib" path="app/test-lib/jcip-annotations-1.0.jar"/>
16+
<classpathentry kind="lib" path="app/lib/commons-codec-1.7.jar"/>
17+
<classpathentry kind="lib" path="app/lib/commons-exec-1.1.jar"/>
18+
<classpathentry kind="lib" path="app/lib/commons-httpclient-3.1.jar"/>
19+
<classpathentry kind="lib" path="app/lib/commons-logging-1.0.4.jar"/>
20+
<classpathentry kind="lib" path="app/lib/jmdns-3.4.1.jar"/>
21+
<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
22+
<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
23+
<classpathentry kind="lib" path="app/lib/bcpg-jdk15on-149.jar"/>
24+
<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-149.jar"/>
25+
<classpathentry kind="lib" path="app/lib/jackson-core-2.2.3.jar"/>
26+
<classpathentry kind="lib" path="app/lib/jackson-databind-2.2.3.jar"/>
27+
<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.2.3.jar"/>
28+
<classpathentry kind="lib" path="app/lib/jackson-annotations-2.2.3.jar"/>
29+
<classpathentry kind="lib" path="app/lib/commons-compress-1.8.jar"/>
30+
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
1131
<classpathentry kind="output" path="app/bin"/>
1232
</classpath>

‎.gitignore

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
app/bin/
22
app/pde.jar
33
build/macosx/work/
4-
core/bin/
5-
core/core.jar
4+
arduino-core/bin/
5+
arduino-core/arduino-core.jar
66
hardware/arduino/bootloaders/caterina_LUFA/Descriptors.o
77
hardware/arduino/bootloaders/caterina_LUFA/Descriptors.lst
88
hardware/arduino/bootloaders/caterina_LUFA/Caterina.sym
@@ -13,6 +13,43 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
1313
hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
1414
hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
1515
hardware/arduino/bootloaders/caterina_LUFA/.dep/
16-
.gitignore
16+
build/libastylej-*.zip
1717
build/windows/work/
18+
build/windows/*.zip
19+
build/windows/*.tgz
20+
build/windows/libastylej*
21+
build/windows/arduino-*.zip
22+
build/windows/dist/*.tar.gz
23+
build/windows/dist/*.tar.bz2
24+
build/windows/launch4j-*.tgz
25+
build/windows/launch4j-*.zip
26+
build/windows/launcher/launch4j
27+
build/windows/WinAVR-*.zip
28+
build/macosx/arduino-*.zip
29+
build/macosx/dist/*.tar.gz
30+
build/macosx/dist/*.tar.bz2
31+
build/macosx/*.tar.bz2
32+
build/macosx/libastylej*
33+
build/macosx/appbundler*.jar
34+
build/macosx/appbundler*.zip
35+
build/macosx/appbundler
36+
build/macosx/appbundler-1.0ea-arduino2
37+
build/macosx/appbundler-1.0ea-upstream1
1838
build/linux/work/
39+
build/linux/dist/*.tar.gz
40+
build/linux/dist/*.tar.bz2
41+
build/linux/*.tgz
42+
build/linux/*.tar.xz
43+
build/linux/*.tar.bz2
44+
build/linux/*.zip
45+
build/linux/libastylej*
46+
build/shared/reference*.zip
47+
build/shared/Edison*.zip
48+
build/shared/Galileo*.zip
49+
test-bin
50+
*.iml
51+
.idea
52+
.DS_Store
53+
.directory
54+
hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
55+
avr-toolchain-*.zip

‎.settings/org.eclipse.jdt.core.prefs

Lines changed: 287 additions & 0 deletions
Large diffs are not rendered by default.

‎.settings/org.eclipse.jdt.ui.prefs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#Fri Dec 30 12:12:25 CET 2011
2+
eclipse.preferences.version=1
3+
formatter_profile=_Arduino
4+
formatter_settings_version=11

‎README.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
Arduino
2+
========
3+
4+
* Arduino is an open-source physical computing platform based on a simple i/o
5+
board and a development environment that implements the Processing/Wiring
6+
language. Arduino can be used to develop stand-alone interactive objects or
7+
can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
8+
The boards can be assembled by hand or purchased preassembled; the open-source
9+
IDE can be downloaded for free at http://arduino.cc/en/Main/Software
10+
11+
* For more information, see the website at: http://www.arduino.cc/
12+
or the forums at: http://arduino.cc/forum/
13+
You can also follow Arduino on twitter at: https://twitter.com/arduino or like Arduino on Facebook at: https://www.facebook.com/official.arduino
14+
15+
* To report a *bug* in the software or to request *a simple enhancement* go to:
16+
http://github.com/arduino/Arduino/issues
17+
18+
* More complex requests and technical discussion should go on the Arduino Developers
19+
mailing list:
20+
https://groups.google.com/a/arduino.cc/forum/#!forum/developers
21+
22+
* If you're interested in modifying or extending the Arduino software, we strongly
23+
suggest discussing your ideas on the Developers mailing list *before* starting
24+
to work on them. That way you can coordinate with the Arduino Team and others,
25+
giving your work a higher chance of being integrated into the official release
26+
https://groups.google.com/a/arduino.cc/forum/#!forum/developers
27+
28+
Installation
29+
------------
30+
Detailed instructions are in reference/Guide_Windows.html and
31+
reference/Guide_MacOSX.html. For Linux, see the Arduino playground:
32+
http://www.arduino.cc/playground/Learning/Linux
33+
34+
Credits
35+
--------
36+
Arduino is an open source project, supported by many.
37+
38+
The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,
39+
Gianluca Martino, Daniela Antonietti, and David A. Mellis.
40+
41+
Arduino uses the [GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc), [avrdude](http://www.nongnu.org/avrdude/), [avr-libc](http://www.nongnu.org/avr-libc/), and code from
42+
[Processing](http://www.processing.org) and [Wiring](http://wiring.org.co).
43+
44+
Icon and about image designed by [ToDo](http://www.todo.to.it/)
45+

‎app/.classpath

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry excluding="processing/app/tools/format/" kind="src" path="src"/>
4+
<classpathentry kind="src" path="test"/>
45
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5-
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
6-
<classpathentry combineaccessrules="false" kind="src" path="/dxf"/>
7-
<classpathentry combineaccessrules="false" kind="src" path="/net"/>
8-
<classpathentry combineaccessrules="false" kind="src" path="/opengl">
9-
<attributes>
10-
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="opengl/library"/>
11-
</attributes>
12-
</classpathentry>
13-
<classpathentry combineaccessrules="false" kind="src" path="/pdf"/>
14-
<classpathentry combineaccessrules="false" kind="src" path="/serial"/>
15-
<classpathentry combineaccessrules="false" kind="src" path="/video"/>
166
<classpathentry kind="lib" path="lib/antlr.jar"/>
177
<classpathentry kind="lib" path="lib/jna.jar"/>
188
<classpathentry kind="lib" path="lib/ecj.jar"/>
9+
<classpathentry kind="lib" path="lib/apple.jar"/>
10+
<classpathentry kind="lib" path="lib/bcpg-jdk15on-149.jar"/>
11+
<classpathentry kind="lib" path="lib/bcprov-jdk15on-149.jar"/>
12+
<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
13+
<classpathentry kind="lib" path="lib/commons-compress-1.8.jar"/>
14+
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
15+
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
16+
<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
17+
<classpathentry kind="lib" path="lib/jackson-annotations-2.2.3.jar"/>
18+
<classpathentry kind="lib" path="lib/jackson-core-2.2.3.jar"/>
19+
<classpathentry kind="lib" path="lib/jackson-databind-2.2.3.jar"/>
20+
<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.2.3.jar"/>
21+
<classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>
22+
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
23+
<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
24+
<classpathentry kind="lib" path="test-lib/junit-4.11.jar"/>
25+
<classpathentry kind="lib" path="test-lib/fest-assert-1.2.jar"/>
26+
<classpathentry kind="lib" path="test-lib/fest-reflect-1.2.jar"/>
27+
<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
28+
<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
29+
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
30+
<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
1931
<classpathentry kind="output" path="bin"/>
2032
</classpath>

‎app/.classpath_vista

100755100644
File mode changed.

0 commit comments

Comments
 (0)