Various platform classes improvements

* __READ_GPIO() added,
* GPIO pin number checked during initialization.

Author: pstolarz

src/OneWireNg_ArduinoAVR.h

@@ -13,9 +13,13 @@
 #ifndef __OWNG_ARDUINO_AVR__
 #define __OWNG_ARDUINO_AVR__
 
+#include <assert.h>
 #include "Arduino.h"
 #include "OneWireNg_BitBang.h"
 
+#define __READ_GPIO(gs) \
+    ((*gs.inReg & gs.bmsk) != 0)
+
 #define __WRITE_GPIO(gs, st) \
     if (st) *gs.outReg |= gs.bmsk; \
     else *gs.outReg &= ~gs.bmsk
@@ -74,7 +78,7 @@ class OneWireNg_ArduinoAVR: public OneWireNg_BitBang
     virtual int readGpioIn(GpioType gpio)
     {
         UNUSED(gpio);
-        return ((*_dtaGpio.inReg & _dtaGpio.bmsk) != 0);
+        return __READ_GPIO(_dtaGpio);
     }
 
     virtual void writeGpioOut(GpioType gpio, int state)
@@ -106,6 +110,8 @@ class OneWireNg_ArduinoAVR: public OneWireNg_BitBang
     void initDtaGpio(unsigned pin, bool pullUp)
     {
         uint8_t port = digitalPinToPort(pin);
+        assert(port != NOT_A_PIN);
+
         _dtaGpio.bmsk = digitalPinToBitMask(pin);
         _dtaGpio.inReg = portInputRegister(port);
         _dtaGpio.outReg = portOutputRegister(port);
@@ -127,6 +133,8 @@ class OneWireNg_ArduinoAVR: public OneWireNg_BitBang
     void initPwrCtrlGpio(unsigned pin)
     {
         uint8_t port = digitalPinToPort(pin);
+        assert(port != NOT_A_PIN);
+
         _pwrCtrlGpio.bmsk = digitalPinToBitMask(pin);
         _pwrCtrlGpio.outReg = portOutputRegister(port);
         _pwrCtrlGpio.modReg = portModeRegister(port);
@@ -151,5 +159,6 @@ class OneWireNg_ArduinoAVR: public OneWireNg_BitBang
 #undef __GPIO_AS_OUTPUT
 #undef __GPIO_AS_INPUT
 #undef __WRITE_GPIO
+#undef __READ_GPIO
 
 #endif /* __OWNG_ARDUINO_AVR__ */

src/OneWireNg_ArduinoESP8266.h

@@ -13,9 +13,13 @@
 #ifndef __OWNG_ARDUINO_ESP8266__
 #define __OWNG_ARDUINO_ESP8266__
 
+#include <assert.h>
 #include "Arduino.h"
 #include "OneWireNg_BitBang.h"
 
+#define __READ_GPIO(pin) \
+    (pin < 16 ? GPIP(pin) : pin == 16 ? (GP16I & 0x01) : 1)
+
 #define __WRITE_GPIO(pin, st) \
     if (pin < 16) { \
         if (st) GPOS = (1 << pin); else GPOC = (1 << pin); \
@@ -59,6 +63,9 @@ class OneWireNg_ArduinoESP8266: public OneWireNg_BitBang
     OneWireNg_ArduinoESP8266(unsigned pin, bool pullUp):
         OneWireNg_BitBang(false)
     {
+        assert(pin >= 0 && pin <= 16);
+        assert(pullup && pin < 16);
+
         _dtaPin = pin;
         initDtaGpio(pullUp);
     }
@@ -81,6 +88,9 @@ class OneWireNg_ArduinoESP8266: public OneWireNg_BitBang
     OneWireNg_ArduinoESP8266(unsigned pin, unsigned pwrCtrlPin, bool pullUp):
         OneWireNg_BitBang(true)
     {
+        assert(pin >= 0 && pin <= 16 && pwrCtrlPin >= 0 && pwrCtrlPin <= 16);
+        assert(pullup && pin < 16);
+
         _dtaPin = pin;
         _pwrCtrlPin = pwrCtrlPin;
 
@@ -92,8 +102,7 @@ class OneWireNg_ArduinoESP8266: public OneWireNg_BitBang
     virtual int readGpioIn(GpioType gpio)
     {
         UNUSED(gpio);
-        return (_dtaPin < 16 ? GPIP(_dtaPin) :
-            _dtaPin == 16 ? (GP16I & 0x01) : 1);
+        return __READ_GPIO(pin);
     }
 
     virtual void writeGpioOut(GpioType gpio, int state)
@@ -130,7 +139,7 @@ class OneWireNg_ArduinoESP8266: public OneWireNg_BitBang
 
     void initPwrCtrlGpio(void)
     {
-        pinMode(_pwrCtrlPin, OUTPUT_OPEN_DRAIN);
+        pinMode(_pwrCtrlPin, OUTPUT);
         setupPwrCtrlGpio(true);
     }
 
@@ -142,5 +151,6 @@ class OneWireNg_ArduinoESP8266: public OneWireNg_BitBang
 #undef __GPIO_AS_OUTPUT
 #undef __GPIO_AS_INPUT
 #undef __WRITE_GPIO
+#undef __READ_GPIO
 
 #endif /* __OWNG_ARDUINO_ESP8266__ */

src/OneWireNg_ArduinoMegaAVR.h

@@ -17,6 +17,9 @@
 #include "Arduino.h"
 #include "OneWireNg_BitBang.h"
 
+#define __READ_GPIO(gs) \
+    ((gs.port->IN & gs.bmsk) != 0)
+
 #define __WRITE_GPIO(gs, st) \
     if (st) gs.port->OUTSET = gs.bmsk; \
     else gs.port->OUTCLR = gs.bmsk
@@ -76,7 +79,7 @@ class OneWireNg_ArduinoMegaAVR: public OneWireNg_BitBang
     virtual int readGpioIn(GpioType gpio)
     {
         UNUSED(gpio);
-        return ((_dtaGpio.port->IN & _dtaGpio.bmsk) != 0);
+        return __READ_GPIO(_dtaGpio);
     }
 
     virtual void writeGpioOut(GpioType gpio, int state)
@@ -157,5 +160,6 @@ class OneWireNg_ArduinoMegaAVR: public OneWireNg_BitBang
 #undef __GPIO_AS_OUTPUT
 #undef __GPIO_AS_INPUT
 #undef __WRITE_GPIO
+#undef __READ_GPIO
 
 #endif /* __OWNG_ARDUINO_MEGAAVR__ */