Merge pull request firmata#104 from ntruchsess/force_reporting

soundanalogous · soundanalogous · commit 6e723d49db3e · 2013-11-22T08:40:45.000-08:00
force digital and analogMessage when enabling reporting
diff --git a/utility/AnalogInputFirmata.cpp b/utility/AnalogInputFirmata.cpp
@@ -44,6 +44,7 @@ void AnalogInputFirmata::reportAnalog(byte analogPin, int value)
       analogInputsToReport = analogInputsToReport &~ (1 << analogPin);
     } else {
       analogInputsToReport = analogInputsToReport | (1 << analogPin);
+      Firmata.sendAnalog(analogPin, analogRead(analogPin));
     }
   }
   // TODO: save status to EEPROM here, if changed
diff --git a/utility/DigitalInputFirmata.cpp b/utility/DigitalInputFirmata.cpp
@@ -76,6 +76,7 @@ void DigitalInputFirmata::reportDigital(byte port, int value)
 {
   if (port < TOTAL_PORTS) {
     reportPINs[port] = (byte)value;
+    if (value) outputPort(port, readPort(port, portConfigInputs[port]), true);
   }
   // do not disable analog reporting on these 8 pins, to allow some
   // pins used for digital, others analog.  Instead, allow both types

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ void AnalogInputFirmata::reportAnalog(byte analogPin, int value)`
`44`	`44`	`analogInputsToReport = analogInputsToReport &~ (1 << analogPin);`
`45`	`45`	`} else {`
`46`	`46`	`analogInputsToReport = analogInputsToReport \| (1 << analogPin);`
	`47`	`+ Firmata.sendAnalog(analogPin, analogRead(analogPin));`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`// TODO: save status to EEPROM here, if changed`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ void DigitalInputFirmata::reportDigital(byte port, int value)`
`76`	`76`	`{`
`77`	`77`	`if (port < TOTAL_PORTS) {`
`78`	`78`	`reportPINs[port] = (byte)value;`
	`79`	`+ if (value) outputPort(port, readPort(port, portConfigInputs[port]), true);`
`79`	`80`	`}`
`80`	`81`	`// do not disable analog reporting on these 8 pins, to allow some`
`81`	`82`	`// pins used for digital, others analog. Instead, allow both types`