zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Tricked-out declaration

Browse source
This commit is contained in:
Scott Lahteine 2021-03-10 12:35:26 -06:00
parent 9cba3c87ef
commit 048f6b4731
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/src/HAL/TEENSY35_36/HAL.cpp
View file

@ -31,7 +31,12 @@
#include <Wire.h> #include <Wire.h>
DefaultSerial1 MSerial0(false); #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false)
#define IMPLEMENT_SERIAL(X) _IMPLEMENT_SERIAL(X)
#if WITHIN(SERIAL_PORT, 0, 3)
IMPLEMENT_SERIAL(SERIAL_PORT);
#endif
USBSerialType USBSerial(false, SerialUSB); USBSerialType USBSerial(false, SerialUSB);
uint16_t HAL_adc_result, HAL_adc_select; uint16_t HAL_adc_result, HAL_adc_select;

10
Marlin/src/HAL/TEENSY35_36/HAL.h
View file

@ -54,8 +54,13 @@
#endif #endif
#include "../../core/serial_hook.h" #include "../../core/serial_hook.h"
typedef Serial1Class<decltype(Serial)> DefaultSerial1;
extern DefaultSerial1 MSerial0; #define Serial0 Serial
#define _DECLARE_SERIAL(X) \
typedef Serial1Class<decltype(Serial##X)> DefaultSerial##X; \
extern DefaultSerial##X MSerial##X
#define DECLARE_SERIAL(X) _DECLARE_SERIAL(X)
typedef ForwardSerial1Class<decltype(SerialUSB)> USBSerialType; typedef ForwardSerial1Class<decltype(SerialUSB)> USBSerialType;
extern USBSerialType USBSerial; extern USBSerialType USBSerial;
@ -66,6 +71,7 @@ extern USBSerialType USBSerial;
#define MYSERIAL1 USBSerial #define MYSERIAL1 USBSerial
#elif WITHIN(SERIAL_PORT, 0, 3) #elif WITHIN(SERIAL_PORT, 0, 3)
#define MYSERIAL1 MSERIAL(SERIAL_PORT) #define MYSERIAL1 MSERIAL(SERIAL_PORT)
DECLARE_SERIAL(SERIAL_PORT);
#endif #endif
#define HAL_SERVO_LIB libServo #define HAL_SERVO_LIB libServo