Skip to content

Commit 85d593e

Browse files
committed
Use / update sanity check instead
1 parent 2a8393a commit 85d593e

7 files changed

+8
-8
lines changed

Marlin/src/inc/SanityCheck.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -2705,8 +2705,8 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
27052705
static_assert(strcmp(STRINGIFY(LCD_LANGUAGE_2), "zh_CN") == 0, "LCD_LANGUAGE_2 must be set to zh_CN for ANYCUBIC_LCD_VYPER.");
27062706
#endif
27072707

2708-
#if ANY(MKS_TS35_V2_0, BTT_TFT35_SPI_V1_0) && SD_CONNECTION_IS(LCD)
2709-
#error "SDCARD_CONNECTION cannot be set to LCD for the enabled TFT. No available SD card reader."
2708+
#if ANY(MKS_TS35_V2_0, BTT_TFT35_SPI_V1_0, CR10_STOCKDISPLAY) && SD_CONNECTION_IS(LCD)
2709+
#error "SDCARD_CONNECTION cannot be set to LCD for the enabled display. No available SD card reader."
27102710
#endif
27112711

27122712
/**

Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
// SD Support
120120
//
121121
#ifndef SDCARD_CONNECTION
122-
#if HAS_WIRED_LCD && DISABLED(CR10_STOCKDISPLAY)
122+
#if HAS_WIRED_LCD
123123
#define SDCARD_CONNECTION LCD
124124
#else
125125
#define SDCARD_CONNECTION ONBOARD

Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
// SD Support
236236
//
237237
#ifndef SDCARD_CONNECTION
238-
#if HAS_WIRED_LCD && DISABLED(CR10_STOCKDISPLAY)
238+
#if HAS_WIRED_LCD
239239
#define SDCARD_CONNECTION LCD
240240
#else
241241
#define SDCARD_CONNECTION ONBOARD

Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
// SD Support
229229
//
230230
#ifndef SDCARD_CONNECTION
231-
#if HAS_WIRED_LCD && DISABLED(CR10_STOCKDISPLAY)
231+
#if HAS_WIRED_LCD
232232
#define SDCARD_CONNECTION LCD
233233
#else
234234
#define SDCARD_CONNECTION ONBOARD

Marlin/src/pins/stm32h7/pins_BTT_KRAKEN_V1_0.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326
// SD Support
327327
//
328328
#ifndef SDCARD_CONNECTION
329-
#if HAS_WIRED_LCD && DISABLED(CR10_STOCKDISPLAY)
329+
#if HAS_WIRED_LCD
330330
#define SDCARD_CONNECTION LCD
331331
#else
332332
#define SDCARD_CONNECTION ONBOARD

Marlin/src/pins/stm32h7/pins_BTT_MANTA_M8P_V2_0.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272
// SD Support
273273
//
274274
#ifndef SDCARD_CONNECTION
275-
#if HAS_WIRED_LCD && DISABLED(CR10_STOCKDISPLAY)
275+
#if HAS_WIRED_LCD
276276
#define SDCARD_CONNECTION LCD
277277
#else
278278
#define SDCARD_CONNECTION ONBOARD

Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
// SD Support
247247
//
248248
#ifndef SDCARD_CONNECTION
249-
#if HAS_WIRED_LCD && DISABLED(CR10_STOCKDISPLAY)
249+
#if HAS_WIRED_LCD
250250
#define SDCARD_CONNECTION LCD
251251
#else
252252
#define SDCARD_CONNECTION ONBOARD

0 commit comments

Comments
 (0)