bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix SD SPI Speed override, FTDI mesh edit (#20657)

Browse Source 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
This commit is contained in:
InsanityAutomation
2021-01-03 22:59:48 -05:00
committed by GitHub
parent 63448f3244
commit 6b458676b1
4 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/inc/Conditionals_LCD.h
View File

@@ -1045,11 +1045,6 @@
#define INVERT_E_DIR false
#endif
// Fallback SPI Speed for SD
#if ENABLED(SDSUPPORT) && !defined(SD_SPI_SPEED)
#define SD_SPI_SPEED SPI_FULL_SPEED
#endif
/**
* This setting is also used by M109 when trying to calculate
* a ballpark safe margin to prevent wait-forever situation.

5
Marlin/src/inc/Conditionals_post.h
View File

@@ -2708,6 +2708,11 @@
#endif
#endif
// Fallback SPI Speed for SD
#if ENABLED(SDSUPPORT) && !defined(SD_SPI_SPEED)
#define SD_SPI_SPEED SPI_FULL_SPEED
#endif
// Defined here to catch the above defines
#if ENABLED(SDCARD_SORT_ALPHA) && (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
#define HAS_FOLDER_SORTING 1