Commit Graph

17 Commits

Author SHA1 Message Date
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 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 b722028c7b Updating to Firmata r82 (e.g. including I2C in StandardFirmata).
http://code.google.com/p/arduino/issues/detail?id=633
2011-09-09 17:11:42 -04:00
David A. Mellis 108df37445 Updating Firmata to r71.
Note that I also changed the extensions of the examples (firmwares) from .pde to .ino and removed the Makefiles (since they assume the pde extension).

http://code.google.com/p/arduino/issues/detail?id=447
2011-09-02 14:43:44 -04:00
Tom Igoe 35777612c0 Changed all .pde examples to .ino
All examples in /build/shared/examples/ and /libraries/ have had their
extensions changed to .ino
2011-08-30 15:33:32 -04:00
David A. Mellis 4ea2d99c1a Re-arranging header files and small fixes to optimized core functions. 2011-03-02 23:05:25 -05:00
David A. Mellis d05e4021d0 Renamed WProgram.h to Arduino.h. 2011-03-01 19:52:13 -05:00
David A. Mellis 6739f20bbf Modifying examples to use Serial.write() instead of Serial.print(BYTE). 2011-02-26 14:04:41 -05:00
David A. Mellis 3eae87adc9 Modifying examples to use Serial.write() instead of Serial.print(BYTE). 2011-02-26 13:57:41 -05:00
David A. Mellis 33ffa9d10b Renaming StandardFirmata for Uno and recompiling with updated baud rate calculation. 2010-11-13 13:41:23 -05:00
David A. Mellis d16367d676 Firmata version used for the Uno and Mega 2560. 2010-10-25 10:58:14 -04:00
David A. Mellis 27cfd22066 1280 -> 1280/2560. 2010-09-08 22:33:33 +00:00
David A. Mellis b7be90d5ec Updating Firmata version number to 2.2 (issue #320). 2010-08-10 01:51:38 +00:00
David A. Mellis 367a0ae9f4 Updating Firmata (to r62 of their repository).
Changes include (according to Paul Stoffregen):
"1: Hardware abstraction layer to support Arduino Mega, Teensy and Sanguino.
2: Extended analog message, to facilitate using PWM and Servo above pin 15.
3: Capability queries (alpha), to allow automatic discovery of any board's features."
2010-08-06 21:55:17 +00:00
David A. Mellis c450e695ab Updating to Firmata rev. 51 (adding OldStandardFirmata and AllInputsFirmata). 2010-01-08 02:30:44 +00:00
David A. Mellis c22d9942ee Updating to the latest version of Firmata (rev. 41). 2009-12-29 18:01:06 +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