Handle differences in declaration of digitalWrite

as per arduino/ArduinoCore-API#25

Author: ianfixes

.arduino-ci.yml

@@ -1,5 +1,6 @@
 compile:
   platforms:
+    - uno
     - nano_every
 
   libraries:
@@ -8,6 +9,7 @@ compile:
 
 unittest:
   platforms:
+    - uno
     - nano_every
 
 # nano_every definition isn't yet in a released arduino_ci version

src/DashMessage.h

@@ -109,6 +109,21 @@ typedef struct DashMessage {
     for (unsigned int i = 0; i < WIRE_PROTOCOL_MESSAGE_LENGTH; ++i) setByte(i, 0);
   }
 
+  // read payload from digital input pins
+  void setFromPins(int (*myDigitalRead)(pin_size_t)) {
+    setBit(MasterSignal::Values::boostWarning,         myDigitalRead(MasterPin::Values::boostWarning        ));
+    setBit(MasterSignal::Values::boostCritical,        myDigitalRead(MasterPin::Values::boostCritical       ));
+    setBit(MasterSignal::Values::acOn,                 myDigitalRead(MasterPin::Values::acOn                ));
+    setBit(MasterSignal::Values::heatedRearWindowOn,   myDigitalRead(MasterPin::Values::heatedRearWindowOn  ));
+    setBit(MasterSignal::Values::hazardOff,            myDigitalRead(MasterPin::Values::hazardOff           ));
+    setBit(MasterSignal::Values::rearFoggerOn,         myDigitalRead(MasterPin::Values::rearFoggerOn        ));
+    setBit(MasterSignal::Values::scrollCAN,            myDigitalRead(MasterPin::Values::scrollCAN           ));
+    setBit(MasterSignal::Values::scrollPresetColours,  myDigitalRead(MasterPin::Values::scrollPresetColours ));
+    setBit(MasterSignal::Values::scrollRainbowEffects, myDigitalRead(MasterPin::Values::scrollRainbowEffects));
+    setBit(MasterSignal::Values::scrollBrightness,     myDigitalRead(MasterPin::Values::scrollBrightness    ));
+  }
+
+#ifdef PinStatus
   // read payload from digital input pins
   void setFromPins(PinStatus (*myDigitalRead)(pin_size_t)) {
     setBit(MasterSignal::Values::boostWarning,         myDigitalRead(MasterPin::Values::boostWarning        ));
@@ -122,6 +137,7 @@ typedef struct DashMessage {
     setBit(MasterSignal::Values::scrollRainbowEffects, myDigitalRead(MasterPin::Values::scrollRainbowEffects));
     setBit(MasterSignal::Values::scrollBrightness,     myDigitalRead(MasterPin::Values::scrollBrightness    ));
   }
+#endif
 
   // read input from I2C
   void setFromWire(TwoWire &wire) {
@@ -158,11 +174,19 @@ typedef struct DashMessage {
     }
   }
 
+  // construct from arduino inputs
+  DashMessage(int (*myDigitalRead)(pin_size_t)) {
+    initFrames();
+    setFromPins(myDigitalRead);
+  }
+
+#ifdef PinStatus
   // construct from arduino inputs
   DashMessage(PinStatus (*myDigitalRead)(pin_size_t)) {
     initFrames();
     setFromPins(myDigitalRead);
   }
+#endif
 
   // construct from the wire
   DashMessage(TwoWire wire) {

src/DashState.h

@@ -91,7 +91,11 @@ const unsigned int NUM_DASH_LEDS = DASH_LED_MAX + 1;
 typedef struct DashSupport {
   void (*pinMode)(pin_size_t, int);
   int (*analogRead)(unsigned char);
+#ifdef PinStatus
   PinStatus (*digitalRead)(unsigned char);
+#else
+  int (*digitalRead)(unsigned char);
+#endif
   void (*digitalWrite)(pin_size_t, int);
   CFastLED* fastLed;
 } DashSupport;