From 042b238dd8b54d75bad232bac0733251f8adfb11 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 8 Jun 2024 14:51:40 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20USE=5FSOFTW?= =?UTF-8?q?ARE=5FSPI=20=3D>=20SDFAT=5FUSE=5FSOFTWARE=5FSPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/sd/Sd2Card.h | 2 +- Marlin/src/sd/SdFatConfig.h | 4 ++-- Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/sd/Sd2Card.h b/Marlin/src/sd/Sd2Card.h index dd021364e0..ad015f1f96 100644 --- a/Marlin/src/sd/Sd2Card.h +++ b/Marlin/src/sd/Sd2Card.h @@ -78,7 +78,7 @@ uint8_t const SD_CARD_TYPE_SD1 = 1, // Standard capacity V1 SD card /** * Define SOFTWARE_SPI to use bit-bang SPI */ -#if ANY(MEGA_SOFT_SPI, USE_SOFTWARE_SPI) +#if ANY(MEGA_SOFT_SPI, SDFAT_USE_SOFTWARE_SPI) #define SOFTWARE_SPI #endif diff --git a/Marlin/src/sd/SdFatConfig.h b/Marlin/src/sd/SdFatConfig.h index 0979a592a3..674737c102 100644 --- a/Marlin/src/sd/SdFatConfig.h +++ b/Marlin/src/sd/SdFatConfig.h @@ -88,8 +88,8 @@ */ #define MEGA_SOFT_SPI 0 -// Set USE_SOFTWARE_SPI nonzero to ALWAYS use Software SPI. -#define USE_SOFTWARE_SPI 0 +// Set SDFAT_USE_SOFTWARE_SPI nonzero to ALWAYS use Software SPI. +#define SDFAT_USE_SOFTWARE_SPI 0 /** * The __cxa_pure_virtual function is an error handler that is invoked when diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h index f722c873ae..3c7e7b4a56 100644 --- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h +++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h @@ -33,7 +33,7 @@ /** * Define SOFTWARE_SPI to use bit-bang SPI */ - #if ANY(MEGA_SOFT_SPI, USE_SOFTWARE_SPI) + #if ANY(MEGA_SOFT_SPI, SDFAT_USE_SOFTWARE_SPI) #define SOFTWARE_SPI #endif