added init method to simplify systemReset function and enable FirmataSerial->flush() to be called

Author: soundanalogous

Firmata.cpp

@@ -49,7 +49,7 @@ void FirmataClass::endSysex(void)
 FirmataClass::FirmataClass()
 {
   firmwareVersionCount = 0;
-  systemReset();
+  init();
 }
 
 //******************************************************************************
@@ -400,33 +400,35 @@ void FirmataClass::detach(byte command)
 //* Private Methods
 //******************************************************************************
 
-
-
-// resets the system state upon a SYSTEM_RESET message from the host software
-void FirmataClass::systemReset(void)
+// initialize to a known state
+void FirmataClass::init(void)
 {
   byte i;
 
   waitForData = 0; // this flag says the next serial input will be data
   executeMultiByteCommand = 0; // execute this after getting multi-byte data
   multiByteChannel = 0; // channel data for multiByteCommands
 
-
   for(i=0; i<MAX_DATA_BYTES; i++) {
     storedInputData[i] = 0;
   }
 
   parsingSysex = false;
-  sysexBytesRead = 0;
+  sysexBytesRead = 0;  
+}
+
+// resets the system state upon a SYSTEM_RESET message from the host software
+void FirmataClass::systemReset(void)
+{
+  init();
 
   if(currentSystemResetCallback)
     (*currentSystemResetCallback)();
 
-  //flush(); //TODO uncomment when Firmata is a subclass of HardwareSerial
+  FirmataSerial->flush();
 }
 
 
-
 // =============================================================================
 // used for flashing the pin for the version number
 void FirmataClass::pin13strobe(int count, int onInterval, int offInterval) 

Firmata.h

@@ -140,6 +140,7 @@ class FirmataClass
     sysexCallbackFunction currentSysexCallback;
 
 /* private methods ------------------------------ */
+    void init(void);
     void processSysexMessage(void);
     void systemReset(void);
     void pin13strobe(int count, int onInterval, int offInterval);