Updated Firmata to version 2.3.6

Merge branch 'soundanalogous-firmata-2-3-6' into ide-1.5.x

Author: cmaglie

build/shared/revisions.txt

@@ -31,6 +31,7 @@ ARDUINO 1.5.3 BETA
 * sam: Bugfix SPI library: begin() after end() now works (stimmer)
 * sam: Bugfix SPI library: incorrent pin configuration in non-extended mode.
 * Ported all libraries to new 1.5 format
+* Updated Firmata to version 2.3.6 (Jeff Hoefs)
 
 [firmwares]
 * Arduino Due: fixed USB2Serial garbage at startup (https://github.com/arduino/Arduino/pull/1267)

libraries/Firmata/extras/LICENSE.txt

@@ -0,0 +1,71 @@
+#Firmata
+
+Firmata is a protocol for communicating with microcontrollers from software on a host computer. The [protocol](http://firmata.org/wiki/Protocol) can be implemented in firmware on any microcontroller architecture as well as software on any host computer software package. The arduino repository described here is a Firmata library for Arduino and Arduino-compatible devices. See the [firmata wiki](http://firmata.org/wiki/Main_Page) for additional informataion. If you would like to contribute to Firmata, please see the [Contributing](#contributing) section below.
+
+##Usage
+
+There are two main models of usage of Firmata. In one model, the author of the Arduino sketch uses the various methods provided by the Firmata library to selectively send and receive data between the Arduino device and the software running on the host computer. For example, a user can send analog data to the host using ``` Firmata.sendAnalog(analogPin, analogRead(analogPin)) ``` or send data packed in a string using ``` Firmata.sendString(stringToSend) ```. See File -> Examples -> Firmata -> AnalogFirmata & EchoString respectively for examples.
+
+The second and more common model is to load a general purpose sketch called StandardFirmata on the Arduino board and then use the host computer exclusively to interact with the Arduino board. StandardFirmata is located in the Arduino IDE in File -> Examples -> Firmata.
+
+##Firmata Client Libraries
+Most of the time you will be interacting with arduino with a client library on the host computers. Several Firmata client libraries have been implemented in a variety of popular programming languages:
+
+* procesing
+  * [https://github.com/firmata/processing]
+  * [http://funnel.cc]
+* python
+  * [https://github.com/firmata/pyduino]
+  * [https://github.com/lupeke/python-firmata]
+  * [https://github.com/tino/pyFirmata]
+* perl
+  * [https://github.com/ntruchsess/perl-firmata]
+  * [https://github.com/rcaputo/rx-firmata]
+* ruby 
+  * [https://github.com/hardbap/firmata]
+  * [https://github.com/PlasticLizard/rufinol]
+  * [http://funnel.cc]
+* clojure
+  * [https://github.com/nakkaya/clodiuno]
+* javascript 
+  * [https://github.com/jgautier/firmata]
+  * [http://breakoutjs.com]
+  * [https://github.com/rwldrn/johnny-five]
+* java 
+  * [https://github.com/4ntoine/Firmata]
+  * [https://github.com/shigeodayo/Javarduino]
+* .NET
+  * [http://www.imagitronics.org/projects/firmatanet/]
+* Flash/AS3
+  * [http://funnel.cc]
+  * [http://code.google.com/p/as3glue/]
+* PHP
+  * [https://bitbucket.org/ThomasWeinert/carica-firmata]
+
+Note: The above libraries may support various versions of the Firmata protocol and therefore may not support all features of the latest Firmata spec nor all arduino and arduino-compatible boards. Refer to the respective projects for details.
+
+
+<a name="contributing" />
+##Contributing
+
+If you discover a bug or would like to propose a new feature, please open a new [issue](https://github.com/firmata/arduino/issues?sort=created&state=open). Due to the limited memory of standard Arduino boards we cannot add every requested feature to StandardFirmata. Requests to add new features to StandardFirmata will be evaluated by the Firmata developers. However it is still possible to add new features to other Firmata implementations (Firmata is a protocol whereas StandardFirmata is just one of many possible implementations).
+
+To contribute, fork this respository and create a new topic branch for the bug, feature or other existing issue you are addressing. Submit the pull request against the *dev* branch.
+
+If you would like to contribute but don't have a specific bugfix or new feature to contribute, you can take on an existing issue, see issues labeled "pull-request-encouraged". Add a comment to the issue to express your intent to begin work and/or to get any additional information about the issue.
+
+You must thorougly test your contributed code. In your pull request, describe tests performed to ensure that no existing code is broken and that any changes maintain backwards compatibility with the existing api. Test on multiple Arduino board variants if possible. We hope to enable some form of automated (or at least semi-automated) testing in the future, but for now any tests will need to be executed manually by the contributor and reviewsers.
+
+Maintain the existing code style:
+
+- Indentation is 2 spaces
+- Use spaces instead of tabs
+- Use camel case for both private and public properties and methods
+- Document functions (specific doc style is TBD... for now just be sure to document)
+- Insert first block bracket on line following the function definition:
+
+<pre>void someFunction()
+{
+  // do something
+}
+</pre>

libraries/Firmata/extras/readme.md

@@ -1,10 +1,10 @@
 name=Firmata
-author=
-email=
+author=Firmata Developers
+email=firmata-devel@lists.sourceforge.net
 sentence=This library implements the Firmata protocol and allows you to control the Arduino board from the an application on the computer.
 paragraph=The Firmata library implements the Firmata protocol for communicating with software on the host computer. This allows you to write custom firmware without having to create your own protocol and objects for the programming environment that you are using.
-url=
+url=http://firmata.org
 architectures=*
-version=1.0
-dependencies=SoftwareSerial
+version=2.3.6
+dependencies=
 core-dependencies=arduino (>=1.5.0)

libraries/Firmata/library.properties

@@ -67,14 +67,18 @@ void FirmataClass::begin(void)
 void FirmataClass::begin(long speed)
 {
   Serial.begin(speed);
-  begin(Serial);
-  blinkVersion();  
+  FirmataSerial = &Serial;
+  blinkVersion();
+  printVersion();
+  printFirmwareVersion();
 }
 
 /* begin method for overriding default stream */
 void FirmataClass::begin(Stream &s)
 {
   FirmataSerial = &s;
+  // do not call blinkVersion() here because some hardware such as the
+  // Ethernet shield use pin 13
   printVersion();
   printFirmwareVersion();
 }

libraries/Firmata/src/Firmata.cpp

@@ -21,7 +21,7 @@
  * installed firmware. */
 #define FIRMATA_MAJOR_VERSION   2 // for non-compatible changes
 #define FIRMATA_MINOR_VERSION   3 // for backwards compatible changes
-#define FIRMATA_BUGFIX_VERSION  5 // for bugfix releases
+#define FIRMATA_BUGFIX_VERSION  6 // for bugfix releases
 
 #define MAX_DATA_BYTES 32 // max number of data bytes in non-Sysex messages