rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-12 23:08:52 +01:00
Code Issues Releases Activity
6,303 Commits 7 Branches 93 Tags 2.9 GiB
fceb1d7eda
Commit Graph

1525 Commits

Author SHA1 Message Date
Cristian Maglie
9eeb0abee6 Disabled 'fat' (multiplatform) library check. 2012-10-24 12:50:30 +02:00
Federico Fissore
5935f1e2aa eclipse .launch to run IDE inside eclipse: helps debugging and speeds up development 2012-10-24 10:11:41 +02:00
Cristian Maglie
ab63860778 Set arudino version to 150 (1.5.0-beta) 2012-10-21 22:36:22 +02:00
Cristian Maglie
61389303bb Serial port can take a while to close (especially on latest MacOSX) take this fact in account. 2012-10-21 22:14:01 +02:00
Cristian Maglie
ed15dc3b5a Remove 1200 automagic baud rate every time the IDE use the serial port touch 2012-10-20 17:21:46 +02:00
Federico Fissore
90f43370b9 better error message when library names clash 
filter out non .ZIP files
 2012-10-19 10:49:23 +02:00
Federico Fissore
e3c088e167 also rebuild examples menu after library import 2012-10-19 10:41:43 +02:00
Federico Fissore
308793135c improved import library: complains if invalid zip or folders are selected 2012-10-19 10:35:48 +02:00
Federico Fissore
2a401f2a8b "Add library" moved into "Import library" menu 2012-10-19 09:32:26 +02:00
Cristian Maglie
05a2d77f15 Merge remote-tracking branch 'origin/master' into merge-1.0.1 2012-10-18 20:31:51 +02:00
Cristian Maglie
e6d5255864 Fixed concurrent access to HashMap when programming Mega2560 2012-10-18 19:34:11 +02:00
Federico Fissore
44045cc85d import library also import folder (already expanded libraries) 2012-10-18 16:49:14 +02:00
Federico Fissore
378c4392e0 keep included folder name as top level folder name, delete MAC folder and hidden files 2012-10-18 16:00:02 +02:00
Cristian Maglie
aba27c43aa Merged upstream arduino branch 2012-10-18 15:50:09 +02:00
Federico Fissore
1845b2dbc3 CPUType menu renamed to Processor 2012-10-18 15:13:14 +02:00
Federico Fissore
e8ea12c629 Add library from ZIP 2012-10-17 15:25:29 +02:00
Federico Fissore
0efc024f93 Merge branch 'boards-cputype' 2012-10-17 10:54:26 +02:00
Federico Fissore
c6efad5b2e backporting fix to https://code.google.com/p/arduino/issues/detail?id=986 2012-10-16 14:55:25 +02:00
Federico Fissore
aa05b50e97 missing startup selection if board missed container property 2012-10-15 23:22:46 +02:00
Federico Fissore
a6b892ed35 boards and cpu type menus 2012-10-15 22:48:12 +02:00
Cristian Maglie
66b4aac3c8 Merge branch 'master' of github.com:arduino/ARM 2012-10-10 18:47:48 +02:00
Cristian Maglie
914c53815a Reduced upload delay for programming port 2012-10-10 18:47:39 +02:00
David A. Mellis
af932ef0ce Avoid null-pointer exception with old-style third-party hardware folders. 2012-10-10 09:13:57 -04:00
Cristian Maglie
2f8e766588 Reordered boards menu 2012-10-09 21:40:11 +02:00
Cristian Maglie
72706243b0 Command line build. Still requires a display to show GUI. 2012-10-04 20:09:17 +02:00
David A. Mellis
795df1e207 Fixing error line numbering. (Paul Stoffregen) 
http://code.google.com/p/arduino/issues/detail?id=907
 2012-10-01 10:39:27 -04:00
Cristian Maglie
69fb711b49 Fixed message string during upload 2012-09-25 18:32:28 +02:00
David A. Mellis
c3d170ba8b Moving library installation tutorial to the web. 
http://code.google.com/p/arduino/issues/detail?id=1046
 2012-09-24 09:37:47 -04:00
David A. Mellis
e2b99206d8 Tweaks to post-upload touch for Leonardo upload. 
Added a delay to avoid exceptions when touching the serial port. Only printing the debug message in verbose mode.
 2012-09-09 18:32:16 -04:00
Peter Van Hoyweghen
5fa8cd4130 Leonardo: after burning a sketch, remove the magic baud rate (1200bps) to avoid future unwanted board resets 2012-09-09 17:59:09 -04:00
Cristian Maglie
d96264e60f Upload over debug port (part 2) 2012-09-08 00:55:37 +02:00
Cristian Maglie
ca74c94ae5 Upload over debug port 2012-09-07 15:59:44 +02:00
s17t.net
2ca5d3e056 - Moved code guessing current keyword in its function 
- Find-in-reference disabled in right-click popup menu unless
appropriate text is selected (#1014)
 2012-08-30 00:30:33 +02:00
David A. Mellis
0a0b573d7c Removing import of deleted objectutil class. 2012-08-23 10:54:24 -04:00
s17t.net
36b643d79f Removed objectutil. 2012-08-23 08:33:33 +02:00
s17t.net
4a09287c45 The 'find in reference' will look for current token and open 
respective doc page if exists.
 2012-08-23 08:32:22 +02:00
s17t.net
1691367fd9 Remove unused status notice message. 2012-08-20 00:13:55 +02:00
s17t.net
ab2d83fc80 Index reference page is shown when no text selected if clicking 'Find in 
reference' command.
 2012-08-20 00:08:17 +02:00
s17t.net
8a1cf335ad Introduce ObjectUtils class 2012-08-20 00:05:02 +02:00
Cristian Maglie
c26e377cc5 Added autoreset feature for Windows. 2012-08-16 17:05:38 -07:00
Cristian Maglie
df19935d31 Auto restart after upload (linux only for now). Auto reset/erase when uploading a new sketch. 2012-08-14 10:05:02 +02:00
David A. Mellis
d30bd83660 Don't generate prototypes for function that already have them. (Lars J. Nielsen) 
This searches for prototypes by using the same regular expression used to search for functions definitions, but with "{}" replaced by ";".  Note that it requires the prototype to be formatted identically to the function definition (e.g. matching white-space).

http://code.google.com/p/arduino/issues/detail?id=973
 2012-07-19 11:27:56 -04:00
David A. Mellis
a01657b312 Removing leftover debugging code. 
http://code.google.com/p/arduino/issues/detail?id=859
 2012-07-19 10:42:39 -04:00
David A. Mellis
4e657ba5e2 Automatically create sketchbook libraries/ folder and readme (Paul Stoffregen and Limor Fried). 
http://code.google.com/p/arduino/issues/detail?id=986
 2012-07-19 10:03:39 -04:00
David A. Mellis
e945d091c5 Don't require a space between #include and < or ". 
The space isn't required by the compiler, but the preprocessor needed
one in order to use the #include to figure out which libraries the
sketch used.  That caused an error if you didn't have the space,
because the corresponding library wasn't linked.

http://code.google.com/p/arduino/issues/detail?id=975
 2012-07-14 21:42:59 -04:00
David A. Mellis
d903d81d60 Add more checks for end-of-file in auto-format code. 
Otherwise, you tend to get out of memory errors caused by infinite
loops.

http://code.google.com/p/arduino/issues/detail?id=859
 2012-07-14 21:22:20 -04:00
David A. Mellis
6030f9670b Don't break C++ style (//) comments during auto-format. 
http://code.google.com/p/arduino/issues/detail?id=255
 2012-07-14 20:53:20 -04:00
Cristian Maglie
3d9672d902 Changed 'fat' (multiplatform) library detection algorithm 2012-07-06 18:20:02 +02:00
Cristian Maglie
5c0eca5fa7 Started fat (multi-architecture) libraries support (work in progress) 2012-07-04 12:00:35 +02:00
Cristian Maglie
01bd432af3 Separator between user and IDE libraries also in examples menu 2012-07-03 17:26:15 +02:00
Cristian Maglie
46aeeb4b29 Merged upstream Arduino master branch 2012-06-26 00:51:35 +02:00
Cristian Maglie
ddc8fa98c9 Added separator between user supplied libraries and IDE libraries 2012-06-25 17:29:16 +02:00
Cristian Maglie
8c5e21470f Removed isEmpty() calls for Java 1.5 compatibility 2012-06-25 15:30:43 +02:00
David A. Mellis
1daeba6fd6 Don't translate space separating baud rate from "baud". 
This prevents an error in which translations which omitted the space would cause an exception (because the code tries to split the string on space).

http://code.google.com/p/arduino/issues/detail?id=964
 2012-06-24 12:45:26 -05:00
Andrew Stone
5e75bd4a97 Fix for bug 950 -- NPE Compiler.java:407 -- also searched for any other instances & found two other cases of the same bug 2012-06-08 16:49:31 -04:00
Andrew Stone
958c835ef0 Issue 950: NPE Compiler.java:407 2012-06-06 17:30:14 -04:00
Tibor Fekete
ec3c8123bf Fixed null pointer exception in case of missing boot loader.path param in boards.txt 
Pre-1.0.1 it was not necessary to have a bootloader.path param in
boards.txt under the respective board type. This patch helps keeping
compatibility with older settings and avoid dummy param settings.
 2012-06-04 21:27:13 +02:00
David A. Mellis
a9fedabe3c Don't translate SimpleDateFormat string. 
The yyMMdd string that the sketch archiver tool uses to format archive
names was being localized (i.e. was wrapped in _()).  This gave an
error on startup (and the Arduino software would fail to launch), if
someone translated the string to something that wasn't a valid date
format.  Since this is an internal string, it shouldn't be translated.

http://code.google.com/p/arduino/issues/detail?id=942
 2012-06-03 14:48:20 -04:00
David A. Mellis
0ebfbf8d2c Fixing typo in custom error message. 2012-06-01 09:20:32 -04:00
Rune Fauske
354685bbff Changed language ISO code to match Norwegian (Norsk bokmål). 2012-05-29 09:33:15 +03:00
David A. Mellis
77ed2f4d62 Fixing placement of error messages. (Paul Stoffregen) 
This patch places #line preprocessor directives into the generated code
file so that the compiler reports the correct location for error
messages.

http://code.google.com/p/arduino/issues/detail?id=907
 2012-05-27 12:32:13 -04:00
Cristian Maglie
135900883d Fixed renamed app doesn't compile on macosx 2012-05-27 13:10:34 +02:00
Cristian Maglie
33f5c53668 Implemented OS specific preferences 2012-05-25 19:03:00 +02:00
Cristian Maglie
7ad4de5208 Added support for USB serial port 1200bps touch (Leonardo) 2012-05-25 17:33:29 +02:00
Cristian Maglie
3fe9246f60 Simplified boards.txt file 2012-05-25 17:31:55 +02:00
Cristian Maglie
3f4cbe887d Merge branch 'master' into arduino-1.0.1-merged 
Included latest fixes
 2012-05-25 15:16:34 +02:00
Cristian Maglie
4fc7f73270 Fixed error message if user didn't select any board 2012-05-23 15:05:19 +02:00
Cristian Maglie
33083d84b3 Merge of arduino-1.0.1. Work in progress... 2012-05-23 09:22:52 +02:00
Cristian Maglie
b276a75d13 Pre-merge upstream Arduino 2012-05-22 11:23:47 +02:00
David A. Mellis
2cbde219c1 Merge remote-tracking branch 'upstream/master' 2012-05-21 09:31:54 -07:00
Jack Danger
5a92fbdec4 Fixed two typos in deprecation warning in Italiano 2012-05-20 11:36:23 -07:00
David A. Mellis
c8720327a0 Removing Croatian for now as it's incomplete. 
http://code.google.com/p/arduino/issues/detail?id=914
 2012-05-16 16:52:34 -04:00
Zach Eveland
32e365b480 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-05-15 15:40:23 -04:00
David A. Mellis
8acd49f842 Removing extraneous .po and .properties files. 2012-05-15 10:22:54 -04:00
David Cuartielles
9193e45366 eliminate temp files 2012-05-11 22:42:49 +02:00
David Cuartielles
44573fc5f0 added a couple of languags 2012-05-11 22:42:09 +02:00
Cristian Maglie
2dd98cc328 Fixed IDE crash when user preferences was set to a no-more-existent board 2012-04-25 13:39:53 +02:00
David Cuartielles
1908613308 updated translation files 2012-04-17 13:06:27 +02:00
David Cuartielles
2df086b316 modifier Preferences.java to include Indonesian 2012-04-16 15:38:18 +02:00
David Cuartielles
8c7bfecce0 added Indonesian 2012-04-16 15:29:19 +02:00
David Cuartielles
7b9c4c5935 reviewed language files 2012-04-15 23:17:34 +02:00
David Cuartielles
36de2699ee cleaned up a bit 2012-04-15 22:24:37 +02:00
David Cuartielles
9ff3445902 fixed a whoe series of language files 2012-04-15 22:22:40 +02:00
David Cuartielles
433fe269f6 moiified several files 2012-04-11 23:19:10 +02:00
Zach Eveland
4786251fe2 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-04-11 15:04:11 -04:00
dcuartielles
9a340926da Fixed case for Russian language to fit the rest of the languages 2012-04-11 10:14:48 +03:00
Zach Eveland
b2f4e5f769 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-04-09 08:25:43 -04:00
Zach Eveland
caeaa4571c sketch USB VID and PID values are passed in from boards.txt at compile time now. changed sketch PIDs to final values. also uncommented Micro section in boards.txt 2012-04-09 08:06:35 -04:00
David A. Mellis
1247b1e5e4 Merge pull request #72 from dcuartielles/master 
modified language files
 2012-04-08 14:57:07 -07:00
David Cuartielles
7f2f7ea5e5 revised language files 2012-04-08 23:49:56 +02:00
David A. Mellis
49be972ca4 Case correction in preferences dialog. 2012-04-08 17:33:52 -04:00
David A. Mellis
ea4693026e Removing comment. 2012-04-08 17:33:34 -04:00
David A. Mellis
cf02e3a491 Removing unused po and properties files. 2012-04-08 17:33:24 -04:00
David A. Mellis
3ea9d4734f Updating the Chinese names of the Chinese languages. 
Previous names referred to geographic locations; new ones are to the
style of characters.
 2012-04-08 16:58:31 -04:00
David A. Mellis
189e023346 Replacing call to isEmpty(), which isn't in Java 1.5. 2012-04-08 16:18:57 -04:00
David A. Mellis
3875a6c00f Adding language names in their own language. 2012-04-08 15:47:27 -04:00
David A. Mellis
b816571772 Adding "system default" (default locale) option for IDE language. 
That is, if the editor.languages.current preference is empty (or
missing), use the default system locale.
 2012-04-08 15:06:24 -04:00
David A. Mellis
c03ea000a2 Moving language selection up in the preferences dialog. 2012-04-08 14:51:37 -04:00
David Cuartielles
f89bf2e523 modified Preferences.java, added Russian, revised French 2012-04-08 11:18:22 +02:00
Zach Eveland
12aed647bc added trapping for additional avrdude errors 
some errors were not being caught and the user was not being notified.
 2012-04-07 22:48:23 -04:00
Zach Eveland
fbc5d30ad7 for Leonardo don't return from uploading until the bootloader port disconnects and the sketch port reconnects 
meant to save users from accidentally opening the bootloader port in Serial Monitor when it is still open immediately after an upload.  this is bad for the user because the port dies without notice immediately afterward.
 2012-04-07 22:47:07 -04:00
David Cuartielles
c3535a0d8e hacked the IDE to support multiple translations and include a dropdown list to choose the most convenient 2012-04-08 03:51:37 +02:00
Zach Eveland
4cf5f4e246 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-04-06 07:00:13 -04:00
David Cuartielles
ad1d5ca89d modified Preferences.java to include one of the strings into the translation files 2012-04-04 18:24:43 +02:00
Zach Eveland
f66b83dd35 Revert "close SerialMonitor when port goes away suddenly (as when user presses Leonardo reset button)" 
This reverts commit e9a00eb38f.
 2012-04-03 09:20:47 -04:00
Zach Eveland
e9a00eb38f close SerialMonitor when port goes away suddenly (as when user presses Leonardo reset button) 2012-04-01 14:39:52 -04:00
David A. Mellis
232c7808be Custom error messages for use of Mouse and Keyboard on non-Leonardo boards. 2012-03-31 14:50:56 -04:00
Zach Eveland
8e176b0084 selectively suppress unwanted avrdude output for Leonardo when not verbose uploading is disabled 2012-03-30 22:24:40 -04:00
Zach Eveland
e90cb3650d tweaked verbosity level for avrdude on Leonardo uploads 2012-03-29 22:31:01 -04:00
Zach Eveland
61c5176681 only print Leonardo upload port hunting status if verbose uploading is selected. also cleaned up other verbose message handling for Leonardo upload progress. 2012-03-29 20:01:45 -04:00
Zach Eveland
d169114205 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-03-14 15:40:29 -04:00
Zach Eveland
d3d94b157e updated avrdudeUploader with new path for Caterina 2012-03-08 14:23:45 -05:00
David A. Mellis
d06710ebe5 Also delaying after auto-reset on Windows. 
Windows seemed to have the same issue as Linux: scanning for the ports
prevented the reset from happening (i.e. it opened the port or
otherwise raised DTR).
 2012-03-06 16:33:29 -05:00
David A. Mellis
2cff5593ec Adding delay on Linux before looking for Leonardo bootloader. 2012-03-04 20:42:44 -05:00
David A. Mellis
eda8f1301f Lowering non-Windows timeout for assuming Leonardo has reset. 
On Mac and Linux, the serial port should disappear fairly quickly.  So
if we see the selected port after 500 ms, it should be the bootloader
(not the sketch still).
 2012-03-04 19:38:53 -05:00
David A. Mellis
4ab241ceb6 Revert "Speed up on serial port touch" 
This reverts commit a5404125f6.
 2012-03-04 19:29:07 -05:00
Zach Eveland
9531c47c43 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-03-03 20:27:27 -05:00
David A. Mellis
a292677108 Adding preference for disabling verification on upload (Nathan Seidle) 
Adds a checkbox to the preferences dialog that controls whether or not
to verify code on upload via serial (verification still always occurs
when uploading using a programmer).  It is checked by default to match
current behavior.
 2012-03-03 13:54:10 -05:00
Zach Eveland
8a35793794 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 
Conflicts:
	.gitignore
 2012-03-03 13:28:39 -05:00
David A. Mellis
a6eb9ea5eb Fixing double- and triple-click selection behavior (Peter Lewis) 
Double clicking selects words, double-clicking and dragging does too.
Triple-click for lines.

http://code.google.com/p/arduino/issues/detail?id=824
 2012-03-02 18:06:29 -05:00
David A. Mellis
b133faa68f Commenting out extraneous println(). 2012-03-02 17:57:10 -05:00
David A. Mellis
0db8bdbbb0 Find / Replace dialog cleanup and improvements (Peter Lewis) 
Adds Find Previous and Use Selection for Find; various other cleanups.
Changes Mac keyboard shortcut for Redo from Command-Y to
Command-Shift-Z.

http://code.google.com/p/arduino/issues/detail?id=825
 2012-03-02 17:56:17 -05:00
David A. Mellis
599a9052c9 Updating version to 101. 2012-03-02 17:47:57 -05:00
David A. Mellis
f1f2f8e49c Lowering minimum size for Editor text area. 
This should make it possible to shrink the overall IDE window without
losing the scroll bars on the text pane.

http://code.google.com/p/arduino/issues/detail?id=52
 2012-03-11 15:05:44 -04:00
David Mellis
24916baf70 Don't insert newline in serial monitor keyboard shortcut (Lars J. Nielsen) 
http://code.google.com/p/arduino/issues/detail?id=279
 2012-03-11 13:50:47 -04:00
Zach Eveland
12eb56ac77 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-02-28 22:50:35 -05:00
David A. Mellis
784232c6a5 Adding 32-bit version of AVR toolchain on Linux (Paul Stoffregen) 
http://code.google.com/p/arduino/issues/detail?id=300
 2012-02-28 14:50:28 -05:00
David A. Mellis
b861ae7767 Lowering upload timeout and per-iteration delay in Leonardo upload. 2012-02-28 12:59:52 -05:00
Cristian Maglie
a5404125f6 Speed up on serial port touch 2012-02-28 18:28:34 +01:00
Cristian Maglie
5d309dbb46 Added error messages for Leonardo upload 2012-02-27 16:32:24 +01:00
Cristian Maglie
507921fd0f Changes in upload procedure (WIP) 2012-02-27 14:51:19 +01:00
Cristian Maglie
60f8e10bf9 Reviewed IDE upload procedure for Leonardo bootloader 2012-02-24 17:30:29 +01:00
Zach Eveland
9ec558ba8d AvrdudeUploader auto reset improvements: auto-detect new port on Windows, big speedup on Windows and Mac/Linux 
IDE auto-detects new port now instead of prompting user.  Better handling of delay on all platforms dramatically speeds up the upload sequence.
 2012-02-22 22:35:28 -05:00
Zach Eveland
65ddc6c43b Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader 2012-02-22 15:19:32 -05:00
David A. Mellis
6ab18ea1cc Lowering minimum editor heights for netbooks 
http://code.google.com/p/arduino/issues/detail?id=52
 2012-02-14 16:13:39 -08:00
Cristian Maglie
13ef2908b4 Added serial.port.file preference for linux 2012-02-13 17:56:16 +01:00
Zach Eveland
bab3c5eade Leonardo auto-reset-and-upload changes for Windows (explanation below) 
On Windows COM port changes when board switched between bootloader and sketch.  No way to prevent this so now Windows users have to select the upload port separate from the comm port.  Also, handling of reset into bootloader was broken on Windows.  Would occasionally leave the original COM port completely unusable.  Changed the way this reset is initiated.
Finally, had to add upload.disable.flushing=true flag to boards.txt so IDE wouldn't try to flush the original COM port after it disappeared.
 2012-02-13 00:56:06 -05:00
Zach Eveland
5c53796cec added static touchPort() method to Serial class. 
Used by Leonardo to quickly tap the comm port to initiate a reset without the potential problems of doing a full Serial object construct/dispose with all listeners, etc.
 2012-02-13 00:37:21 -05:00
David A. Mellis
cb8e184ab8 Using setMinimumSize() instead of window listener for editor windows. 
http://code.google.com/p/arduino/issues/detail?id=52
 2012-02-12 19:58:40 -05:00
Zach Eveland
731ee15f0e increased wait time for Leonardo uploading to 8 seconds 2012-02-06 15:27:44 -05:00
Cristian Maglie
043c190876 Upload size computation is now parametric 2012-02-06 00:51:24 +01:00
Cristian Maglie
a141a1dc1e Upload/Program with configurable generic command line tools (wip) 2012-02-05 23:17:15 +01:00
Zach Eveland
1e0700b536 fixed starting Leonardo bootloader from sketch 
AvrdudeUploader class opens and closes Leonardo port at the magic baudrate before starting avrdude; reduced reset timeout from 250 ms to 15 ms
 2012-02-03 21:42:46 -05:00
Cristian Maglie
30ec90aca3 First attemp to generalize upload for mutiplatform IDE 2012-02-01 14:34:29 +01:00
Cristian Maglie
b295ab911e Some runtime infos now resides in preferences under runtime.* keys 2012-02-01 14:27:41 +01:00
Cristian Maglie
ab00a1360f Fixed preference setting whe changing board 2012-02-01 14:25:26 +01:00
Cristian Maglie
65afe35433 Skip reserved tools folder when detecting TargetPackages 2012-01-14 14:59:14 +01:00
Cristian Maglie
fe001fdaba Factored out some common build variables 2012-01-13 20:39:48 +01:00
Cristian Maglie
4a0260e2b5 Refactored corePath field in Compiler class 2012-01-13 18:17:28 +01:00
Cristian Maglie
0dd5309bc0 Recursive properties string-replace 2012-01-13 14:10:34 +01:00
Cristian Maglie
d2734fa8e8 Fixed eclipse project files 2012-01-11 13:59:39 +01:00
Cristian Maglie
a50431e3a4 Merge branch 'new-extension' into HEAD 
Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.jdt.ui.prefs
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	app/src/processing/app/debug/Compiler.java
	build/build.xml
	build/shared/lib/preferences.txt
	hardware/arduino/avr/boards.txt
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168.c
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_ng.hex
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
	hardware/arduino/avr/bootloaders/atmega/Makefile
	hardware/arduino/avr/bootloaders/atmega8/ATmegaBOOT.c
	hardware/arduino/avr/bootloaders/atmega8/ATmegaBOOT.hex
	hardware/arduino/avr/bootloaders/atmega8/Makefile
	hardware/arduino/avr/bootloaders/bt/ATmegaBOOT_168.c
	hardware/arduino/avr/bootloaders/bt/ATmegaBOOT_168.hex
	hardware/arduino/avr/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
	hardware/arduino/avr/bootloaders/bt/Makefile
	hardware/arduino/avr/bootloaders/lilypad/LilyPadBOOT_168.hex
	hardware/arduino/avr/bootloaders/lilypad/src/ATmegaBOOT.c
	hardware/arduino/avr/bootloaders/lilypad/src/Makefile
	hardware/arduino/avr/bootloaders/optiboot/optiboot.c
	hardware/arduino/avr/bootloaders/optiboot/optiboot_atmega328-Mini.hex
	hardware/arduino/avr/bootloaders/stk500v2/License.txt
	hardware/arduino/avr/bootloaders/stk500v2/Makefile
	hardware/arduino/avr/bootloaders/stk500v2/STK500V2.pnproj
	hardware/arduino/avr/bootloaders/stk500v2/STK500V2.pnps
	hardware/arduino/avr/bootloaders/stk500v2/avrinterruptnames.h
	hardware/arduino/avr/bootloaders/stk500v2/command.h
	hardware/arduino/avr/bootloaders/stk500v2/stk500boot.c
	hardware/arduino/avr/bootloaders/stk500v2/stk500boot.ppg
	hardware/arduino/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
	hardware/arduino/avr/cores/arduino/Arduino.h
	hardware/arduino/avr/cores/arduino/HardwareSerial.cpp
	hardware/arduino/avr/cores/arduino/HardwareSerial.h
	hardware/arduino/avr/cores/arduino/IPAddress.cpp
	hardware/arduino/avr/cores/arduino/IPAddress.h
	hardware/arduino/avr/cores/arduino/Printable.h
	hardware/arduino/avr/cores/arduino/Tone.cpp
	hardware/arduino/avr/cores/arduino/WCharacter.h
	hardware/arduino/avr/cores/arduino/WInterrupts.c
	hardware/arduino/avr/cores/arduino/WMath.cpp
	hardware/arduino/avr/cores/arduino/WString.cpp
	hardware/arduino/avr/cores/arduino/WString.h
	hardware/arduino/avr/cores/arduino/binary.h
	hardware/arduino/avr/cores/arduino/wiring.c
	hardware/arduino/avr/cores/arduino/wiring_analog.c
	hardware/arduino/avr/cores/arduino/wiring_digital.c
	hardware/arduino/avr/cores/arduino/wiring_private.h
	hardware/arduino/avr/cores/arduino/wiring_pulse.c
	hardware/arduino/avr/cores/arduino/wiring_shift.c
	hardware/arduino/avr/firmwares/MEGA-dfu_and_usbserial_combined.hex
	hardware/arduino/avr/firmwares/README.txt
	hardware/arduino/avr/firmwares/UNO-dfu_and_usbserial_combined.hex
	hardware/arduino/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.c
	hardware/arduino/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.h
	hardware/arduino/avr/firmwares/arduino-usbdfu/Board/LEDs.h
	hardware/arduino/avr/firmwares/arduino-usbdfu/Descriptors.c
	hardware/arduino/avr/firmwares/arduino-usbdfu/Descriptors.h
	hardware/arduino/avr/firmwares/arduino-usbdfu/makefile
	hardware/arduino/avr/firmwares/arduino-usbdfu/readme.txt
	hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
	hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
	hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial.c
	hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial.h
	hardware/arduino/avr/firmwares/arduino-usbserial/Board/LEDs.h
	hardware/arduino/avr/firmwares/arduino-usbserial/Descriptors.c
	hardware/arduino/avr/firmwares/arduino-usbserial/Descriptors.h
	hardware/arduino/avr/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
	hardware/arduino/avr/firmwares/arduino-usbserial/makefile
	hardware/arduino/avr/firmwares/arduino-usbserial/readme.txt
	hardware/arduino/avr/libraries/EEPROM/EEPROM.cpp
	hardware/arduino/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
	hardware/arduino/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
	hardware/arduino/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
	hardware/arduino/avr/libraries/EEPROM/keywords.txt
	hardware/arduino/avr/libraries/Ethernet/Dhcp.cpp
	hardware/arduino/avr/libraries/Ethernet/Dhcp.h
	hardware/arduino/avr/libraries/Ethernet/Dns.cpp
	hardware/arduino/avr/libraries/Ethernet/Dns.h
	hardware/arduino/avr/libraries/Ethernet/Ethernet.cpp
	hardware/arduino/avr/libraries/Ethernet/Ethernet.h
	hardware/arduino/avr/libraries/Ethernet/EthernetClient.cpp
	hardware/arduino/avr/libraries/Ethernet/EthernetServer.cpp
	hardware/arduino/avr/libraries/Ethernet/EthernetUdp.cpp
	hardware/arduino/avr/libraries/Ethernet/EthernetUdp.h
	hardware/arduino/avr/libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.ino
	hardware/arduino/avr/libraries/Ethernet/examples/ChatServer/ChatServer.ino
	hardware/arduino/avr/libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.ino
	hardware/arduino/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino
	hardware/arduino/avr/libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	hardware/arduino/avr/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
	hardware/arduino/avr/libraries/Ethernet/examples/TelnetClient/TelnetClient.ino
	hardware/arduino/avr/libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.ino
	hardware/arduino/avr/libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.ino
	hardware/arduino/avr/libraries/Ethernet/examples/WebClient/WebClient.ino
	hardware/arduino/avr/libraries/Ethernet/examples/WebServer/WebServer.ino
	hardware/arduino/avr/libraries/Ethernet/keywords.txt
	hardware/arduino/avr/libraries/Ethernet/util.h
	hardware/arduino/avr/libraries/Ethernet/utility/socket.cpp
	hardware/arduino/avr/libraries/Ethernet/utility/socket.h
	hardware/arduino/avr/libraries/Ethernet/utility/w5100.cpp
	hardware/arduino/avr/libraries/Ethernet/utility/w5100.h
	hardware/arduino/avr/libraries/Firmata/Boards.h
	hardware/arduino/avr/libraries/Firmata/Firmata.cpp
	hardware/arduino/avr/libraries/Firmata/Firmata.h
	hardware/arduino/avr/libraries/Firmata/LICENSE.txt
	hardware/arduino/avr/libraries/Firmata/TODO.txt
	hardware/arduino/avr/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/EchoString/EchoString.ino
	hardware/arduino/avr/libraries/Firmata/examples/I2CFirmata/I2CFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt
	hardware/arduino/avr/libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/ServoFirmata/ServoFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/StandardFirmata/LICENSE.txt
	hardware/arduino/avr/libraries/Firmata/examples/StandardFirmata/StandardFirmata.ino
	hardware/arduino/avr/libraries/Firmata/keywords.txt
	hardware/arduino/avr/libraries/SD/File.cpp
	hardware/arduino/avr/libraries/SD/README.txt
	hardware/arduino/avr/libraries/SD/SD.cpp
	hardware/arduino/avr/libraries/SD/SD.h
	hardware/arduino/avr/libraries/SD/examples/CardInfo/CardInfo.ino
	hardware/arduino/avr/libraries/SD/examples/Datalogger/Datalogger.ino
	hardware/arduino/avr/libraries/SD/examples/DumpFile/DumpFile.ino
	hardware/arduino/avr/libraries/SD/examples/Files/Files.ino
	hardware/arduino/avr/libraries/SD/examples/ReadWrite/ReadWrite.ino
	hardware/arduino/avr/libraries/SD/examples/listfiles/listfiles.ino
	hardware/arduino/avr/libraries/SD/keywords.txt
	hardware/arduino/avr/libraries/SD/utility/FatStructs.h
	hardware/arduino/avr/libraries/SD/utility/Sd2Card.cpp
	hardware/arduino/avr/libraries/SD/utility/Sd2Card.h
	hardware/arduino/avr/libraries/SD/utility/Sd2PinMap.h
	hardware/arduino/avr/libraries/SD/utility/SdFat.h
	hardware/arduino/avr/libraries/SD/utility/SdFatUtil.h
	hardware/arduino/avr/libraries/SD/utility/SdFatmainpage.h
	hardware/arduino/avr/libraries/SD/utility/SdFile.cpp
	hardware/arduino/avr/libraries/SD/utility/SdInfo.h
	hardware/arduino/avr/libraries/SD/utility/SdVolume.cpp
	hardware/arduino/avr/libraries/SPI/SPI.cpp
	hardware/arduino/avr/libraries/SPI/SPI.h
	hardware/arduino/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
	hardware/arduino/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.ino
	hardware/arduino/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
	hardware/arduino/avr/libraries/SPI/keywords.txt
	hardware/arduino/avr/libraries/Servo/Servo.cpp
	hardware/arduino/avr/libraries/Servo/Servo.h
	hardware/arduino/avr/libraries/Servo/examples/Knob/Knob.ino
	hardware/arduino/avr/libraries/Servo/examples/Sweep/Sweep.ino
	hardware/arduino/avr/libraries/Servo/keywords.txt
	hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
	hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.h
	hardware/arduino/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	hardware/arduino/avr/libraries/SoftwareSerial/keywords.txt
	hardware/arduino/avr/libraries/Wire/Wire.cpp
	hardware/arduino/avr/libraries/Wire/Wire.h
	hardware/arduino/avr/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino
	hardware/arduino/avr/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino
	hardware/arduino/avr/libraries/Wire/examples/master_reader/master_reader.ino
	hardware/arduino/avr/libraries/Wire/examples/master_writer/master_writer.ino
	hardware/arduino/avr/libraries/Wire/examples/slave_receiver/slave_receiver.ino
	hardware/arduino/avr/libraries/Wire/examples/slave_sender/slave_sender.ino
	hardware/arduino/avr/libraries/Wire/keywords.txt
	hardware/arduino/avr/libraries/Wire/utility/twi.c
	hardware/arduino/avr/libraries/Wire/utility/twi.h
	hardware/arduino/avr/programmers.txt
	hardware/arduino/avr/variants/mega/pins_arduino.h
	hardware/arduino/avr/variants/micro/pins_arduino.h
	hardware/arduino/avr/variants/standard/pins_arduino.h
	hardware/arduino/boards.txt
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168.c
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_ng.hex
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
	hardware/arduino/bootloaders/atmega/Makefile
	hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c
	hardware/arduino/bootloaders/atmega8/ATmegaBOOT.hex
	hardware/arduino/bootloaders/atmega8/Makefile
	hardware/arduino/bootloaders/bt/ATmegaBOOT_168.c
	hardware/arduino/bootloaders/bt/ATmegaBOOT_168.hex
	hardware/arduino/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
	hardware/arduino/bootloaders/bt/Makefile
	hardware/arduino/bootloaders/lilypad/LilyPadBOOT_168.hex
	hardware/arduino/bootloaders/lilypad/src/ATmegaBOOT.c
	hardware/arduino/bootloaders/lilypad/src/Makefile
	hardware/arduino/bootloaders/optiboot/optiboot.c
	hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
	hardware/arduino/bootloaders/stk500v2/License.txt
	hardware/arduino/bootloaders/stk500v2/Makefile
	hardware/arduino/bootloaders/stk500v2/STK500V2.pnproj
	hardware/arduino/bootloaders/stk500v2/STK500V2.pnps
	hardware/arduino/bootloaders/stk500v2/avrinterruptnames.h
	hardware/arduino/bootloaders/stk500v2/command.h
	hardware/arduino/bootloaders/stk500v2/stk500boot.c
	hardware/arduino/bootloaders/stk500v2/stk500boot.ppg
	hardware/arduino/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
	hardware/arduino/cores/arduino/Arduino.h
	hardware/arduino/cores/arduino/HardwareSerial.cpp
	hardware/arduino/cores/arduino/HardwareSerial.h
	hardware/arduino/cores/arduino/Stream.h
	hardware/arduino/cores/arduino/Tone.cpp
	hardware/arduino/cores/arduino/WCharacter.h
	hardware/arduino/cores/arduino/WInterrupts.c
	hardware/arduino/cores/arduino/WMath.cpp
	hardware/arduino/cores/arduino/WString.cpp
	hardware/arduino/cores/arduino/WString.h
	hardware/arduino/cores/arduino/binary.h
	hardware/arduino/cores/arduino/wiring.c
	hardware/arduino/cores/arduino/wiring_analog.c
	hardware/arduino/cores/arduino/wiring_digital.c
	hardware/arduino/cores/arduino/wiring_private.h
	hardware/arduino/cores/arduino/wiring_pulse.c
	hardware/arduino/cores/arduino/wiring_shift.c
	hardware/arduino/firmwares/MEGA-dfu_and_usbserial_combined.hex
	hardware/arduino/firmwares/README.txt
	hardware/arduino/firmwares/UNO-dfu_and_usbserial_combined.hex
	hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.c
	hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.h
	hardware/arduino/firmwares/arduino-usbdfu/Board/LEDs.h
	hardware/arduino/firmwares/arduino-usbdfu/Descriptors.c
	hardware/arduino/firmwares/arduino-usbdfu/Descriptors.h
	hardware/arduino/firmwares/arduino-usbdfu/makefile
	hardware/arduino/firmwares/arduino-usbdfu/readme.txt
	hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
	hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
	hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.c
	hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.h
	hardware/arduino/firmwares/arduino-usbserial/Board/LEDs.h
	hardware/arduino/firmwares/arduino-usbserial/Descriptors.c
	hardware/arduino/firmwares/arduino-usbserial/Descriptors.h
	hardware/arduino/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
	hardware/arduino/firmwares/arduino-usbserial/makefile
	hardware/arduino/firmwares/arduino-usbserial/readme.txt
	hardware/arduino/pins/mega/pins_arduino.h
	hardware/arduino/pins/standard/pins_arduino.h
	hardware/arduino/programmers.txt
	hardware/avr/boards.txt
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168.c
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_ng.hex
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
	hardware/avr/bootloaders/atmega/Makefile
	hardware/avr/bootloaders/atmega8/ATmegaBOOT.c
	hardware/avr/bootloaders/atmega8/ATmegaBOOT.hex
	hardware/avr/bootloaders/atmega8/Makefile
	hardware/avr/bootloaders/bt/ATmegaBOOT_168.c
	hardware/avr/bootloaders/bt/ATmegaBOOT_168.hex
	hardware/avr/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
	hardware/avr/bootloaders/bt/Makefile
	hardware/avr/bootloaders/lilypad/LilyPadBOOT_168.hex
	hardware/avr/bootloaders/lilypad/src/ATmegaBOOT.c
	hardware/avr/bootloaders/lilypad/src/Makefile
	hardware/avr/bootloaders/optiboot/Makefile
	hardware/avr/bootloaders/optiboot/makeall
	hardware/avr/bootloaders/optiboot/optiboot.c
	hardware/avr/bootloaders/optiboot/optiboot_atmega328.hex
	hardware/avr/bootloaders/optiboot/optiboot_atmega328.lst
	hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
	hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst
	hardware/avr/bootloaders/optiboot/optiboot_diecimila.hex
	hardware/avr/bootloaders/optiboot/optiboot_diecimila.lst
	hardware/avr/bootloaders/optiboot/optiboot_lilypad.hex
	hardware/avr/bootloaders/optiboot/optiboot_lilypad.lst
	hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.hex
	hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.lst
	hardware/avr/bootloaders/optiboot/optiboot_luminet.hex
	hardware/avr/bootloaders/optiboot/optiboot_luminet.lst
	hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.hex
	hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.lst
	hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.hex
	hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.lst
	hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.hex
	hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.lst
	hardware/avr/bootloaders/stk500v2/License.txt
	hardware/avr/bootloaders/stk500v2/Makefile
	hardware/avr/bootloaders/stk500v2/STK500V2.pnproj
	hardware/avr/bootloaders/stk500v2/STK500V2.pnps
	hardware/avr/bootloaders/stk500v2/avrinterruptnames.h
	hardware/avr/bootloaders/stk500v2/command.h
	hardware/avr/bootloaders/stk500v2/stk500boot.c
	hardware/avr/bootloaders/stk500v2/stk500boot.ppg
	hardware/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
	hardware/avr/cores/arduino/Arduino.h
	hardware/avr/cores/arduino/HardwareSerial.cpp
	hardware/avr/cores/arduino/HardwareSerial.h
	hardware/avr/cores/arduino/Print.cpp
	hardware/avr/cores/arduino/Print.h
	hardware/avr/cores/arduino/Stream.h
	hardware/avr/cores/arduino/WCharacter.h
	hardware/avr/cores/arduino/WInterrupts.c
	hardware/avr/cores/arduino/WMath.cpp
	hardware/avr/cores/arduino/WString.cpp
	hardware/avr/cores/arduino/WString.h
	hardware/avr/cores/arduino/main.cpp
	hardware/avr/cores/arduino/wiring.c
	hardware/avr/cores/arduino/wiring_analog.c
	hardware/avr/cores/arduino/wiring_digital.c
	hardware/avr/cores/arduino/wiring_private.h
	hardware/avr/cores/arduino/wiring_pulse.c
	hardware/avr/cores/arduino/wiring_shift.c
	hardware/avr/firmwares/MEGA-dfu_and_usbserial_combined.hex
	hardware/avr/firmwares/README.txt
	hardware/avr/firmwares/UNO-dfu_and_usbserial_combined.hex
	hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.c
	hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.h
	hardware/avr/firmwares/arduino-usbdfu/Board/LEDs.h
	hardware/avr/firmwares/arduino-usbdfu/Descriptors.c
	hardware/avr/firmwares/arduino-usbdfu/Descriptors.h
	hardware/avr/firmwares/arduino-usbdfu/makefile
	hardware/avr/firmwares/arduino-usbdfu/readme.txt
	hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
	hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
	hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.c
	hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.h
	hardware/avr/firmwares/arduino-usbserial/Board/LEDs.h
	hardware/avr/firmwares/arduino-usbserial/Descriptors.c
	hardware/avr/firmwares/arduino-usbserial/Descriptors.h
	hardware/avr/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
	hardware/avr/firmwares/arduino-usbserial/makefile
	hardware/avr/firmwares/arduino-usbserial/readme.txt
	hardware/avr/libraries/EEPROM/EEPROM.cpp
	hardware/avr/libraries/EEPROM/EEPROM.h
	hardware/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
	hardware/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
	hardware/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
	hardware/avr/libraries/EEPROM/keywords.txt
	hardware/avr/libraries/Ethernet/Client.cpp
	hardware/avr/libraries/Ethernet/Client.h
	hardware/avr/libraries/Ethernet/Dhcp.cpp
	hardware/avr/libraries/Ethernet/Dhcp.h
	hardware/avr/libraries/Ethernet/Dns.cpp
	hardware/avr/libraries/Ethernet/Dns.h
	hardware/avr/libraries/Ethernet/Ethernet.cpp
	hardware/avr/libraries/Ethernet/Ethernet.h
	hardware/avr/libraries/Ethernet/IPAddress.cpp
	hardware/avr/libraries/Ethernet/IPAddress.h
	hardware/avr/libraries/Ethernet/Server.cpp
	hardware/avr/libraries/Ethernet/Server.h
	hardware/avr/libraries/Ethernet/Udp.cpp
	hardware/avr/libraries/Ethernet/Udp.h
	hardware/avr/libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.pde
	hardware/avr/libraries/Ethernet/examples/ChatServer/ChatServer.pde
	hardware/avr/libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.pde
	hardware/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.pde
	hardware/avr/libraries/Ethernet/examples/PachubeClient/PachubeClient.pde
	hardware/avr/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.pde
	hardware/avr/libraries/Ethernet/examples/TelnetClient/TelnetClient.pde
	hardware/avr/libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.pde
	hardware/avr/libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.pde
	hardware/avr/libraries/Ethernet/examples/WebClient/WebClient.pde
	hardware/avr/libraries/Ethernet/examples/WebServer/WebServer.pde
	hardware/avr/libraries/Ethernet/keywords.txt
	hardware/avr/libraries/Ethernet/util.h
	hardware/avr/libraries/Ethernet/utility/socket.cpp
	hardware/avr/libraries/Ethernet/utility/socket.h
	hardware/avr/libraries/Ethernet/utility/w5100.cpp
	hardware/avr/libraries/Ethernet/utility/w5100.h
	hardware/avr/libraries/Firmata/Boards.h
	hardware/avr/libraries/Firmata/Firmata.cpp
	hardware/avr/libraries/Firmata/Firmata.h
	hardware/avr/libraries/Firmata/LICENSE.txt
	hardware/avr/libraries/Firmata/TODO.txt
	hardware/avr/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde
	hardware/avr/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde
	hardware/avr/libraries/Firmata/examples/AnalogFirmata/Makefile
	hardware/avr/libraries/Firmata/examples/EchoString/EchoString.pde
	hardware/avr/libraries/Firmata/examples/EchoString/Makefile
	hardware/avr/libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde
	hardware/avr/libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt
	hardware/avr/libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.pde
	hardware/avr/libraries/Firmata/examples/ServoFirmata/Makefile
	hardware/avr/libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde
	hardware/avr/libraries/Firmata/examples/SimpleAnalogFirmata/Makefile
	hardware/avr/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde
	hardware/avr/libraries/Firmata/examples/SimpleDigitalFirmata/Makefile
	hardware/avr/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde
	hardware/avr/libraries/Firmata/examples/StandardFirmata/LICENSE.txt
	hardware/avr/libraries/Firmata/examples/StandardFirmata/Makefile
	hardware/avr/libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde
	hardware/avr/libraries/Firmata/examples/StandardFirmata_2_2_forUNO_0_3/StandardFirmata_2_2_forUNO_0_3.pde
	hardware/avr/libraries/Firmata/keywords.txt
	hardware/avr/libraries/SD/File.cpp
	hardware/avr/libraries/SD/README.txt
	hardware/avr/libraries/SD/SD.cpp
	hardware/avr/libraries/SD/SD.h
	hardware/avr/libraries/SD/examples/CardInfo/CardInfo.pde
	hardware/avr/libraries/SD/examples/Datalogger/Datalogger.pde
	hardware/avr/libraries/SD/examples/DumpFile/DumpFile.pde
	hardware/avr/libraries/SD/examples/Files/Files.pde
	hardware/avr/libraries/SD/examples/ReadWrite/ReadWrite.pde
	hardware/avr/libraries/SD/examples/listfiles/listfiles.pde
	hardware/avr/libraries/SD/keywords.txt
	hardware/avr/libraries/SD/utility/FatStructs.h
	hardware/avr/libraries/SD/utility/Sd2Card.cpp
	hardware/avr/libraries/SD/utility/Sd2Card.h
	hardware/avr/libraries/SD/utility/Sd2PinMap.h
	hardware/avr/libraries/SD/utility/SdFat.h
	hardware/avr/libraries/SD/utility/SdFatUtil.h
	hardware/avr/libraries/SD/utility/SdFatmainpage.h
	hardware/avr/libraries/SD/utility/SdFile.cpp
	hardware/avr/libraries/SD/utility/SdInfo.h
	hardware/avr/libraries/SD/utility/SdVolume.cpp
	hardware/avr/libraries/SPI/SPI.cpp
	hardware/avr/libraries/SPI/SPI.h
	hardware/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.pde
	hardware/avr/libraries/Servo/Servo.cpp
	hardware/avr/libraries/Servo/Servo.h
	hardware/avr/libraries/Servo/examples/Knob/Knob.pde
	hardware/avr/libraries/Servo/examples/Sweep/Sweep.pde
	hardware/avr/libraries/Servo/keywords.txt
	hardware/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
	hardware/avr/libraries/SoftwareSerial/SoftwareSerial.h
	hardware/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	hardware/avr/libraries/SoftwareSerial/examples/TwoPortRXExample/TwoPortRXExample.pde
	hardware/avr/libraries/SoftwareSerial/icrmacros.h
	hardware/avr/libraries/SoftwareSerial/keywords.txt
	hardware/avr/libraries/Wire/Wire.cpp
	hardware/avr/libraries/Wire/Wire.h
	hardware/avr/libraries/Wire/utility/twi.c
	hardware/avr/libraries/Wire/utility/twi.h
	hardware/avr/programmers.txt
	hardware/avr/variants/mega/pins_arduino.h
	hardware/avr/variants/standard/pins_arduino.h
	hardware/sam/cores/sam/Tone.cpp.disabled
	hardware/sam/cores/sam/binary.h
	hardware/sam/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde
	hardware/sam/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde
	hardware/sam/libraries/SPI/keywords.txt
	hardware/sam/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
	hardware/sam/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
	hardware/sam/libraries/Wire/examples/master_reader/master_reader.pde
	hardware/sam/libraries/Wire/examples/master_writer/master_writer.pde
	hardware/sam/libraries/Wire/examples/slave_receiver/slave_receiver.pde
	hardware/sam/libraries/Wire/examples/slave_sender/slave_sender.pde
	hardware/sam/libraries/Wire/keywords.txt
	libraries/EEPROM/EEPROM.cpp
	libraries/EEPROM/EEPROM.h
	libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
	libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
	libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
	libraries/EEPROM/keywords.txt
	libraries/Ethernet/Client.cpp
	libraries/Ethernet/Dhcp.cpp
	libraries/Ethernet/Dhcp.h
	libraries/Ethernet/Dns.cpp
	libraries/Ethernet/Dns.h
	libraries/Ethernet/Ethernet.cpp
	libraries/Ethernet/Ethernet.h
	libraries/Ethernet/IPAddress.cpp
	libraries/Ethernet/IPAddress.h
	libraries/Ethernet/Server.cpp
	libraries/Ethernet/Udp.cpp
	libraries/Ethernet/Udp.h
	libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.pde
	libraries/Ethernet/examples/ChatServer/ChatServer.pde
	libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.pde
	libraries/Ethernet/examples/DnsWebClient/DnsWebClient.pde
	libraries/Ethernet/examples/PachubeClient/PachubeClient.pde
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.pde
	libraries/Ethernet/examples/TelnetClient/TelnetClient.pde
	libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.pde
	libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.pde
	libraries/Ethernet/examples/WebClient/WebClient.pde
	libraries/Ethernet/examples/WebServer/WebServer.pde
	libraries/Ethernet/keywords.txt
	libraries/Ethernet/util.h
	libraries/Ethernet/utility/socket.cpp
	libraries/Ethernet/utility/socket.h
	libraries/Ethernet/utility/w5100.cpp
	libraries/Ethernet/utility/w5100.h
	libraries/Firmata/Boards.h
	libraries/Firmata/Firmata.cpp
	libraries/Firmata/Firmata.h
	libraries/Firmata/LICENSE.txt
	libraries/Firmata/TODO.txt
	libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde
	libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde
	libraries/Firmata/examples/EchoString/EchoString.pde
	libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde
	libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt
	libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.pde
	libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde
	libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde
	libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde
	libraries/Firmata/examples/StandardFirmata/LICENSE.txt
	libraries/Firmata/examples/StandardFirmata_2_2_forUNO_0_3/StandardFirmata_2_2_forUNO_0_3.pde
	libraries/Firmata/keywords.txt
	libraries/SD/File.cpp
	libraries/SD/README.txt
	libraries/SD/SD.cpp
	libraries/SD/SD.h
	libraries/SD/examples/CardInfo/CardInfo.pde
	libraries/SD/examples/Datalogger/Datalogger.pde
	libraries/SD/examples/DumpFile/DumpFile.pde
	libraries/SD/examples/Files/Files.pde
	libraries/SD/examples/ReadWrite/ReadWrite.pde
	libraries/SD/examples/listfiles/listfiles.pde
	libraries/SD/keywords.txt
	libraries/SD/utility/FatStructs.h
	libraries/SD/utility/Sd2Card.cpp
	libraries/SD/utility/Sd2Card.h
	libraries/SD/utility/Sd2PinMap.h
	libraries/SD/utility/SdFat.h
	libraries/SD/utility/SdFatUtil.h
	libraries/SD/utility/SdFatmainpage.h
	libraries/SD/utility/SdFile.cpp
	libraries/SD/utility/SdInfo.h
	libraries/SD/utility/SdVolume.cpp
	libraries/SPI/SPI.cpp
	libraries/SPI/SPI.h
	libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde
	libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.pde
	libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde
	libraries/SPI/keywords.txt
	libraries/Servo/Servo.cpp
	libraries/Servo/Servo.h
	libraries/Servo/examples/Knob/Knob.pde
	libraries/Servo/examples/Sweep/Sweep.pde
	libraries/Servo/keywords.txt
	libraries/SoftwareSerial/SoftwareSerial.cpp
	libraries/SoftwareSerial/SoftwareSerial.h
	libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	libraries/SoftwareSerial/keywords.txt
	libraries/Wire/Wire.cpp
	libraries/Wire/Wire.h
	libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
	libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
	libraries/Wire/examples/master_reader/master_reader.pde
	libraries/Wire/examples/master_writer/master_writer.pde
	libraries/Wire/examples/slave_receiver/slave_receiver.pde
	libraries/Wire/examples/slave_sender/slave_sender.pde
	libraries/Wire/keywords.txt
	libraries/Wire/utility/twi.c
	libraries/Wire/utility/twi.h
 2012-01-11 13:45:31 +01:00
Cristian Maglie
c2d1de3844 Removed unused/unuseful defines from platform.txt 2012-01-09 18:51:51 +01:00
Cristian Maglie
b7c54b79d7 Fine tuned libraries search. Reintroduced ./libraries folder for shipped 
platform independent libraries.
 2012-01-09 18:20:55 +01:00
Cristian Maglie
57b8713cab Moved libraries folder inside platform folder. Now libraries and examples are searched per board/platform 2012-01-04 15:14:51 +01:00
Cristian Maglie
387e6b63c7 Renamed platforms.txt to platform.txt 2012-01-02 19:11:57 +01:00
Cristian Maglie
812265f1c0 Removed useless defaults in platform. Remove useless boards.txt/*.platform keys. Renamed some method to a more meaningful name 2012-01-02 17:39:43 +01:00
Cristian Maglie
8157ebf25a Makeup-only: fixed some indentation and file headers 2012-01-02 16:45:01 +01:00
Cristian Maglie
5ad4422fc7 Merge remote-tracking branch 'arduino/master' into platforms-b 2011-12-31 17:29:36 +01:00
Cristian Maglie
a417455d5a Platform is now implicit when referring to other packages, e.g. 'arduino:avr:arduino' becomes 'arduino:arduino' 2011-12-31 15:23:54 +01:00
Cristian Maglie
770c8dfe35 Compiler class refactoring: toolchain path, build path and preferences are now class members. 2011-12-31 15:07:59 +01:00
Cristian Maglie
abe41d805d platforms.txt recipes now have symbolic variables instead of indexes ({0},{1},etc.) 
Recipes arguments are splitted with spaces instead of |. Single argument containing spaces
should be placed between "double quotes".
Refactored and formatted Compiler class, removed all unused code in comments.
 2011-12-31 14:32:48 +01:00
David A. Mellis
b5c21fcefb Removing console logs (stdout.txt and stderr.txt) on exit. (Paul Stoffregen) 
http://code.google.com/p/arduino/issues/detail?id=701
 2011-12-30 10:17:06 -05:00
Cristian Maglie
1b3ae5fa63 Created second level in hardware folder: hardware/PACKAGE/PLATFORM/... 
Made some helper class for files filtering.
platforms.txt now contains only one platform at a time.
Some cleanup in Compiler and AvrDudeUploader classes.
 2011-12-30 15:46:04 +01:00
Cristian Maglie
dc616601cd Various cleanups. Introduced class PreferencesMap to replace/simplify Map<String, String>. 2011-12-28 20:00:07 +01:00
Cristian Maglie
e63c2d1429 Various post-merge refinements. 2011-12-22 13:07:39 +01:00
Cristian Maglie
65c15d93eb Merge commit 'fcbbf8f4b4960bae1091c0cd9dc58b4a1885baf6' into platforms-b 
Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/debug/Compiler.java
	build/build.xml
	hardware/arduino/boards.txt
 2011-12-22 00:35:33 +01:00
David A. Mellis
24a0dfdf00 Refactoring compile and upload to speed-up compilation, too. 2011-12-16 19:51:07 -05:00
David A. Mellis
a29866f7da Removing delete previous applet folder on export preference. 2011-12-16 19:05:06 -05:00
David A. Mellis
1a7fe19348 Removing per-board compilation speedup checks. 2011-12-16 18:49:43 -05:00
David A. Mellis
b0ae6e764d Compilation speed-up patch (only compile modify files). (Paul Stoffregen) 
http://code.google.com/p/arduino/issues/detail?id=638
 2011-12-16 18:20:22 -05:00
Shigeru KANEMOTO
7b8888a93a Fix for full-width space bug. 
Imported from Processing development r6687 on
http://code.google.com/p/processing
Close #1
 2011-12-07 01:45:13 +09:00
Shigeru KANEMOTO
541a7b3575 UI i18n and the Japanese text catalog. 
Wrapped the every string literals with _(...) function.
The _() function resides in "app/src/processing/app/I18n.java",
which translates the UI texts using "Resources_XX.properties" file
where XX is the locale code.

I provided the properties file for the ja (Japanese) locale.
I created this file using "xgettext" and "msgcat" commands.
"i18n_update.{py,sh}" files are the tool I used to do that.

Change in "app/build.xml" is to include the properties files
in jar file.
 2011-12-07 01:45:13 +09:00
David A. Mellis
fa4ab4f6ab Adding --relax flag for linking of ATmega2560 code. (arducopter) 
http://code.google.com/p/arduino/issues/detail?id=729
 2011-12-05 17:21:05 -05:00
David A. Mellis
10aba52ab8 Making editor font size apply to serial monitor and console (Paul Stoffregen) 
http://code.google.com/p/arduino/issues/detail?id=550
 2011-12-03 16:27:11 -05:00
David A. Mellis
fe243801a4 Fixing "auto-associate" preference text (.pde -> .ino). 
http://code.google.com/p/arduino/issues/detail?id=699
 2011-10-29 17:47:17 -04:00
Cristian Maglie
7684a2fe85 Libraries search path now include platform specific versions 2011-10-24 11:58:52 +02:00
Cristian Maglie
821481fcd7 Updated bossac to 1.2 for linux and win (MacOS version must be ported as well) 2011-10-24 11:21:50 +02:00
David A. Mellis
b14a3c501e Lock / unlock fuses and hex file now optional for burn bootloader command. 
This allows the "burn bootloader" command to be used, for example, to set the fuses on a microcontroller without actually loading a bootloader onto it.

http://code.google.com/p/arduino/issues/detail?id=683
http://code.google.com/p/arduino/issues/detail?id=684
 2011-10-21 18:25:14 -04:00
Cristian Maglie
d059beaa72 Added bossa binary for Windows 2011-10-16 23:25:44 +04:30
Cristian Maglie
1e69d0284d Temporary upload hack, until bossa get fixed. 2011-10-12 11:12:56 +02:00
Cristian Maglie
cb92a1d402 Added upload with bossac 2011-10-06 01:58:38 +02:00
David A. Mellis
a2235e3cdc Showing compilation warnings when verbose output is enabled. 
http://code.google.com/p/arduino/issues/detail?id=664
 2011-10-01 17:05:21 -04:00
David A. Mellis
d49c8e2c13 Restore .pde sketches too (not just .ino ones). 
http://code.google.com/p/arduino/issues/detail?id=652
 2011-09-25 10:01:36 -04:00
Cristian Maglie
3681035869 IDE: various refactoring to make sam hardware compiling. 2011-09-23 04:47:41 +02:00
Cristian Maglie
bd7e6d89d5 Compilation process for ARM (WIP) 2011-09-17 00:02:40 +02:00
David A. Mellis
43fa225724 Dialog and preference about renaming .pde to .ino files on save. 
The new extension (.ino) is used by default for all new sketches (whether created with new or save as).  It's possible, however, to control the behavior on save.  The first time you save a sketch with a .pde file, you're prompted to rename it or cancel the save.  There's a preference that allow selecting whether or not .pde files are renamed on save.

http://code.google.com/p/arduino/issues/detail?id=644
 2011-09-16 13:30:50 -04:00
David A. Mellis
026794f1eb Don't rename read-only files in sketch on save (which becomes save-as). 
http://code.google.com/p/arduino/issues/detail?id=639
 2011-09-16 12:45:24 -04:00
Cristian Maglie
131f7898b6 Removed dialog box warning when auto-renaming from .pde to .ino. 
Now both .pde and .ino ext are hidden in IDE tabs.
 2011-09-11 23:45:12 +02:00
Cristian Maglie
5d97d467c8 File renamed from .pde to .ino during save. 2011-09-10 01:16:24 +02:00
David A. Mellis
0b09a8edd9 Adding custom error messages for some 1.0 changes. 
Also, changing the logic of the code a bit to correctly place errors even when substituting custom error messages.
 2011-09-08 18:10:29 -04:00
David A. Mellis
c9d4630d2b Fallback on system avrdude if Arduino avrdude isn't present (Linux). 2011-09-07 20:00:06 +02:00
David A. Mellis
551b8e85ac Don't use the low-res icon on Mac OS X. 
http://code.google.com/p/arduino/issues/detail?id=612
 2011-08-31 15:29:54 -04:00
Cristian Maglie
15b28b415d Mouse change cursor shape when is moved over a URL. 2011-08-30 23:22:59 +02:00
David A. Mellis
4553cee443 Fixes to compile under Java 1.5 (on my Linux machine). 2011-08-27 00:01:08 +02:00
David Mellis
bd6c90e5b8 Setting Arduino icon for serial monitor window. 
http://code.google.com/p/arduino/issues/detail?id=564
 2011-08-24 11:57:58 -04:00
David A. Mellis
0020105283 Also updating serial port display from "Serial port not found" dialog. 2011-08-24 11:55:24 -04:00
David A. Mellis
91a94cbe7e Removing "board: " prefix from line status bar. 2011-08-24 11:50:02 -04:00
David A. Mellis
365d4acf6e Merge remote-tracking branch 'cmaglie/port-on-statusbar' into new-extension 2011-08-24 11:46:18 -04:00
David A. Mellis
d501a9ba0e Single-click to open a URL / link (rather than double-click). 2011-08-24 11:35:12 -04:00
David A. Mellis
8ea35d4e6d Merge remote-tracking branch 'cmaglie/schematics-view' into new-extension 2011-08-24 11:32:19 -04:00
Cristian Maglie
71dd5dd534 Selected board and serial port on status bar. 2011-08-24 16:53:57 +02:00
Cristian Maglie
0fca78cc7e Fixed position of the Label of command buttons. 2011-08-24 11:36:14 +02:00
Cristian Maglie
88794ec1d6 Double-click now opens URL (right-click still shows "Open URL" in popup 
menù).
 2011-08-24 10:42:58 +02:00
David A. Mellis
d00f0949ed Renaming pins/ directory to the more generic variants/ 
http://code.google.com/p/arduino/issues/detail?id=588
 2011-08-23 17:07:39 -04:00
Cristian Maglie
303b2e5103 Removed arrow. 2011-08-23 19:29:36 +02:00
Cristian Maglie
f233861a4c URL right-clickable and underlined. 2011-08-23 19:21:42 +02:00
Cristian Maglie
6886910f3d Serial button on the right. 2011-08-22 18:24:13 +02:00
Cristian Maglie
d60c42e5ed Clickable url are now searched with a good regexp and highlighted. 2011-08-19 22:32:34 +02:00
Cristian Maglie
a6c8753a80 Schematic URL. Actually tag is "@schematics <url>" that should be put 
inside code comments.
 2011-08-19 19:51:02 +02:00
David A. Mellis
ac3f093b76 Revert "Added Schematic view (from wiring)." 
This reverts commit ccb318c2ab.
 2011-08-18 14:54:42 -04:00
David A. Mellis
fc90fa7d9d Showing progress during compilation as well as upload. 2011-08-16 17:51:19 -04:00
Cristian Maglie
ccb318c2ab Added Schematic view (from wiring). 2011-08-16 20:38:23 +02:00
Cristian Maglie
42943b4de3 Added progressbar (from wiring) 2011-08-16 19:52:31 +02:00
David A. Mellis
d9dcc66232 [sam] fixing compilation in IDE (changing some #includes). 2011-07-17 09:50:36 -04:00
ricklon
a6646ca08c fixed an issue, -Wl,--gc-sections needed to have a comma. 2011-06-29 20:21:35 -04:00
David A. Mellis
05d622f3ac Adapting Rick's platform work to other platform changes. 2011-06-25 12:51:56 -04:00
ricklon
dacfa86223 Addtional debuggin. Trying to find the pins compile issue. 2011-06-22 21:20:45 -06:00
ricklon
43a11be3c9 Cleaned up some of the code. Need to focus getting the 1.0 code compilation changes double checked. 2011-06-18 23:44:32 -04:00
ricklon
aa01546b55 Switched to a nonconflicting delimeter |. Compile process is working. Need to make sure that it matches 1.0 process exactly. 2011-06-17 22:12:21 -04:00
ricklon
67c9dfc667 A bit of cleanup. Delimeter not figured out yet. 2011-06-17 00:54:58 -04:00
ricklon
a57f35fb51 Fixed the missing line for messageformat args. 2011-06-16 23:17:08 -04:00
ricklon
72c4404c6d Fixed compile process up to step 4. asyncExec cannot have null argmuments from the array. 2011-06-16 20:36:39 -04:00
ricklon
b0556c2e74 Changed :: to , for platforms.txt. Also, changes to compile process to support execAsynchronously changed to Stringp[] 2011-06-15 23:04:38 -04:00
ricklon
5e0ac9c720 Converting the step by step functions to integrate with standard Arduino execAsynchronously(array) 2011-06-13 22:14:28 -04:00
ricklon
7cf5b7263f Fixed issues about invalid targets. Menu selection of boards and libraries are now functional. 2011-06-13 21:23:59 -04:00
ricklon
fa268259a0 Majority of non Compiler.java changes made. 2011-06-13 14:14:22 -04:00
ricklon
41600a22eb Added initial changes to the Compiler.java file. 2011-06-06 22:34:12 -04:00
David A. Mellis
43cfc87f17 Updating version number to 0100 to allow checking for Arduino 1.0. 
http://code.google.com/p/arduino/issues/detail?id=453
 2011-03-26 16:41:30 -04:00
David A. Mellis
63d3190cbb Not re-opening .pde sketches left open from a pre-1.0 version of Arduino. 
That way, we can wait to rename them until the user explicitly opens them in Arduino 1.0.
 2011-03-26 16:23:29 -04:00
David A. Mellis
19597b1d0b Factoring pin definitions out of the core. 
That is, there's now a pins/ directory in a platform, which includes multiple directories, each of which has its own pins_arduino.h.  The boards.txt gets a new preferences, <BOARD>.build.pins, whose values is a sub-directory of the pins/ directory (possibly with a "platform:" prefix).  That sub-directory is then placed in the include path during compilation.
 2011-03-04 21:05:05 -05:00
David A. Mellis
d05e4021d0 Renamed WProgram.h to Arduino.h. 2011-03-01 19:52:13 -05:00
David A. Mellis
97abbd7a31 Removing BYTE keyword (use Serial.write() instead). 2011-02-26 13:58:03 -05:00
David A. Mellis
12d4552c66 Merge branch 'master' into new-extension 
Conflicts:
	app/src/processing/app/Editor.java
 2010-12-25 18:59:59 -06:00
David Mellis
6fa74cf711 Serial prompt fixes. 
Not showing the serial prompt if no serial ports are available.
Showing the serial prompt for verbose upload, too.
 2010-12-23 19:28:39 -05:00
David A. Mellis
3625a1001e Adding preferences for verbose compilation and upload. 2010-12-20 16:49:14 -05:00
David A. Mellis
f1146d80a5 Adding upload using programmer options (instead of verbose). 2010-12-20 14:50:18 -05:00
David A. Mellis
8523ab1ac7 If no upload protocol is specified for a board, use selected programmer instead. 
Eliminates use of the upload.using preferences to specify a particular programmer.  Select the programmer from the menu instead.
 2010-12-17 20:33:20 -05:00
David A. Mellis
15d07fa036 Splitting up programmer selection menu and burn bootloader menu item. 2010-12-17 19:58:40 -05:00
David A. Mellis
3e31777fec Merge branch 'master' into new-extension 2010-12-17 09:12:36 -05:00
David A. Mellis
920212ee05 Revert "added toInt() function to WString". 
This reverts commit 448222e4b6.
 2010-11-29 15:14:10 -05:00
Tom Igoe
448222e4b6 added toInt() function to WString 2010-11-29 11:31:00 -05:00
David A. Mellis
37e6e7e86b Changing version number to 0022. 2010-11-28 14:16:10 -06:00
David A. Mellis
a142a2564d Enabling debugging for compilation of the app. 2010-11-27 11:54:07 -06:00
David A. Mellis
6750e679af Building sketch first (so errors appear faster). 
http://code.google.com/p/arduino/issues/detail?id=393
 2010-11-27 11:39:42 -06:00
David A. Mellis
5d9602a28a Showing dialog when serial port not found on upload. 2010-11-24 14:03:21 -05:00
David A. Mellis
06d3d85143 Handling < > & and unicode in copy to html. 
http://code.google.com/p/arduino/issues/detail?id=29
 2010-11-16 22:51:24 -05:00
David A. Mellis
dc3b815c29 Merge branch 'master' into new-extension 2010-11-10 12:15:28 -05:00
David A. Mellis
24e057a343 Setting Arduino icon. 2010-11-10 11:46:52 -05:00
David A. Mellis
299b779ca2 Updating colors, toolbar icon, and about image. 2010-11-10 10:43:46 -05:00
David A. Mellis
5e028ea09d Saving and restoring serial monitor line ending. 2010-11-07 22:38:58 -05:00
David A. Mellis
1cac73c254 Saving and restoring location of the serial monitor. 2010-11-07 22:25:02 -05:00
David Mellis
1fbffaf7be Changing Windows file association code from .pde to .ino. 
It doesn't seem to work properly on my Windows Vista machine, but neither does the .pde association for Processing.
 2010-11-06 16:38:23 -04:00
David A. Mellis
e2213d4721 Changing extension from .pde to .ino. 
Renames all .pde files in a sketch to .ino upon opening.  Prompts the user the first time this happens; if the rename is cancelled, the sketch is not opened and the user will be prompted next time a sketch with a .pde file is opened.  Otherwise, renames files in all future opened sketches automatically (without prompting).  Still allows for opening of .pde files and includes them in the sketchbook and examples menus.

Still need to check the file association code.

http://code.google.com/p/arduino/issues/detail?id=13
 2010-11-06 15:41:01 -04:00
David A. Mellis
fa4d058297 Reapplying Christian's regex patch. 
Revert "Revert "Removed dependencies from regex library oro.jar""

This reverts commit ed7795ef8d.
 2010-10-03 19:44:28 -04:00
David A. Mellis
4c26e071c8 Updating version to 0021. 2010-10-02 14:03:50 -04:00
David A. Mellis
750c860a0d RXTXcomm.jar with only RXTXCommDriver.class updated (to add /dev/ttyACM* on Linux). 2010-10-02 18:55:16 +02:00
David A. Mellis
d09edea5e7 Recompiled rxtx to include /dev/ttyACM* on Linux. 2010-10-02 18:18:45 +02:00
David A. Mellis
ed7795ef8d Revert "Removed dependencies from regex library oro.jar" 
This reverts commit 2b4391052c.
 2010-10-02 17:19:53 +02:00
Cristian Maglie
2b4391052c Removed dependencies from regex library oro.jar 2010-10-01 19:41:36 +02:00
David A. Mellis
5c22a1e970 Updating version to 0020. 2010-09-24 16:29:07 -04:00
David A. Mellis
5e2f82b742 Updating SPI library error message and revisions.txt for final 0019 release. 2010-09-03 23:12:12 +00:00
David A. Mellis
e3856766c6 Creating a custom error message for missing SPI.h (because we changed the Ethernet library to rely on it). issue #337 2010-08-28 09:33:37 +00:00
David A. Mellis
bc8e5c3dcf Updating / reverting to the previous / future Processing new window behavior: toolbar opens things in the existing window, menus in a new window. 2010-08-15 19:12:00 +00:00
David A. Mellis
c5e8c3e4bd Toggling RTS as well as DTR for auto-reset. 2010-08-10 01:32:28 +00:00
David A. Mellis
78e093b482 Moving line endings selection combo-box. 2010-08-02 18:11:49 +00:00
David A. Mellis
6f96ce0df2 Adding drop-down for selecting line ending to serial monitor (issue #119). Also switching subpanes from BorderLayout to BoxLayout. 2010-07-11 15:31:34 +00:00
David A. Mellis
03a62f38d2 Allowing third-party hardware platforms to reference programmers defined in other platforms (issue #283). 2010-07-10 21:29:32 +00:00
David A. Mellis
39610d1325 Skipping all hidden files (those starting with a dot - ".") when compiling (issue #209). 2010-06-13 19:25:33 +00:00
David A. Mellis
9fe672fc63 Providing error messages when no board is selected. 2010-06-12 18:32:32 +00:00
David A. Mellis
0979ed050b Updating version number to 0019. 
Some revisions.
 2010-05-29 17:01:43 +00:00
David A. Mellis
8bdde5d683 Adding automatically scoll option to serial monitor (pause / continue). 
Changing how errors are displayed when the serial monitor can't be opened.
 2010-05-29 17:00:08 +00:00
David A. Mellis
6efe13c8a1 Fixing issue with tab menu and tabs with the same base name but different extensions (issue 191). 2010-05-16 04:43:03 +00:00
David A. Mellis
775c4d272c Only check for conflict with an existing C++ file when renaming the sketch, not when adding a new file. 2010-05-16 04:09:21 +00:00
David A. Mellis
c4760d8ae7 Moving to ant-based build system from Processing. Mac OS X seems to work (for the moment). 2010-05-08 21:47:19 +00:00
David A. Mellis
5d54fbf70b Removing some Processing stuff that we don't need. 
Moving the Arduino Fio up in the boards menu.
 2010-05-08 20:37:54 +00:00
David A. Mellis
e5d56a1e59 Redoing the error message parsing / handling. Now using Sketch.placeException() to map back to the sketch code files and line numbers. Showing more of the actual output of avr-gcc / avr-g++. 2010-05-08 20:06:31 +00:00
David A. Mellis
34579ae440 Initial sync with Processing 6406. Compiles and runs (on Mac OS X) but probably very buggy. 2010-04-21 01:58:57 +00:00
David A. Mellis
0648283425 faq -> FAQ in Base.java (matching case of file name). 
Adding date of 0018 release to readme.
 2010-02-21 12:36:58 +00:00
David A. Mellis
a5b9d31134 Stopping you from renaming the main / first sketch file (.pde) if it contains a .cpp file with the new name. 2010-01-28 21:19:53 +00:00
David A. Mellis
2b7862a7d1 Pointing the update check at the Arduino server (instead of processing.org). 2010-01-10 20:14:59 +00:00
David A. Mellis
9a5507fd07 Saving immediately when replacing a sketch with another in the same editor. Should fix bug: http://code.google.com/p/arduino/issues/detail?id=88 2009-12-26 15:42:30 +00:00
David A. Mellis
a2ee999135 Allowing multiples files in a sketch with the same name but different extensions. Not, however, allowing a .cpp file with the same name as the sketch, because they would conflict during the build process. 2009-12-24 21:35:38 +00:00
David A. Mellis
2a3a8b1c4f Moving sketch compilation during upload from applet/ sub-directory to a temporary folder. 2009-12-23 00:00:57 +00:00
David A. Mellis
d2a38e4b5a Improving third-party hardware support: 
- moving back to multple cores per platform
- using target instead of platform
- moving per-board and per-programmer preferences out of Preferences.java and into a new Target class
- adding a new "target" preference
- support for platform:value values in board preferences for bootloader path and core
- XXX: need to support platform:value syntax for board upload.using preferences.
 2009-11-21 23:23:43 +00:00
David A. Mellis
8720addcba Got bootloader burning working. 
Wrapped some long lines.
 2009-11-08 20:51:41 +00:00
David A. Mellis
e5b5f25476 Third-party cores seems to sort of work now, but burning bootloaders is probably broken. 
Need to decide on the format for the boards.txt file.
 2009-11-07 18:56:45 +00:00
David A. Mellis
3075c8e4fd Moving libraries out of arduino platform / core directory and to top-level. 2009-11-07 17:54:56 +00:00
David A. Mellis
294abd0419 No longer mangling microcontroller names before passing them to avrdude, as it seems to support the same ones as avr-gcc now. 2009-10-23 23:28:35 +00:00
David A. Mellis
6a15e01ff8 Passing the ARDUINO constant from the IDE to avr-gcc as a command line argument (so I don't forget to update the version in the .h file). 2009-10-23 23:04:03 +00:00
David A. Mellis
2e26a2d994 Syncing with Processing 1.0.9 (revision 5766). 2009-10-22 00:56:16 +00:00
David A. Mellis
7f58e2213e Adding support for setting baud rate to use with a programmer. 2009-10-22 00:55:07 +00:00
David A. Mellis
e814744504 Enabling the Sketchbook and Examples menu on Mac OS X with native (screen) menu bar. Processing has these disabled because they often cause problems, but they seem to be working at the moment, so I'm leaving them in. 2009-09-26 16:48:46 +00:00
David A. Mellis
048143f3d5 Adding support for .S files in libraries and cores. Patches from René Bohne. 2009-09-25 19:31:01 +00:00
David A. Mellis
f2010ebd2b Fixing whitespace in Compiler.java. 2009-09-25 19:05:09 +00:00
David A. Mellis
3dc7fc0781 Syncing with Processing 1.0.7 (5692); needs testing. 
Also, the Sketchbook and Examples menus are currently disabled on the Mac to work-around a bug in Apple's implementation of Java.  I think this bug may have been solved, so I should try re-enabling the menus and see what happens (on 10.4 and 10.5 and 10.6).  Also, I may still need to update the jre / jdk on Linux.
 2009-09-24 03:16:00 +00:00
David A. Mellis
240607a4a6 Holding shift when pressing run or upload buttons give verbose output. 
The upload.verbose and build.verbose preferences are still respected.

You don't get verbose output with Command-Shift-R or Command-Shift-U, unlike Processing in which the shift modifier switches from Run to Present.  Mostly this is because I didn't think verbose output deserved its own menu items, and that's how Processing implements the other shortcut.

Holding shift while pressing upload doesn't show the compilation command lines.  This matches the functionality of the upload.verbose preference, but may imply that the upload button doesn't also compile the code.

Also, in Snow Leopard, the temp directory is in some crazy folder in /var.  Luckily, everything still seems to work okay.
 2009-09-23 23:40:59 +00:00
David A. Mellis
3febe7ce42 Adding a serial monitor menu item and keyboard shortcut (control-shift-m / command-shift-m). 2009-09-23 22:59:55 +00:00
David A. Mellis
8f4b24492f Updating version to 0018. 2009-09-13 17:56:43 +00:00
David A. Mellis
018ff13d8b Moving setting of Linux look and feel from linux/Platform.java to arduino script. 2009-08-11 23:05:18 +00:00
David A. Mellis
777e7cd30d Removing check for JDK (as opposed to JRE) in Base.java. This is because on Linux, it's tricky to automatically include tools.jar in the classpath (which is necessary for the Processing code to think that the JDK is present). (For example, Ubuntu doesn't set the JAVA_HOME variable.) As far as I know, Arduino doesn't actually need the JDK, but I could be wrong. 2009-08-03 20:53:31 +00:00
David A. Mellis
a0d608e946 Fixing default sketchbook path (Processing -> Arduino). Not setting the Windows window icon to the Processing icon (it stays as the Java icon instead). 2009-07-14 22:24:20 +00:00
David A. Mellis
59a85bfe59 (Re-)implementing syntax highlighting support for library keywords. 2009-07-12 00:40:02 +00:00
David A. Mellis
15cff82214 Removing unused preferences. Fixing upload when not deleting applet/ directory. Treating examples in the sketchbook/libraries folder as read-only. 2009-06-18 19:22:43 +00:00
David A. Mellis
bb9525ad24 Disabling the serial monitor during uploads. 2009-06-18 18:29:53 +00:00
David A. Mellis
250bce0f34 Adding keyboard shortcut (command or ctrl w) for closing the serial monitor window. 2009-06-16 20:21:39 +00:00
David A. Mellis
672ad5648e Allowing (and fixing) uploading of unsaved sketches. 2009-06-16 19:49:28 +00:00
David A. Mellis
e88592771e Removing attempt to flush the incoming serial data when opening the port, since it didn't seem to work. 2009-06-13 21:28:46 +00:00
David A. Mellis
4b80afbca1 Going back to one serial monitor at a time, but closing it when you pick a new serial port from the Tools > Serial Port menu (and when you upload). 2009-06-13 21:28:15 +00:00
David A. Mellis
b81a8f0309 Now supporting multiple serial monitors open at once (one for each port). 2009-06-13 21:05:15 +00:00
David A. Mellis
678e09896f Moving serial error messages into the serial monitor (out of the editor). 2009-06-13 20:42:43 +00:00
David A. Mellis
a258042deb Adding a basic serial monitor. 2009-06-13 20:26:21 +00:00
David A. Mellis
8823b5ba79 Ignoring lines of error messages with "In file included from" in them. 2009-06-13 12:31:54 +00:00
David A. Mellis
cdf0095e70 Modifying compilation for libraries: 
- now compiled to their own sub-directory of the build directory
 - only can see #include's in their own utility/ folders
and the core (building core.a again).

Also changed the APIs of the compilation functions somewhat (e.g. execAsynchronously no longer returns anything; it just throws a RunnerException on any error).

Still need to better handle errors in #include files; right now, the error is interpreted as being at the line where the #include happens, not within the header file.
 2009-06-13 11:41:16 +00:00
David A. Mellis
cbcbc5c4d5 Removing extra nested "examples" menu. 2009-06-07 11:28:53 +00:00
David A. Mellis
8b6fb36ace Integrating the Sizer. 2009-06-01 20:10:05 +00:00
David A. Mellis
e2952cdc77 Enabling / integrating bootloader burning. (Should be tested with a serial AVRISP and a parallel programmer) 2009-06-01 19:27:21 +00:00
David A. Mellis
5f26d058e6 Fixing help menu links, integrating copy as html, and modifying EditorToolbar labels (Run -> Verify, Export -> Upload). 2009-06-01 19:02:46 +00:00
David A. Mellis
d589209e92 Adding examples to the toolbar's open menu (in addition to the examples menu). 2009-06-01 18:21:13 +00:00
David A. Mellis
89139d1f77 More cleanup: 
- fixing import library
- changing compilation to only look for source files in the root and utility/ folders of a library; also adding utility/ sub-folder to the include path
- removing export to application
- renaming run to verify / compile and export to upload
 2009-06-01 18:11:25 +00:00
David A. Mellis
df4f1629c4 Making things more Arduino-like (cont...) 2009-06-01 17:10:56 +00:00
David A. Mellis
14778514ae Re-configured compilation and integrated uploading. Added the Board and Serial port menus: these are currently shared across editor windows. 
No longer using Library and LibraryManager.  Instead the compiler finds the .c and .cpp files in the library paths (gotten from the Sketch via the Preprocessor and the Base's library table).  This breaks libraries that have header files in sub-directories but use #include with no path names (as sub-directories of library directories are not on the include path).  It will also cause problems with .c or .cpp files with the same name in different library utility folders or in a sketch or the target (core).

Now deriving the Target correctly from the selected item in the board menu.
 2009-06-01 15:14:05 +00:00
David A. Mellis
ae98fbfee8 Fixing some compilations bugs: 
- including .cpp and .c files from sketch
 - adjusting error line highlighted according to the number of function prototypes generated
 - taking into account preprocessor offset on the first .pde file
 2009-06-01 09:28:41 +00:00
David A. Mellis
2fa8deb92d First integration of the Arduino code in Processing 5503: PreProcessor and Compiler have been integrated with changes to the Sketch. 
Compilation still has problems (Thread error on success, and can't handle non-pde files in a sketch).
Modified the Mac OS X make.sh to copy the hardware, avr tools, and example over.
Removing some of the antlr stuff.  
Disabling the Commander (command-line execution) for now.
Added Library, LibraryManager, and Target.
Added support for prefixed preferences (e.g. for boards and programmers).
 2009-06-01 08:32:11 +00:00
David A. Mellis
22ed6cdb73 Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00