From 6543f9a7c6a02cd8405fb0eeffc403095eb90870 Mon Sep 17 00:00:00 2001
From: Pedro Marquez <pedro@controllino.com>
Date: Tue, 18 Feb 2025 14:39:24 +0100
Subject: [PATCH] Improving CUSTOM_RS485_DEFAULT_DE_PIN and
 CUSTOM_RS485_DEFAULT_RE_PIN implementation

---
 src/RS485.h | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/RS485.h b/src/RS485.h
index 787d66c..c709011 100644
--- a/src/RS485.h
+++ b/src/RS485.h
@@ -30,6 +30,15 @@
 #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
+
+#if !defined(RS485_DEFAULT_DE_PIN) && !defined(RS485_DEFAULT_RE_PIN)
 #ifdef __AVR__
 #define RS485_DEFAULT_DE_PIN 2
 #define RS485_DEFAULT_RE_PIN -1
@@ -40,22 +49,16 @@
 #define RS485_DEFAULT_DE_PIN A4
 #define RS485_DEFAULT_RE_PIN A5
 #elif defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA)
-#define SERIAL_PORT_HARDWARE Serial1
 #define RS485_DEFAULT_DE_PIN 8
 #define RS485_DEFAULT_RE_PIN 7
 #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
+#if !defined(ARDUINO_UNOR4_WIFI) || !defined(ARDUINO_UNOR4_MINIMA)
+#define SERIAL_PORT_HARDWARE Serial1
 #endif
 
 #define RS485_DEFAULT_PRE_DELAY 50