Commit Graph

213 Commits

Author SHA1 Message Date
David A. Mellis 896b1a48a1 Revert "Merge branch 'new-extension' of git@github.com:arduino/Arduino"
This reverts commit 42fa932ceb, reversing
changes made to a7352b894f.

See: http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt for information on how to merge the branch in later.
2011-02-25 18:23:34 -05:00
Tom Igoe fa3728ea03 Merge branch 'master' of git@github.com:arduino/Arduino 2011-02-24 09:31:13 -05:00
David A. Mellis 24e62aa4e7 Switching to RXTX-2.1-7r2 on 64-bit Linux (working version).
This also means we don't need a separate RXTXcomm.jar file for 64-bit Linux.
2011-02-16 23:26:40 -05:00
David A. Mellis 6e227dda6e Updating 64-bit linux version of avrdude (to one with usbtiny support).
This also means we don't need a separate avrdude.conf for the 64-bit Linux version of avrdude.
2011-02-16 20:56:33 -05:00
David A. Mellis 253ab0cace Support for building on 64-bit Linux.
Includes changes to the build.xml, 64-bit versions of avrdude and RXTX native libraries, and alternative versions of the RXTX jar and avrdude.conf for those 64-bit versions (because they also have other differences).
2011-02-16 20:23:24 -05:00
tigoe 40d2c3db0b Fixed typo in Midi communication example 2011-02-08 13:46:31 -08:00
Tom Igoe a1b3f9983c Merge branch 'master' of git@github.com:arduino/Arduino 2011-01-18 15:51:14 -05:00
tigoe e6dc688d2b Changed pin number to reconcile code with drawing on Arduino site. 2011-01-12 03:59:02 -08: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 A. Mellis 300f5e2ed0 Following symlinks in arduino launch script for Linux. 2010-12-24 23:02:34 +01:00
David A. Mellis 46b442fb90 Switching default board to the Uno (from Duemilanove). 2010-12-24 13:45:43 -06:00
David A. Mellis ad5f10996d Updating revisions.txt. 2010-12-24 13:22:07 -06:00
David A. Mellis a18eb93d81 Don't include ArduinoTestSuite in Mac OS X distribution. 2010-12-24 11:41:48 -06:00
David A. Mellis 942435a678 Updating reference (and reference-fetching scripts). 2010-12-23 19:08:09 -06:00
David Mellis 544cfafb36 Updating eeprom.h on Windows, too. 2010-12-23 19:14:59 -05:00
David A. Mellis 867dee8245 Custom eeprom.h file to fix Mega 2560. 2010-12-23 18:00:01 -06: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 53f3e8ef92 Adding a couple of more revision notes. 2010-12-11 16:38:58 -05:00
David A. Mellis 743d3707d1 Updating revisions file for 0022. 2010-12-11 16:09:27 -05:00
David A. Mellis 32388c908f Replacing custom String.toInt() function with a call to atol(). 2010-12-03 23:12:41 -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 ab8c3fef6e added example for WCharacter.h functions in String examples 2010-11-29 14:56:33 -05:00
Tom Igoe d6b457967f added two examples to String examples for String to integer conversion 2010-11-29 13:59:09 -05:00
Tom Igoe 448222e4b6 added toInt() function to WString 2010-11-29 11:31:00 -05:00
David A. Mellis 901319bb7d Merge branch 'master' of github.com:arduino/Arduino 2010-11-28 23:46:37 -05:00
David A. Mellis 37e6e7e86b Changing version number to 0022. 2010-11-28 14:16:10 -06:00
David A. Mellis a00c0da97d Removing /usr/lib/jni from LD_LIBRARY_PATH since that's not where RXTX is on my Ubuntu 10.04 system. 2010-11-27 23:57:02 +01:00
David A. Mellis c6d1baa275 Fixing up some Linux stuff. 2010-11-27 19:50:33 +01:00
David Mellis 9e92bed4a7 New about image bitmap for Windows launcher. 2010-11-10 11:53:21 -05:00
David A. Mellis 299b779ca2 Updating colors, toolbar icon, and about image. 2010-11-10 10:43:46 -05:00
David A. Mellis 43092293ec New document icons for new file extension. 2010-11-09 12:31:53 -05:00
David A. Mellis 1240b5d911 Associating .ino, .c, .cpp, .h (but not .pde or .java) with Arduino on Mac OS X. 2010-11-06 16:00:02 -04:00
Tom Igoe c19a0956c4 minor bug fixes in examples 2010-10-28 09:15:30 -04:00
Tom Igoe 81de2b5a05 bug fixes to StateChangeDetection and ToneMelody examples 2010-10-14 14:46:51 -04:00
David A. Mellis 224a7bf768 Adding source-dist target to build.xml.
http://code.google.com/p/arduino/issues/detail?id=193
2010-10-03 21:21:27 -04:00
David A. Mellis 3650b471b9 Merge branch 'master' of github.com:arduino/Arduino 2010-10-03 20:04:29 -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 b656d42e92 Modifying the ant run target in Linux.
According to a comment at http://code.google.com/p/arduino/issues/detail?id=352 this helps ant find the executable.  It still doesn't work for me, but maybe it will for you.
2010-10-02 22:16:22 +02:00
David A. Mellis 4c26e071c8 Updating version to 0021. 2010-10-02 14:03:50 -04: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 Mellis 04be32ce9e Adding Mega 2560 .inf file (Windows). 2010-09-24 09:59:08 -04:00
David Mellis ff226e1c0c Adding Arduino Uno .inf files (Windows). 2010-09-24 09:48:42 -04:00
David A. Mellis 66f671b6a8 Updating application icon for Mac OS X and Windows. (Windows one is untested.) 2010-09-22 09:08:09 -04:00
Tom Igoe bc2999f00d deleted redundant analog in example and corrected typos in comments for analog examples 2010-09-17 16:43:22 +00:00
Tom Igoe 6fbfb713ee corrected note on fade example 2010-09-08 17:49:27 +00:00
Tom Igoe 6628bb061f Corrected an error in StringComparisonOperators example 2010-09-07 18:21:21 +00:00
Tom Igoe 47d3b65e51 Changed analog references to use new A0 through A5 notation 2010-09-04 19:47:59 +00:00