OneWireNg_CurrentPlatform added

Author: pstolarz

README.md

@@ -98,6 +98,13 @@ GPIO activities details).
 Platform classes have a public constructor allowing to create 1-wire service for
 a particular platform (see [above](#architecture-details)).
 
+NOTE: For the convenience there has been provided `OneWireNg_CurrentPlatform.h`
+header which tries to detect platform the compilation is proceeded and:
+ * include proper platform class header,
+ * assign `OneWireNg_CurrentPlatform` macro-define to the detected platform class.
+
+Refer to `examples/Dallas_Temperature` example for the usage details.
+
 ## Usage
 
 Refer to `examples` directory for usage details. For API details refer to sources

examples/Dallas_Temperature/Dallas_Temperature.ino

@@ -10,7 +10,7 @@
  * See the License for more information.
  */
 
-#include "OneWireNg_ArduinoAVR.h"
+#include "OneWireNg_CurrentPlatform.h"
 
 #define OW_PIN          10
 
@@ -47,9 +47,9 @@
     (NULL))))))
 
 #ifdef PWR_CTRL_PIN
-static OneWireNg *ow = new OneWireNg_ArduinoAVR(OW_PIN, PWR_CTRL_PIN, false);
+static OneWireNg *ow = new OneWireNg_CurrentPlatform(OW_PIN, PWR_CTRL_PIN, false);
 #else
-static OneWireNg *ow = new OneWireNg_ArduinoAVR(OW_PIN, false);
+static OneWireNg *ow = new OneWireNg_CurrentPlatform(OW_PIN, false);
 #endif
 
 static void printId(const OneWireNg::Id& id)

src/OneWireNg_ArduinoESP8266.h

@@ -63,8 +63,8 @@ class OneWireNg_ArduinoESP8266: public OneWireNg_BitBang
     OneWireNg_ArduinoESP8266(unsigned pin, bool pullUp):
         OneWireNg_BitBang(false)
     {
-        assert(pin >= 0 && pin <= 16);
-        assert(pullup && pin < 16);
+        assert(pin <= 16);
+        assert(pullUp && pin < 16);
 
         _dtaPin = pin;
         initDtaGpio(pullUp);
@@ -88,8 +88,8 @@ 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);
+        assert(pin <= 16 && pwrCtrlPin <= 16);
+        assert(pullUp && pin < 16);
 
         _dtaPin = pin;
         _pwrCtrlPin = pwrCtrlPin;
@@ -102,7 +102,7 @@ class OneWireNg_ArduinoESP8266: public OneWireNg_BitBang
     virtual int readGpioIn(GpioType gpio)
     {
         UNUSED(gpio);
-        return __READ_GPIO(pin);
+        return __READ_GPIO(_dtaPin);
     }
 
     virtual void writeGpioOut(GpioType gpio, int state)

src/OneWireNg_CurrentPlatform.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2019 Piotr Stolarz
+ * OneWireNg: Ardiono 1-wire service library
+ *
+ * Distributed under the 2-clause BSD License (the License)
+ * see accompanying file LICENSE for details.
+ *
+ * This software is distributed WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the License for more information.
+ */
+
+#ifndef OneWireNg_CurrentPlatform
+
+/*
+ * Try to detect current platform by inspecting the environment and:
+ * - include proper platform class header,
+ * - assign OneWireNg_CurrentPlatform macro-define to the detected platform class.
+ */
+#if defined(ARDUINO_ARCH_AVR)
+# include "OneWireNg_ArduinoAVR.h"
+# define OneWireNg_CurrentPlatform OneWireNg_ArduinoAVR
+#elif defined(ARDUINO_ARCH_MEGAAVR)
+# include "OneWireNg_ArduinoMegaAVR.h"
+# define OneWireNg_CurrentPlatform OneWireNg_ArduinoMegaAVR
+#elif defined(ARDUINO_ARCH_ESP8266)
+# include "OneWireNg_ArduinoESP8266.h"
+# define OneWireNg_CurrentPlatform OneWireNg_ArduinoESP8266
+#else
+# define OneWireNg_CurrentPlatform
+# warning "Can't detect platform. Use proper class for the platform you are compiling for!"
+#endif
+
+#endif /* OneWireNg_CurrentPlatform */