prevent analog reporting from system reset function

Author: soundanalogous

Firmata.cpp

@@ -294,6 +294,11 @@ boolean FirmataClass::isParsingMessage(void)
 {
   return (waitForData > 0 || parsingSysex);
 }
+
+boolean FirmataClass::isResetting(void)
+{
+  return resetting;
+}
 //------------------------------------------------------------------------------
 // Serial Send Handling
 
@@ -479,6 +484,7 @@ void FirmataClass::setPinState(byte pin, int state)
 // resets the system state upon a SYSTEM_RESET message from the host software
 void FirmataClass::systemReset(void)
 {
+  resetting = true;
   byte i;
 
   waitForData = 0; // this flag says the next serial input will be data
@@ -494,6 +500,8 @@ void FirmataClass::systemReset(void)
 
   if (currentSystemResetCallback)
     (*currentSystemResetCallback)();
+
+  resetting = false;
 }
 
 

Firmata.h

@@ -113,6 +113,7 @@ class FirmataClass
     void processInput(void);
     void parse(unsigned char value);
     boolean isParsingMessage(void);
+    boolean isResetting(void);
     /* serial send handling */
     void sendAnalog(byte pin, int value);
     void sendDigital(byte pin, int value); // TODO implement this
@@ -155,6 +156,8 @@ class FirmataClass
     byte pinConfig[TOTAL_PINS];         // configuration of every pin
     int pinState[TOTAL_PINS];           // any value that has been written
 
+    boolean resetting;
+
     /* callback functions */
     callbackFunction currentAnalogCallback;
     callbackFunction currentDigitalCallback;

utility/AnalogInputFirmata.cpp

@@ -44,7 +44,14 @@ void AnalogInputFirmata::reportAnalog(byte analogPin, int value)
       analogInputsToReport = analogInputsToReport &~ (1 << analogPin);
     } else {
       analogInputsToReport = analogInputsToReport | (1 << analogPin);
-      Firmata.sendAnalog(analogPin, analogRead(analogPin));
+      // prevent during system reset or all analog pin values will be reported
+      // which may report noise for unconnected analog pins
+      if (Firmata.isResetting()) {
+        // Send pin value immediately. This is helpful when connected via
+        // ethernet, wi-fi or bluetooth so pin states can be known upon
+        // reconnecting.
+        Firmata.sendAnalog(analogPin, analogRead(analogPin));
+      }
     }
   }
   // TODO: save status to EEPROM here, if changed