fix gpio event, drop unnecessary overloads, formatting

Author: tyeth

src/Wippersnapper.cpp

@@ -100,9 +100,9 @@ void Wippersnapper::provision() {
 
   // Board specific initializations
 #ifdef ARDUINO_ARDUINO_NESSO_N1
-    battery.begin();
-    delay(10);
-    battery.enableCharge();
+  battery.begin();
+  delay(10);
+  battery.enableCharge();
 #endif
 
   // Initialize the status LED for signaling FS errors
@@ -1667,7 +1667,7 @@ void cbDisplayMessage(char *data, uint16_t len) {
 /****************************************************************************/
 bool Wippersnapper::encodePinEvent(
     wippersnapper_signal_v1_CreateSignalRequest *outgoingSignalMsg,
-    uint8_t pinName, int pinVal) {
+    uint16_t pinName, int pinVal) {
   bool is_success = true;
   outgoingSignalMsg->which_payload =
       wippersnapper_signal_v1_CreateSignalRequest_pin_event_tag;

src/Wippersnapper.h

@@ -254,9 +254,10 @@ static NessoBattery battery; ///< Nesso-N1 Battery instance
 class WsExpanderPin : public ExpanderPin, public Printable {
 public:
   WsExpanderPin(uint16_t _pin) : ExpanderPin(_pin) {}
-  WsExpanderPin(ExpanderPin ep) : ExpanderPin(ep.pin | (ep.address == 0x44 ? 0x100 : 0x200)) {}
-  
-  size_t printTo(Print& p) const override {
+  WsExpanderPin(ExpanderPin ep)
+      : ExpanderPin(ep.pin | (ep.address == 0x44 ? 0x100 : 0x200)) {}
+
+  size_t printTo(Print &p) const override {
     size_t n = p.print("0x");
     n += p.print(address, HEX);
     n += p.print("_");
@@ -343,7 +344,7 @@ class Wippersnapper {
   // Encodes a pin event message
   bool
   encodePinEvent(wippersnapper_signal_v1_CreateSignalRequest *outgoingSignalMsg,
-                 uint8_t pinName, int pinVal);
+                 uint16_t pinName, int pinVal);
 
   // Pin configure message
   bool configureDigitalPinReq(wippersnapper_pin_v1_ConfigurePinRequest *pinMsg);

src/Wippersnapper_Boards.h

@@ -170,7 +170,7 @@
 #define BOARD_ID "arduino-nesso-n1"
 #define USE_LITTLEFS
 #define USE_STATUS_LED
-#define STATUS_LED_PIN LED_BUILTIN // can now be +512/+256 for expander (0x43/44)
+#define STATUS_LED_PIN LED_BUILTIN // can be +512/+256 as expander (0x43/44)
 #define STATUS_LED_INVERTED
 #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32C6)
 #define BOARD_ID "feather-esp32c6"

src/components/digitalIO/Wippersnapper_DigitalGPIO.cpp

@@ -66,7 +66,7 @@ void Wippersnapper_DigitalGPIO::initDigitalPin(
   WsExpanderPin flexPinName = (ExpanderPin)pinName;
 #else
   uint8_t flexPinName = (uint8_t)pinName;
-#endif  
+#endif
   if (direction ==
       wippersnapper_pin_v1_ConfigurePinRequest_Direction_DIRECTION_OUTPUT) {
 
@@ -96,20 +96,20 @@ void Wippersnapper_DigitalGPIO::initDigitalPin(
       digitalWrite(pinName, LOW);
     }
 #else
-    pinMode(pinName, OUTPUT);
-    digitalWrite(pinName, LOW); // initialize LOW
+    pinMode(flexPinName, OUTPUT);
+    digitalWrite(flexPinName, LOW); // initialize LOW
 #endif
   } else if (
       direction ==
       wippersnapper_pin_v1_ConfigurePinRequest_Direction_DIRECTION_INPUT) {
     WS_DEBUG_PRINT("Configuring digital input pin on D");
-    WS_DEBUG_PRINT(pinName);
+    WS_DEBUG_PRINT(flexPinName);
 
     if (pull == wippersnapper_pin_v1_ConfigurePinRequest_Pull_PULL_UP) {
       WS_DEBUG_PRINTLN("with internal pull-up enabled");
-      pinMode(pinName, INPUT_PULLUP);
+      pinMode(flexPinName, INPUT_PULLUP);
     } else {
-      pinMode(pinName, INPUT);
+      pinMode(flexPinName, INPUT);
       WS_DEBUG_PRINT("\n");
     }
 
@@ -187,24 +187,17 @@ void Wippersnapper_DigitalGPIO::deinitDigitalPin(
 */
 /********************************************************************/
 int Wippersnapper_DigitalGPIO::digitalReadSvc(int pinName) {
-  // Service using arduino `digitalRead`
-  int pinVal = digitalRead(pinName);
-  return pinVal;
-}
-
 #if defined(ARDUINO_ARDUINO_NESSO_N1)
-/********************************************************************/
-/*!
-    @brief    High-level digitalRead service impl. which performs a
-                digitalRead.
-    @param    pin
-                The ExpanderPin instance
-    @returns  The pin's value.
-*/
-/********************************************************************/
-int Wippersnapper_DigitalGPIO::digitalReadSvc(ExpanderPin pin) {
+  // probably this should be >255 instead for future use.
+  if ((pinName & 0x100) || (pinName & 0x200)) {
+    WsExpanderPin flexPinName = (ExpanderPin)pinName;
+    // Service using expander `digitalRead`
+    int pinVal = digitalRead(flexPinName);
+    return pinVal;
+  }
+#endif
   // Service using arduino `digitalRead`
-  int pinVal = digitalRead(pin);
+  int pinVal = digitalRead(pinName);
   return pinVal;
 }
 
@@ -217,25 +210,8 @@ int Wippersnapper_DigitalGPIO::digitalReadSvc(ExpanderPin pin) {
                 The pin's value.
 */
 /*******************************************************************************/
-void Wippersnapper_DigitalGPIO::digitalWriteSvc(ExpanderPin pin, int pinValue) {
-  WS_DEBUG_PRINT("Digital Pin Event: Set ");
-  WS_DEBUG_PRINT(pin.pin);
-  WS_DEBUG_PRINT(" to ");
-  WS_DEBUG_PRINTLN(pinValue);
-  digitalWrite(pin, pinValue);
-}
-#endif
-
-/*******************************************************************************/
-/*!
-    @brief  Writes a value to a pin.
-    @param  pinName
-                The pin's name.
-    @param  pinValue
-                The pin's value.
-*/
-/*******************************************************************************/
-void Wippersnapper_DigitalGPIO::digitalWriteSvc(uint16_t pinName, int pinValue) {
+void Wippersnapper_DigitalGPIO::digitalWriteSvc(uint16_t pinName,
+                                                int pinValue) {
   WS_DEBUG_PRINT("Digital Pin Event: Set ");
   WS_DEBUG_PRINT(pinName);
   WS_DEBUG_PRINT(" to ");
@@ -249,6 +225,13 @@ void Wippersnapper_DigitalGPIO::digitalWriteSvc(uint16_t pinName, int pinValue)
     digitalWrite(pinName, !pinValue);
   else
     digitalWrite(pinName, pinValue);
+#elif defined(ARDUINO_ARDUINO_NESSO_N1)
+  if ((pinName & 0x100) || (pinName & 0x200)) {
+    WsExpanderPin flexPinName = (ExpanderPin)pinName;
+    digitalWrite(flexPinName, pinValue);
+  } else {
+    digitalWrite(pinName, pinValue);
+  }
 #else
   digitalWrite(pinName, pinValue);
 #endif

src/components/digitalIO/Wippersnapper_DigitalGPIO.h

@@ -21,9 +21,9 @@
 /** Holds data about a digital input pin */
 struct digitalInputPin {
   uint16_t pinName; ///< Pin name
-  long period;     ///< Timer interval, in millis, -1 if disabled.
-  long prvPeriod;  ///< When timer was previously serviced, in millis
-  int prvPinVal;   ///< Previous pin value
+  long period;      ///< Timer interval, in millis, -1 if disabled.
+  long prvPeriod;   ///< When timer was previously serviced, in millis
+  int prvPinVal;    ///< Previous pin value
 };
 
 // forward decl.
@@ -49,20 +49,6 @@ class Wippersnapper_DigitalGPIO {
                    uint16_t pinName);
   int digitalReadSvc(int pinName);
   void digitalWriteSvc(uint16_t pinName, int pinValue);
-#if defined(ARDUINO_ARDUINO_NESSO_N1)
-  // void
-  // initDigitalPin(wippersnapper_pin_v1_ConfigurePinRequest_Direction
-  // direction,
-  //                ExpanderPin pinName, float period,
-  //                wippersnapper_pin_v1_ConfigurePinRequest_Pull pull);
-  // void
-  // deinitDigitalPin(wippersnapper_pin_v1_ConfigurePinRequest_Direction
-  // direction,
-  //                  ExpanderPin pinName);
-
-  int digitalReadSvc(ExpanderPin pinName);
-  void digitalWriteSvc(ExpanderPin pinName, int pinValue);
-#endif
   void processDigitalInputs();
 
   digitalInputPin *_digital_input_pins; /*!< Array of gpio pin objects */