Merge pull request #45 from soundanalogous/dev

Commenting out unsetFirmwareVersion and associated unit test. Renamed pin13Strobe.

Author: soundanalogous

Firmata.cpp

@@ -68,13 +68,13 @@ void FirmataClass::begin(long speed)
 {
   Serial.begin(speed);
   begin(Serial);
+  blinkVersion();  
 }
 
 /* begin method for overriding default stream */
 void FirmataClass::begin(Stream &s)
 {
   FirmataSerial = &s;
-  blinkVersion();
   printVersion();
   printFirmwareVersion();
 }
@@ -90,9 +90,9 @@ void FirmataClass::blinkVersion(void)
 {
   // flash the pin with the protocol version
   pinMode(VERSION_BLINK_PIN,OUTPUT);
-  pin13strobe(FIRMATA_MAJOR_VERSION, 40, 210);
+  strobeBlinkPin(FIRMATA_MAJOR_VERSION, 40, 210);
   delay(250);
-  pin13strobe(FIRMATA_MINOR_VERSION, 40, 210);
+  strobeBlinkPin(FIRMATA_MINOR_VERSION, 40, 210);
   delay(125);
 }
 
@@ -140,12 +140,13 @@ void FirmataClass::setFirmwareNameAndVersion(const char *name, byte major, byte
   //             (char)major, (char)minor, firmwareVersionVector);
 }
 
-void FirmataClass::unsetFirmwareVersion()
-{
-  firmwareVersionCount = 0;
-  free(firmwareVersionVector); 
-  firmwareVersionVector = 0;
-}
+// this method is only used for unit testing
+// void FirmataClass::unsetFirmwareVersion()
+// {
+//   firmwareVersionCount = 0;
+//   free(firmwareVersionVector); 
+//   firmwareVersionVector = 0;
+// }
 
 //------------------------------------------------------------------------------
 // Serial Receive Handling
@@ -422,7 +423,6 @@ void FirmataClass::systemReset(void)
   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;
   }
@@ -440,7 +440,7 @@ void FirmataClass::systemReset(void)
 
 // =============================================================================
 // used for flashing the pin for the version number
-void FirmataClass::pin13strobe(int count, int onInterval, int offInterval) 
+void FirmataClass::strobeBlinkPin(int count, int onInterval, int offInterval) 
 {
   byte i;
   pinMode(VERSION_BLINK_PIN, OUTPUT);

Firmata.h

@@ -98,7 +98,7 @@ class FirmataClass
     void printFirmwareVersion(void);
   //void setFirmwareVersion(byte major, byte minor);  // see macro below
     void setFirmwareNameAndVersion(const char *name, byte major, byte minor);
-    void unsetFirmwareVersion();
+    //void unsetFirmwareVersion(); // only used for unit test
 /* serial receive handling */
     int available(void);
     void processInput(void);
@@ -143,7 +143,7 @@ class FirmataClass
 /* private methods ------------------------------ */
     void processSysexMessage(void);
     void systemReset(void);
-    void pin13strobe(int count, int onInterval, int offInterval);
+    void strobeBlinkPin(int count, int onInterval, int offInterval);
     void sendValueAsTwo7bitBytes(int value);
     void startSysex(void);
     void endSysex(void);

test/unit/firmata_test/firmata_test.ino

@@ -23,17 +23,17 @@ void assertStringsEqual(Test& __test__, const char* expected, const String& actu
   }
 }
 
-test(setFirmwareVersionDoesNotLeakMemory)
-{
-  Firmata.setFirmwareVersion(1, 0);
-  int initialMemory = freeMemory();
+// test(setFirmwareVersionDoesNotLeakMemory)
+// {
+//   Firmata.setFirmwareVersion(1, 0);
+//   int initialMemory = freeMemory();
 
-  Firmata.setFirmwareVersion(1, 0);
+//   Firmata.setFirmwareVersion(1, 0);
 
-  assertEquals(0, initialMemory - freeMemory());
+//   assertEquals(0, initialMemory - freeMemory());
 
-  Firmata.unsetFirmwareVersion();
-}
+//   Firmata.unsetFirmwareVersion();
+// }
 
 test(beginPrintsVersion)
 {