thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

move groove serial to serial2 if also serial base is used

This commit is contained in:
andreas 2023-10-04 18:11:47 +02:00
parent 4a388561ab
commit 27de94b1ae
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/hardware/GwHardware.h
View File

@ -130,21 +130,6 @@
#define GWBUTTON_PULLUPDOWN #define GWBUTTON_PULLUPDOWN
#endif #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) //M5 Serial (Atomic RS232 Base)
#ifdef M5_SERIAL_KIT_232 #ifdef M5_SERIAL_KIT_232
#define GWSERIAL_TX BOARD_LEFT2 #define GWSERIAL_TX BOARD_LEFT2
@ -159,6 +144,35 @@
#define GWSERIAL_TYPE GWSERIAL_TYPE_UNI #define GWSERIAL_TYPE GWSERIAL_TYPE_UNI
#endif #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 //can kit for M5 Atom
#ifdef M5_CAN_KIT #ifdef M5_CAN_KIT
#define ESP32_CAN_TX_PIN BOARD_LEFT1 #define ESP32_CAN_TX_PIN BOARD_LEFT1