From 27de94b1ae238d99012f844e79ad57c0e5b8955e Mon Sep 17 00:00:00 2001 From: andreas Date: Wed, 4 Oct 2023 18:11:47 +0200 Subject: [PATCH] move groove serial to serial2 if also serial base is used --- lib/hardware/GwHardware.h | 44 ++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/lib/hardware/GwHardware.h b/lib/hardware/GwHardware.h index 2dc67e6..9e00ce8 100644 --- a/lib/hardware/GwHardware.h +++ b/lib/hardware/GwHardware.h @@ -130,21 +130,6 @@ #define GWBUTTON_PULLUPDOWN #endif -//below we define the final device config based on the above -//boards and peripherals -//this allows us toe easily also set the from outside -//serial adapter at the M5 groove pins -#ifdef SERIAL_GROOVE_485 - #define GWSERIAL_TX GROOVE_PIN_1 - #define GWSERIAL_RX GROOVE_PIN_2 - #define GWSERIAL_TYPE GWSERIAL_TYPE_UNI -#endif -#ifdef SERIAL_GROOVE_232 - #define GWSERIAL_TX GROOVE_PIN_1 - #define GWSERIAL_RX GROOVE_PIN_2 - #define GWSERIAL_TYPE GWSERIAL_TYPE_BI -#endif - //M5 Serial (Atomic RS232 Base) #ifdef M5_SERIAL_KIT_232 #define GWSERIAL_TX BOARD_LEFT2 @@ -159,6 +144,35 @@ #define GWSERIAL_TYPE GWSERIAL_TYPE_UNI #endif +//below we define the final device config based on the above +//boards and peripherals +//this allows us to easily also set them from outside +//serial adapter at the M5 groove pins +//we use serial2 for groove serial if serial1 is already defined +//before (e.g. by serial kit) +#ifdef SERIAL_GROOVE_485 + #ifdef GWSERIAL_TYPE + #define GWSERIAL2_TX GROOVE_PIN_1 + #define GWSERIAL2_RX GROOVE_PIN_2 + #define GWSERIAL2_TYPE GWSERIAL_TYPE_UNI + #else + #define GWSERIAL_TX GROOVE_PIN_1 + #define GWSERIAL_RX GROOVE_PIN_2 + #define GWSERIAL_TYPE GWSERIAL_TYPE_UNI + #endif +#endif +#ifdef SERIAL_GROOVE_232 + #ifdef GWSERIAL_TYPE + #define GWSERIAL2_TX GROOVE_PIN_1 + #define GWSERIAL2_RX GROOVE_PIN_2 + #define GWSERIAL2_TYPE GWSERIAL_TYPE_BI + #else + #define GWSERIAL_TX GROOVE_PIN_1 + #define GWSERIAL_RX GROOVE_PIN_2 + #define GWSERIAL_TYPE GWSERIAL_TYPE_BI + #endif +#endif + //can kit for M5 Atom #ifdef M5_CAN_KIT #define ESP32_CAN_TX_PIN BOARD_LEFT1