rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-30 11:24:12 +01:00
Code Issues Releases Activity
1,481 Commits 7 Branches 93 Tags 2.9 GiB
e828236692
Commit Graph

48 Commits

Author SHA1 Message Date
David A. Mellis
33544fc3e6 Changing Mac OS X build to a .zip file (and adding OS name to archive). 
http://code.google.com/p/arduino/issues/detail?id=645
 2011-11-28 17:36:03 -05:00
Zach Eveland
a6a59f1783 Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot" 
This reverts commit df9835efaf, reversing
changes made to ec45af8bfa.

Conflicts:

	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
 2011-10-27 11:45:13 -04:00
Zach Eveland
f2bd8a5394 Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot 
Conflicts:
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
 2011-10-27 11:41:02 -04:00
Zach Eveland
df9835efaf Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 
Conflicts:
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde
	build/shared/lib/theme/theme.txt
	hardware/arduino/cores/arduino/HardwareSerial.h
	hardware/arduino/cores/arduino/Print.cpp
	hardware/arduino/cores/arduino/WString.h
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
	libraries/Firmata/examples/EchoString/EchoString.ino
	libraries/SD/File.cpp
	libraries/SoftwareSerial/SoftwareSerial.cpp
	libraries/SoftwareSerial/SoftwareSerial.h
	libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	libraries/SoftwareSerial/keywords.txt
 2011-10-27 09:32:27 -04:00
David A. Mellis
6a68361a14 Updating Mac Info.plist version to 1.0-rc2. 2011-10-25 22:50:57 -04:00
David A. Mellis
68fdc3f012 Fixing a bug in Mac eeprom.h (that appears on ATtiny's). 2011-09-28 17:21:59 -04:00
David A. Mellis
98777c6b87 Updating Mac OS X version to 1.0-rc1. 2011-09-16 20:55:12 -04:00
David A. Mellis
1627fd39dc Updating Mac OS X Info.plist (.app) version to 1.0-beta4. 2011-09-09 17:16:28 -04:00
David A. Mellis
9dcf769123 Updating Mac OS X Info.plist version to 1.0-beta3. 2011-09-04 20:18:05 -04:00
David A. Mellis
1a600d67e2 Updating to avrdude 5.11 on Mac OS X. 
http://code.google.com/p/arduino/issues/detail?id=606
 2011-09-02 20:41:07 -04:00
David A. Mellis
3f0b7f21c2 Updating Mac OS X .app version to 1.0-beta2. 2011-08-26 13:34:25 -04:00
David A. Mellis
0efc1311ab Updating FTDI drivers on Mac OS X (to 2.2.16 from 28 February 2011). 2011-05-13 11:08:59 -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
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
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
867dee8245 Custom eeprom.h file to fix Mega 2560. 2010-12-23 18:00:01 -06: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
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
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
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
66f671b6a8 Updating application icon for Mac OS X and Windows. (Windows one is untested.) 2010-09-22 09:08:09 -04:00
David A. Mellis
e131b36894 Adding version number to Mac Info.plist so it appears in the finder. 2010-08-15 20:11:02 +00:00
David A. Mellis
5b19370b43 Removing old build scripts. 2010-05-22 20:25:06 +00:00
David A. Mellis
334147967a Removing unused Mac OS X dist files. 2010-05-10 01:18:50 +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
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
d28b6358db Updating Mac OS X .dmg with latest FTDI drivers and a link to the Applications folder (with arrow on the background). 2009-12-26 16:35:21 +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
d29c49a27b Updating a newer JavaApplicationStub (from Processing 1.0.9) but removed x86_64 architecture with lipo (because we don't have a 64 bit version of the librxtxSerial.jnilib). 2009-10-23 23:16:45 +00:00
David A. Mellis
41560ca8d6 Upgrading to quaqua 6.2 (from Processing 1.0.9). 2009-10-23 23:11:37 +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
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
8ced792ee5 Adding double-quotes around the $0 in the Mac OS X tools scripts. Should fix compilation when Arduino is in a directory with spaces in its name. 2009-09-13 18:01:35 +00:00
David A. Mellis
d50988f991 New icons and about image by Thomas Glaser (envis precisely). 2009-07-31 21:59:53 +00:00
David A. Mellis
82c3d1fe16 Removing Processing information from the Info.plist; updating todo. 2009-06-07 11:57:38 +00:00
David A. Mellis
1f838c0ae0 Creating the Arduino .dmg template and modifying the Mac OS X dist.sh for Arduino. 2009-06-07 11:16:40 +00:00
David A. Mellis
24b5abc79d Replacing Processing's text files with Arduino's (e.g. todo.txt) 2009-06-01 21:06:59 +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
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