From 50faf9d5c5b85a37c1ae4d994ae74b52b32307ca Mon Sep 17 00:00:00 2001 From: vivian-ng Date: Thu, 16 Jan 2020 09:49:15 +0900 Subject: [PATCH] Added sanity check for shared SPI --- Marlin/src/inc/SanityCheck.h | 12 ++++++++++++ Marlin/src/pins/esp32/pins_MRR_ESPA.h | 2 ++ Marlin/src/pins/esp32/pins_MRR_ESPE.h | 1 + 3 files changed, 15 insertions(+) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index c95036a588aa..a755d1827a20 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -2513,3 +2513,15 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2) #if HAS_ADC_BUTTONS && defined(ADC_BUTTON_DEBOUNCE_DELAY) && !WITHIN(ADC_BUTTON_DEBOUNCE_DELAY, 16, 255) #error "ADC_BUTTON_DEBOUNCE_DELAY must be an integer from 16 to 255." #endif + +/** + * Check to make sure MONITOR_DRIVER_STATUS is not enabled + * on boards where TMC SPI drivers are sharing the same SPI + * as the SD card + */ +#if TMC_HAS_SPI && ENABLED(MONITOR_DRIVER_STATUS) + #if ENABLED(SDSUPPORT) && defined(HAS_SHARED_SPI) + #error "MONITOR_DRIVER_STATUS cannot be enabled together with SDSUPPORT on boards with shared SPI." + #endif +#endif + diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h index e778c4e33530..f595d2ceddda 100644 --- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h +++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h @@ -99,3 +99,5 @@ #define MISO_PIN 19 #define SCK_PIN 18 #define SDSS 5 +#define HAS_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers + diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h index cd2da98452ba..f9ea6b96e6e4 100644 --- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h +++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h @@ -118,6 +118,7 @@ #define MISO_PIN 19 #define SCK_PIN 18 #define SDSS 5 +#define HAS_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers ////////////////////////// // LCDs and Controllers //