From 85cd9607046f3bda721a1ae860b58025202b15d9 Mon Sep 17 00:00:00 2001 From: CloneTV <63013123+CloneTV@users.noreply.github.com> Date: Fri, 16 Oct 2020 13:26:01 +0300 Subject: [PATCH 1/3] Update PCF8574.h --- PCF8574.h | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/PCF8574.h b/PCF8574.h index b379a3a..11b22cb 100644 --- a/PCF8574.h +++ b/PCF8574.h @@ -43,9 +43,6 @@ #include "WProgram.h" #endif -#define DEFAULT_SDA SDA; -#define DEFAULT_SCL SCL; - // Uncomment to enable printing out nice debug messages. // #define PCF8574_DEBUG @@ -170,11 +167,27 @@ public: private: uint8_t _address; - #ifdef __STM32F1__ - #ifndef SDA - #define DEFAULT_SDA PB7 - #define DEFAULT_SCL PB6 + #if !defined(DEFAULT_SDA) + # if defined(__STM32F1__) + # define DEFAULT_SDA PB7 + # elif defined(ESP8266) + # define DEFAULT_SDA 4 + # elif defined(SDA) + # define DEFAULT_SDA SDA + # else + # error "Error define DEFAULT_SDA, SDA not declared" + # endif #endif + #if !defined(DEFAULT_SCL) + # if defined(__STM32F1__) + # define DEFAULT_SCL PB6 + # elif defined(ESP8266) + # define DEFAULT_SCL 5 + # elif defined(SDA) + # define DEFAULT_SCL SCL + # else + # error "Error define DEFAULT_SCL, SCL not declared" + # endif #endif uint8_t _sda = DEFAULT_SDA From 46e72ba75ce94416ff4a457a3fad97704df91a86 Mon Sep 17 00:00:00 2001 From: CloneTV <63013123+CloneTV@users.noreply.github.com> Date: Fri, 16 Oct 2020 13:26:25 +0300 Subject: [PATCH 2/3] Update PCF8574.h --- PCF8574.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/PCF8574.h b/PCF8574.h index 11b22cb..77257e6 100644 --- a/PCF8574.h +++ b/PCF8574.h @@ -190,10 +190,8 @@ private: # endif #endif - uint8_t _sda = DEFAULT_SDA - ; - uint8_t _scl = DEFAULT_SCL - ; + uint8_t _sda = DEFAULT_SDA; + uint8_t _scl = DEFAULT_SCL; TwoWire *_wire; From 74556f01d76827a512956b4dedb2ddf309ba891d Mon Sep 17 00:00:00 2001 From: CloneTV <63013123+CloneTV@users.noreply.github.com> Date: Fri, 16 Oct 2020 13:31:39 +0300 Subject: [PATCH 3/3] Update PCF8574.h --- PCF8574.h | 1 + 1 file changed, 1 insertion(+) diff --git a/PCF8574.h b/PCF8574.h index 77257e6..6b095bb 100644 --- a/PCF8574.h +++ b/PCF8574.h @@ -229,3 +229,4 @@ private: }; #endif +