Browse Source
Don't create unused Serial Port instances (#21066)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
vanilla_fb_2.0.x
Giuliano Zaro
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
37 additions and
11 deletions
-
Marlin/src/HAL/DUE/HAL.cpp
-
Marlin/src/HAL/DUE/HAL.h
-
Marlin/src/HAL/SAMD51/HAL.cpp
-
Marlin/src/HAL/SAMD51/HAL.h
|
|
|
@ -102,11 +102,18 @@ uint16_t HAL_adc_get_result() { |
|
|
|
return HAL_adc_result; |
|
|
|
} |
|
|
|
|
|
|
|
// Forward the default serial port
|
|
|
|
DefaultSerial MSerial(false, Serial); |
|
|
|
|
|
|
|
DefaultSerial1 MSerial1(false, Serial1); |
|
|
|
DefaultSerial2 MSerial2(false, Serial2); |
|
|
|
DefaultSerial3 MSerial3(false, Serial3); |
|
|
|
// Forward the default serial ports
|
|
|
|
#if ANY_SERIAL_IS(0) |
|
|
|
DefaultSerial MSerial(false, Serial); |
|
|
|
#endif |
|
|
|
#if ANY_SERIAL_IS(1) |
|
|
|
DefaultSerial1 MSerial1(false, Serial1); |
|
|
|
#endif |
|
|
|
#if ANY_SERIAL_IS(2) |
|
|
|
DefaultSerial2 MSerial2(false, Serial2); |
|
|
|
#endif |
|
|
|
#if ANY_SERIAL_IS(3) |
|
|
|
DefaultSerial3 MSerial3(false, Serial3); |
|
|
|
#endif |
|
|
|
|
|
|
|
#endif // ARDUINO_ARCH_SAM
|
|
|
|
|
|
|
|
@ -37,12 +37,12 @@ |
|
|
|
#include <stdint.h> |
|
|
|
|
|
|
|
#include "../../core/serial_hook.h" |
|
|
|
typedef ForwardSerial0Type< decltype(Serial) > DefaultSerial; |
|
|
|
extern DefaultSerial MSerial; |
|
|
|
|
|
|
|
typedef ForwardSerial0Type< decltype(Serial) > DefaultSerial; |
|
|
|
typedef ForwardSerial0Type< decltype(Serial1) > DefaultSerial1; |
|
|
|
typedef ForwardSerial0Type< decltype(Serial2) > DefaultSerial2; |
|
|
|
typedef ForwardSerial0Type< decltype(Serial3) > DefaultSerial3; |
|
|
|
extern DefaultSerial MSerial; |
|
|
|
extern DefaultSerial1 MSerial1; |
|
|
|
extern DefaultSerial2 MSerial2; |
|
|
|
extern DefaultSerial3 MSerial3; |
|
|
|
|
|
|
|
@ -25,8 +25,21 @@ |
|
|
|
#include <wiring_private.h> |
|
|
|
|
|
|
|
#ifdef ADAFRUIT_GRAND_CENTRAL_M4 |
|
|
|
DefaultSerial MSerial(false, Serial); |
|
|
|
DefaultSerial1 MSerial1(false, Serial1); |
|
|
|
#if ANY_SERIAL_IS(-1) |
|
|
|
DefaultSerial MSerial(false, Serial); |
|
|
|
#endif |
|
|
|
#if ANY_SERIAL_IS(0) |
|
|
|
DefaultSerial1 MSerial1(false, Serial1); |
|
|
|
#endif |
|
|
|
#if ANY_SERIAL_IS(1) |
|
|
|
DefaultSerial2 MSerial2(false, Serial2); |
|
|
|
#endif |
|
|
|
#if ANY_SERIAL_IS(2) |
|
|
|
DefaultSerial3 MSerial3(false, Serial3); |
|
|
|
#endif |
|
|
|
#if ANY_SERIAL_IS(3) |
|
|
|
DefaultSerial4 MSerial4(false, Serial4); |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
// ------------------------
|
|
|
|
|
|
|
|
@ -33,9 +33,15 @@ |
|
|
|
|
|
|
|
// Serial ports
|
|
|
|
typedef ForwardSerial0Type< decltype(Serial) > DefaultSerial; |
|
|
|
extern DefaultSerial MSerial; |
|
|
|
typedef ForwardSerial0Type< decltype(Serial1) > DefaultSerial1; |
|
|
|
typedef ForwardSerial0Type< decltype(Serial2) > DefaultSerial2; |
|
|
|
typedef ForwardSerial0Type< decltype(Serial3) > DefaultSerial3; |
|
|
|
typedef ForwardSerial0Type< decltype(Serial4) > DefaultSerial4; |
|
|
|
extern DefaultSerial MSerial; |
|
|
|
extern DefaultSerial1 MSerial1; |
|
|
|
extern DefaultSerial2 MSerial2; |
|
|
|
extern DefaultSerial3 MSerial3; |
|
|
|
extern DefaultSerial4 MSerial4; |
|
|
|
|
|
|
|
// MYSERIAL0 required before MarlinSerial includes!
|
|
|
|
|
|
|
|
|
