temporary fix for digitalWriteCallback Zero issue firmata#231

Author: soundanalogous

examples/StandardFirmata/StandardFirmata.ino

@@ -344,7 +344,7 @@ void analogWriteCallback(byte pin, int value)
 
 void digitalWriteCallback(byte port, int value)
 {
-  byte pin, lastPin, mask = 1, pinWriteMask = 0;
+  byte pin, lastPin, pinValue, mask = 1, pinWriteMask = 0;
 
   if (port < TOTAL_PORTS) {
     // create a mask of the pins on this port that are writable.
@@ -356,8 +356,12 @@ void digitalWriteCallback(byte port, int value)
         // only write to OUTPUT and INPUT (enables pullup)
         // do not touch pins in PWM, ANALOG, SERVO or other modes
         if (pinConfig[pin] == OUTPUT || pinConfig[pin] == INPUT) {
-          pinWriteMask |= mask;
-          pinState[pin] = ((byte)value & mask) ? 1 : 0;
+          pinValue = ((byte)value & mask) ? 1 : 0;
+          // temporary fix until INPUT_PULLUP is added
+          if (pinConfig[pin] == OUTPUT || (pinConfig[pin] == INPUT && pinValue == 1)) {
+            pinWriteMask |= mask;
+          }
+          pinState[pin] = pinValue;
         }
       }
       mask = mask << 1;

examples/StandardFirmataChipKIT/StandardFirmataChipKIT.ino

@@ -355,7 +355,7 @@ void analogWriteCallback(byte pin, int value)
 
 void digitalWriteCallback(byte port, int value)
 {
-  byte pin, lastPin, mask = 1, pinWriteMask = 0;
+  byte pin, lastPin, pinValue, mask = 1, pinWriteMask = 0;
 
   if (port < TOTAL_PORTS) {
     // create a mask of the pins on this port that are writable.
@@ -367,8 +367,12 @@ void digitalWriteCallback(byte port, int value)
         // only write to OUTPUT and INPUT (enables pullup)
         // do not touch pins in PWM, ANALOG, SERVO or other modes
         if (pinConfig[pin] == OUTPUT || pinConfig[pin] == INPUT) {
-          pinWriteMask |= mask;
-          pinState[pin] = ((byte)value & mask) ? 1 : 0;
+          pinValue = ((byte)value & mask) ? 1 : 0;
+          // temporary fix until INPUT_PULLUP is added
+          if (pinConfig[pin] == OUTPUT || (pinConfig[pin] == INPUT && pinValue == 1)) {
+            pinWriteMask |= mask;
+          }
+          pinState[pin] = pinValue;
         }
       }
       mask = mask << 1;

examples/StandardFirmataEthernet/StandardFirmataEthernet.ino

@@ -460,7 +460,7 @@ void analogWriteCallback(byte pin, int value)
 
 void digitalWriteCallback(byte port, int value)
 {
-  byte pin, lastPin, mask = 1, pinWriteMask = 0;
+  byte pin, lastPin, pinValue, mask = 1, pinWriteMask = 0;
 
   if (port < TOTAL_PORTS) {
     // create a mask of the pins on this port that are writable.
@@ -472,8 +472,12 @@ void digitalWriteCallback(byte port, int value)
         // only write to OUTPUT and INPUT (enables pullup)
         // do not touch pins in PWM, ANALOG, SERVO or other modes
         if (pinConfig[pin] == OUTPUT || pinConfig[pin] == INPUT) {
-          pinWriteMask |= mask;
-          pinState[pin] = ((byte)value & mask) ? 1 : 0;
+          pinValue = ((byte)value & mask) ? 1 : 0;
+          // temporary fix until INPUT_PULLUP is added
+          if (pinConfig[pin] == OUTPUT || (pinConfig[pin] == INPUT && pinValue == 1)) {
+            pinWriteMask |= mask;
+          }
+          pinState[pin] = pinValue;
         }
       }
       mask = mask << 1;

examples/StandardFirmataEthernetPlus/StandardFirmataEthernetPlus.ino

@@ -550,7 +550,7 @@ void analogWriteCallback(byte pin, int value)
 
 void digitalWriteCallback(byte port, int value)
 {
-  byte pin, lastPin, mask = 1, pinWriteMask = 0;
+  byte pin, lastPin, pinValue, mask = 1, pinWriteMask = 0;
 
   if (port < TOTAL_PORTS) {
     // create a mask of the pins on this port that are writable.
@@ -562,8 +562,12 @@ void digitalWriteCallback(byte port, int value)
         // only write to OUTPUT and INPUT (enables pullup)
         // do not touch pins in PWM, ANALOG, SERVO or other modes
         if (pinConfig[pin] == OUTPUT || pinConfig[pin] == INPUT) {
-          pinWriteMask |= mask;
-          pinState[pin] = ((byte)value & mask) ? 1 : 0;
+          pinValue = ((byte)value & mask) ? 1 : 0;
+          // temporary fix until INPUT_PULLUP is added
+          if (pinConfig[pin] == OUTPUT || (pinConfig[pin] == INPUT && pinValue == 1)) {
+            pinWriteMask |= mask;
+          }
+          pinState[pin] = pinValue;
         }
       }
       mask = mask << 1;

examples/StandardFirmataPlus/StandardFirmataPlus.ino

@@ -482,7 +482,7 @@ void analogWriteCallback(byte pin, int value)
 
 void digitalWriteCallback(byte port, int value)
 {
-  byte pin, lastPin, mask = 1, pinWriteMask = 0;
+  byte pin, lastPin, pinValue, mask = 1, pinWriteMask = 0;
 
   if (port < TOTAL_PORTS) {
     // create a mask of the pins on this port that are writable.
@@ -494,8 +494,12 @@ void digitalWriteCallback(byte port, int value)
         // only write to OUTPUT and INPUT (enables pullup)
         // do not touch pins in PWM, ANALOG, SERVO or other modes
         if (pinConfig[pin] == OUTPUT || pinConfig[pin] == INPUT) {
-          pinWriteMask |= mask;
-          pinState[pin] = ((byte)value & mask) ? 1 : 0;
+          pinValue = ((byte)value & mask) ? 1 : 0;
+          // temporary fix until INPUT_PULLUP is added
+          if (pinConfig[pin] == OUTPUT || (pinConfig[pin] == INPUT && pinValue == 1)) {
+            pinWriteMask |= mask;
+          }
+          pinState[pin] = pinValue;
         }
       }
       mask = mask << 1;

examples/StandardFirmataYun/StandardFirmataYun.ino

@@ -356,7 +356,7 @@ void analogWriteCallback(byte pin, int value)
 
 void digitalWriteCallback(byte port, int value)
 {
-  byte pin, lastPin, mask = 1, pinWriteMask = 0;
+  byte pin, lastPin, pinValue, mask = 1, pinWriteMask = 0;
 
   if (port < TOTAL_PORTS) {
     // create a mask of the pins on this port that are writable.
@@ -368,8 +368,12 @@ void digitalWriteCallback(byte port, int value)
         // only write to OUTPUT and INPUT (enables pullup)
         // do not touch pins in PWM, ANALOG, SERVO or other modes
         if (pinConfig[pin] == OUTPUT || pinConfig[pin] == INPUT) {
-          pinWriteMask |= mask;
-          pinState[pin] = ((byte)value & mask) ? 1 : 0;
+          pinValue = ((byte)value & mask) ? 1 : 0;
+          // temporary fix until INPUT_PULLUP is added
+          if (pinConfig[pin] == OUTPUT || (pinConfig[pin] == INPUT && pinValue == 1)) {
+            pinWriteMask |= mask;
+          }
+          pinState[pin] = pinValue;
         }
       }
       mask = mask << 1;