added write method to expose FirmataSerial.write. Updated StandardFirmata to use Firmata.write instead of Serial.write.

Author: soundanalogous

Firmata.cpp

@@ -329,6 +329,12 @@ void FirmataClass::sendString(const char* string)
   sendString(STRING_DATA, string);
 }
 
+// expose the write method
+void FirmataClass::write(byte c)
+{
+  FirmataSerial.write(c);
+}
+
 
 // Internal Actions/////////////////////////////////////////////////////////////
 

Firmata.h

@@ -87,13 +87,13 @@ extern "C" {
 class FirmataClass
 {
 public:
-	FirmataClass(Stream &s);
+    FirmataClass(Stream &s);
 /* Arduino constructors */
     void begin();
     void begin(long);
     void begin(Stream &s);
 /* querying functions */
-	void printVersion(void);
+    void printVersion(void);
     void blinkVersion(void);
     void printFirmwareVersion(void);
   //void setFirmwareVersion(byte major, byte minor);  // see macro below
@@ -102,12 +102,13 @@ class FirmataClass
     int available(void);
     void processInput(void);
 /* serial send handling */
-	void sendAnalog(byte pin, int value);
-	void sendDigital(byte pin, int value); // TODO implement this
-	void sendDigitalPort(byte portNumber, int portData);
+    void sendAnalog(byte pin, int value);
+    void sendDigital(byte pin, int value); // TODO implement this
+    void sendDigitalPort(byte portNumber, int portData);
     void sendString(const char* string);
     void sendString(byte command, const char* string);
-	void sendSysex(byte command, byte bytec, byte* bytev);
+    void sendSysex(byte command, byte bytec, byte* bytev);
+    void write(byte c);
 /* attach & detach callback functions to messages */
     void attach(byte command, callbackFunction newFunction);
     void attach(byte command, systemResetCallbackFunction newFunction);
@@ -140,7 +141,7 @@ class FirmataClass
 
 /* private methods ------------------------------ */
     void processSysexMessage(void);
-	void systemReset(void);
+    void systemReset(void);
     void pin13strobe(int count, int onInterval, int offInterval);
     void sendValueAsTwo7bitBytes(int value);
     void startSysex(void);

examples/StandardFirmata/StandardFirmata.ino

@@ -459,57 +459,57 @@ void sysexCallback(byte command, byte argc, byte *argv)
     }
     break;
   case CAPABILITY_QUERY:
-    Serial.write(START_SYSEX);
-    Serial.write(CAPABILITY_RESPONSE);
+    Firmata.write(START_SYSEX);
+    Firmata.write(CAPABILITY_RESPONSE);
     for (byte pin=0; pin < TOTAL_PINS; pin++) {
       if (IS_PIN_DIGITAL(pin)) {
-        Serial.write((byte)INPUT);
-        Serial.write(1);
-        Serial.write((byte)OUTPUT);
-        Serial.write(1);
+        Firmata.write((byte)INPUT);
+        Firmata.write(1);
+        Firmata.write((byte)OUTPUT);
+        Firmata.write(1);
       }
       if (IS_PIN_ANALOG(pin)) {
-        Serial.write(ANALOG);
-        Serial.write(10);
+        Firmata.write(ANALOG);
+        Firmata.write(10);
       }
       if (IS_PIN_PWM(pin)) {
-        Serial.write(PWM);
-        Serial.write(8);
+        Firmata.write(PWM);
+        Firmata.write(8);
       }
       if (IS_PIN_SERVO(pin)) {
-        Serial.write(SERVO);
-        Serial.write(14);
+        Firmata.write(SERVO);
+        Firmata.write(14);
       }
       if (IS_PIN_I2C(pin)) {
-        Serial.write(I2C);
-        Serial.write(1);  // to do: determine appropriate value 
+        Firmata.write(I2C);
+        Firmata.write(1);  // to do: determine appropriate value 
       }
-      Serial.write(127);
+      Firmata.write(127);
     }
-    Serial.write(END_SYSEX);
+    Firmata.write(END_SYSEX);
     break;
   case PIN_STATE_QUERY:
     if (argc > 0) {
       byte pin=argv[0];
-      Serial.write(START_SYSEX);
-      Serial.write(PIN_STATE_RESPONSE);
-      Serial.write(pin);
+      Firmata.write(START_SYSEX);
+      Firmata.write(PIN_STATE_RESPONSE);
+      Firmata.write(pin);
       if (pin < TOTAL_PINS) {
-        Serial.write((byte)pinConfig[pin]);
-	Serial.write((byte)pinState[pin] & 0x7F);
-	if (pinState[pin] & 0xFF80) Serial.write((byte)(pinState[pin] >> 7) & 0x7F);
-	if (pinState[pin] & 0xC000) Serial.write((byte)(pinState[pin] >> 14) & 0x7F);
+        Firmata.write((byte)pinConfig[pin]);
+	Firmata.write((byte)pinState[pin] & 0x7F);
+	if (pinState[pin] & 0xFF80) Firmata.write((byte)(pinState[pin] >> 7) & 0x7F);
+	if (pinState[pin] & 0xC000) Firmata.write((byte)(pinState[pin] >> 14) & 0x7F);
       }
-      Serial.write(END_SYSEX);
+      Firmata.write(END_SYSEX);
     }
     break;
   case ANALOG_MAPPING_QUERY:
-    Serial.write(START_SYSEX);
-    Serial.write(ANALOG_MAPPING_RESPONSE);
+    Firmata.write(START_SYSEX);
+    Firmata.write(ANALOG_MAPPING_RESPONSE);
     for (byte pin=0; pin < TOTAL_PINS; pin++) {
-      Serial.write(IS_PIN_ANALOG(pin) ? PIN_TO_ANALOG(pin) : 127);
+      Firmata.write(IS_PIN_ANALOG(pin) ? PIN_TO_ANALOG(pin) : 127);
     }
-    Serial.write(END_SYSEX);
+    Firmata.write(END_SYSEX);
     break;
   }
 }