From b00035800b171fbec3be683e9ca907fa27c46f8d Mon Sep 17 00:00:00 2001 From: Pedro Marquez Date: Thu, 1 Feb 2024 11:16:30 +0100 Subject: [PATCH 1/2] More general solution for external RS485_DEFAULT_DE_PIN definition --- src/RS485.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RS485.h b/src/RS485.h index 8d01799..c71314e 100644 --- a/src/RS485.h +++ b/src/RS485.h @@ -30,6 +30,7 @@ #endif #endif +#ifndef RS485_DEFAULT_DE_PIN #ifdef __AVR__ #define RS485_DEFAULT_DE_PIN 2 #define RS485_DEFAULT_RE_PIN -1 @@ -40,7 +41,6 @@ #define RS485_DEFAULT_DE_PIN A4 #define RS485_DEFAULT_RE_PIN A5 #else -#ifndef RS485_DEFAULT_DE_PIN #define RS485_DEFAULT_DE_PIN A6 #define RS485_DEFAULT_RE_PIN A5 #endif From c78a515b0efff225fa11c70f557c9f39a8693b95 Mon Sep 17 00:00:00 2001 From: Pedro Marquez Date: Mon, 26 Feb 2024 10:00:00 +0100 Subject: [PATCH 2/2] Apply suggestions by @aentinger for allowing custom pin definitions. --- src/RS485.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/RS485.h b/src/RS485.h index c71314e..b2b6009 100644 --- a/src/RS485.h +++ b/src/RS485.h @@ -30,7 +30,6 @@ #endif #endif -#ifndef RS485_DEFAULT_DE_PIN #ifdef __AVR__ #define RS485_DEFAULT_DE_PIN 2 #define RS485_DEFAULT_RE_PIN -1 @@ -41,11 +40,19 @@ #define RS485_DEFAULT_DE_PIN A4 #define RS485_DEFAULT_RE_PIN A5 #else +#ifndef RS485_DEFAULT_DE_PIN #define RS485_DEFAULT_DE_PIN A6 #define RS485_DEFAULT_RE_PIN A5 #endif #endif +#ifdef CUSTOM_RS485_DEFAULT_DE_PIN +# define RS485_DEFAULT_DE_PIN CUSTOM_RS485_DEFAULT_DE_PIN +#endif + +#ifdef CUSTOM_RS485_DEFAULT_RE_PIN +# define RS485_DEFAULT_RE_PIN CUSTOM_RS485_DEFAULT_RE_PIN +#endif #define RS485_DEFAULT_PRE_DELAY 50 #define RS485_DEFAULT_POST_DELAY 50