Skip to content

Commit 4cf4647

Browse files
ellenspthinkyhead
andauthored
🔧 More serial ports for Teensy HALs (#27736)
Followup to #27648 Co-authored-by: Scott Lahteine <[email protected]>
1 parent 5766dc0 commit 4cf4647

File tree

3 files changed

+37
-14
lines changed

3 files changed

+37
-14
lines changed

Marlin/src/HAL/TEENSY31_32/HAL.cpp

+13-3
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,20 @@
3737

3838
#define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
3939
#define IMPLEMENT_SERIAL(X) _IMPLEMENT_SERIAL(X)
40-
#if WITHIN(SERIAL_PORT, 0, 3)
40+
#if WITHIN(SERIAL_PORT, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
4141
IMPLEMENT_SERIAL(SERIAL_PORT);
42-
#else
43-
#error "SERIAL_PORT must be from 0 to 3."
42+
#endif
43+
#if defined(SERIAL_PORT_2) && WITHIN(SERIAL_PORT_2, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
44+
IMPLEMENT_SERIAL(SERIAL_PORT_2);
45+
#endif
46+
#if defined(SERIAL_PORT_3) && WITHIN(SERIAL_PORT_3, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
47+
IMPLEMENT_SERIAL(SERIAL_PORT_3);
48+
#endif
49+
#if defined(MMU_SERIAL_PORT) && WITHIN(MMU_SERIAL_PORT, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
50+
IMPLEMENT_SERIAL(MMU_SERIAL_PORT);
51+
#endif
52+
#if defined(LCD_SERIAL_PORT) && WITHIN(LCD_SERIAL_PORT, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
53+
IMPLEMENT_SERIAL(LCD_SERIAL_PORT);
4454
#endif
4555
USBSerialType USBSerial(false, SerialUSB);
4656

Marlin/src/HAL/TEENSY35_36/HAL.cpp

+13-2
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,21 @@
3737

3838
#define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
3939
#define IMPLEMENT_SERIAL(X) _IMPLEMENT_SERIAL(X)
40-
#if WITHIN(SERIAL_PORT, 0, 3)
40+
#if WITHIN(SERIAL_PORT, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
4141
IMPLEMENT_SERIAL(SERIAL_PORT);
4242
#endif
43-
43+
#if defined(SERIAL_PORT_2) && WITHIN(SERIAL_PORT_2, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
44+
IMPLEMENT_SERIAL(SERIAL_PORT_2);
45+
#endif
46+
#if defined(SERIAL_PORT_3) && WITHIN(SERIAL_PORT_3, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
47+
IMPLEMENT_SERIAL(SERIAL_PORT_3);
48+
#endif
49+
#if defined(MMU_SERIAL_PORT) && WITHIN(MMU_SERIAL_PORT, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
50+
IMPLEMENT_SERIAL(MMU_SERIAL_PORT);
51+
#endif
52+
#if defined(LCD_SERIAL_PORT) && WITHIN(LCD_SERIAL_PORT, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
53+
IMPLEMENT_SERIAL(LCD_SERIAL_PORT);
54+
#endif
4455
USBSerialType USBSerial(false, SerialUSB);
4556

4657
// ------------------------

Marlin/src/HAL/TEENSY40_41/HAL.cpp

+11-9
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,20 @@
3939

4040
#define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
4141
#define IMPLEMENT_SERIAL(X) _IMPLEMENT_SERIAL(X)
42-
#if WITHIN(SERIAL_PORT, 0, 8)
42+
#if WITHIN(SERIAL_PORT, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
4343
IMPLEMENT_SERIAL(SERIAL_PORT);
4444
#endif
45-
#ifdef SERIAL_PORT_2
46-
#if WITHIN(SERIAL_PORT_2, 0, 8)
47-
IMPLEMENT_SERIAL(SERIAL_PORT_2);
48-
#endif
45+
#if defined(SERIAL_PORT_2) && WITHIN(SERIAL_PORT_2, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
46+
IMPLEMENT_SERIAL(SERIAL_PORT_2);
4947
#endif
50-
#ifdef SERIAL_PORT_3
51-
#if WITHIN(SERIAL_PORT_3, 0, 8)
52-
IMPLEMENT_SERIAL(SERIAL_PORT_3);
53-
#endif
48+
#if defined(SERIAL_PORT_3) && WITHIN(SERIAL_PORT_3, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
49+
IMPLEMENT_SERIAL(SERIAL_PORT_3);
50+
#endif
51+
#if defined(MMU_SERIAL_PORT) && WITHIN(MMU_SERIAL_PORT, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
52+
IMPLEMENT_SERIAL(MMU_SERIAL_PORT);
53+
#endif
54+
#if defined(LCD_SERIAL_PORT) && WITHIN(LCD_SERIAL_PORT, SERIAL_INDEX_MIN, SERIAL_INDEX_MAX)
55+
IMPLEMENT_SERIAL(LCD_SERIAL_PORT);
5456
#endif
5557
USBSerialType USBSerial(false, SerialUSB);
5658

0 commit comments

Comments
 (0)