diff --git a/src/SD.cpp b/src/SD.cpp index fbadb62..63e9f05 100644 --- a/src/SD.cpp +++ b/src/SD.cpp @@ -353,7 +353,9 @@ boolean SDClass::begin(uint32_t clock, uint8_t csPin) { if(root.isOpen()) root.close(); return card.init(SPI_HALF_SPEED, csPin) && +#ifdef USE_SPI_LIB card.setSpiClock(clock) && +#endif volume.init(card) && root.openRoot(volume); } diff --git a/src/utility/Sd2Card.cpp b/src/utility/Sd2Card.cpp index 406f838..26cb15a 100644 --- a/src/utility/Sd2Card.cpp +++ b/src/utility/Sd2Card.cpp @@ -17,7 +17,6 @@ * along with the Arduino Sd2Card Library. If not, see * . */ -#define USE_SPI_LIB #include #include "Sd2Card.h" //------------------------------------------------------------------------------ diff --git a/src/utility/Sd2Card.h b/src/utility/Sd2Card.h index 9c3faff..e005c5d 100644 --- a/src/utility/Sd2Card.h +++ b/src/utility/Sd2Card.h @@ -48,6 +48,7 @@ uint8_t const SPI_QUARTER_SPEED = 2; //------------------------------------------------------------------------------ #if MEGA_SOFT_SPI && (defined(__AVR_ATmega1280__)||defined(__AVR_ATmega2560__)) #define SOFTWARE_SPI +#undef USE_SPI_LIB #endif // MEGA_SOFT_SPI //------------------------------------------------------------------------------ // SPI pin definitions