From ae695e83093d234aecf6849c5107b0bc29bd687b Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 25 Nov 2023 16:27:55 +1300
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Update=20Teensy=204.0/4?=
=?UTF-8?q?.1=20Serial=20(#26457)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/HAL/TEENSY40_41/HAL.cpp | 12 +++++++++++-
Marlin/src/HAL/TEENSY40_41/HAL.h | 16 ++++++++++++++--
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.cpp b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
index 1d02ab8575c..4dd5c3678d7 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
@@ -39,9 +39,19 @@
#define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
#define IMPLEMENT_SERIAL(X) _IMPLEMENT_SERIAL(X)
-#if WITHIN(SERIAL_PORT, 0, 3)
+#if WITHIN(SERIAL_PORT, 0, 8)
IMPLEMENT_SERIAL(SERIAL_PORT);
#endif
+#ifdef SERIAL_PORT_2
+ #if WITHIN(SERIAL_PORT_2, 0, 8)
+ IMPLEMENT_SERIAL(SERIAL_PORT_2);
+ #endif
+#endif
+#ifdef SERIAL_PORT_3
+ #if WITHIN(SERIAL_PORT_3, 0, 8)
+ IMPLEMENT_SERIAL(SERIAL_PORT_3);
+ #endif
+#endif
USBSerialType USBSerial(false, SerialUSB);
// ------------------------
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index 84c58476770..ddda9be65f1 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -80,7 +80,7 @@ extern USBSerialType USBSerial;
#define MSERIAL(X) _MSERIAL(X)
#if SERIAL_PORT == -1
- #define MYSERIAL1 SerialUSB
+ #define MYSERIAL1 USBSerial
#elif WITHIN(SERIAL_PORT, 0, 8)
DECLARE_SERIAL(SERIAL_PORT);
#define MYSERIAL1 MSERIAL(SERIAL_PORT)
@@ -90,16 +90,28 @@ extern USBSerialType USBSerial;
#ifdef SERIAL_PORT_2
#if SERIAL_PORT_2 == -1
- #define MYSERIAL2 usbSerial
+ #define MYSERIAL2 USBSerial
#elif SERIAL_PORT_2 == -2
#define MYSERIAL2 ethernet.telnetClient
#elif WITHIN(SERIAL_PORT_2, 0, 8)
+ DECLARE_SERIAL(SERIAL_PORT_2);
#define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
#else
#error "SERIAL_PORT_2 must be from 0 to 8, or -1 for Native USB, or -2 for Ethernet."
#endif
#endif
+#ifdef SERIAL_PORT_3
+ #if SERIAL_PORT_3 == -1
+ #define MYSERIAL3 USBSerial
+ #elif WITHIN(SERIAL_PORT_3, 0, 8)
+ DECLARE_SERIAL(SERIAL_PORT_3);
+ #define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
+ #else
+ #error "SERIAL_PORT_3 must be from 0 to 8, or -1 for Native USB."
+ #endif
+#endif
+
// ------------------------
// Types
// ------------------------