Prefix SD SPI pins (SCK, MISO, MOSI, SS) (#20606)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
@@ -1045,9 +1045,9 @@
|
||||
#define INVERT_E_DIR false
|
||||
#endif
|
||||
|
||||
// Fallback SPI Speed
|
||||
#ifndef SPI_SPEED
|
||||
#define SPI_SPEED SPI_FULL_SPEED
|
||||
// Fallback SPI Speed for SD
|
||||
#if ENABLED(SDSUPPORT) && !defined(SD_SPI_SPEED)
|
||||
#define SD_SPI_SPEED SPI_FULL_SPEED
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
@@ -2590,10 +2590,10 @@
|
||||
*/
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#ifndef DOGLCD_SCK
|
||||
#define DOGLCD_SCK SCK_PIN
|
||||
#define DOGLCD_SCK SD_SCK_PIN
|
||||
#endif
|
||||
#ifndef DOGLCD_MOSI
|
||||
#define DOGLCD_MOSI MOSI_PIN
|
||||
#define DOGLCD_MOSI SD_MOSI_PIN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -2683,7 +2683,7 @@
|
||||
// Force SDCARD_SORT_ALPHA to be enabled for Graphical LCD on LPC1768
|
||||
// on boards where SD card and LCD display share the same SPI bus
|
||||
// because of a bug in the shared SPI implementation. (See #8122)
|
||||
#if defined(TARGET_LPC1768) && IS_RRD_FG_SC && (SCK_PIN == LCD_PINS_D4)
|
||||
#if defined(TARGET_LPC1768) && IS_RRD_FG_SC && (SD_SCK_PIN == LCD_PINS_D4)
|
||||
#define SDCARD_SORT_ALPHA // Keep one directory level in RAM. Changing directory levels
|
||||
// may still glitch the screen, but LCD updates clean it up.
|
||||
#undef SDSORT_LIMIT
|
||||
|
@@ -105,9 +105,9 @@
|
||||
#elif defined(USE_AUTOMATIC_VERSIONING)
|
||||
#error "USE_AUTOMATIC_VERSIONING is now CUSTOM_VERSION_FILE."
|
||||
#elif defined(SDSLOW)
|
||||
#error "SDSLOW deprecated. Set SPI_SPEED to SPI_HALF_SPEED instead."
|
||||
#error "SDSLOW deprecated. Set SD_SPI_SPEED to SPI_HALF_SPEED instead."
|
||||
#elif defined(SDEXTRASLOW)
|
||||
#error "SDEXTRASLOW deprecated. Set SPI_SPEED to SPI_QUARTER_SPEED instead."
|
||||
#error "SDEXTRASLOW deprecated. Set SD_SPI_SPEED to SPI_QUARTER_SPEED instead."
|
||||
#elif defined(FILAMENT_SENSOR)
|
||||
#error "FILAMENT_SENSOR is now FILAMENT_WIDTH_SENSOR."
|
||||
#elif defined(ENDSTOPPULLUP_FIL_RUNOUT)
|
||||
|
Reference in New Issue
Block a user