sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🧑‍💻 Generalize SDSUPPORT as HAS_MEDIA

Browse Source 
In preparation for single- and multi-volume refactoring.
This commit is contained in:
Scott Lahteine
2023-04-22 22:43:09 -05:00
parent ce85b98db4
commit 5664c02d07
164 changed files with 399 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/inc/Conditionals_adv.h
View File

@@ -794,7 +794,7 @@
#undef MENU_ADDAUTOSTART
#endif
#if EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
#if EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define HAS_PRINT_PROGRESS 1
#endif
@@ -812,7 +812,7 @@
#define HAS_STATUS_MESSAGE_TIMEOUT 1
#endif
#if ENABLED(SDSUPPORT) && SD_PROCEDURE_DEPTH
#if HAS_MEDIA && SD_PROCEDURE_DEPTH
#define HAS_MEDIA_SUBCALLS 1
#endif
@@ -850,7 +850,7 @@
#else
#undef LED_POWEROFF_TIMEOUT
#endif
#if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, SDSUPPORT)
#if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, HAS_MEDIA)
#define HAS_LEDS_OFF_FLAG 1
#endif
#if DISPLAY_SLEEP_MINUTES || TOUCH_IDLE_SLEEP_MINS
@@ -1148,7 +1148,7 @@
// SD Card connection methods
// Defined here so pins and sanity checks can use them
//
#if ENABLED(SDSUPPORT)
#if HAS_MEDIA
#define _SDCARD_LCD 1
#define _SDCARD_ONBOARD 2
#define _SDCARD_CUSTOM_CABLE 3
@@ -1228,7 +1228,7 @@
#endif
// AVR are (usually) too limited in resources to store the configuration into the binary
#if ENABLED(CONFIGURATION_EMBEDDING) && !defined(FORCE_CONFIG_EMBED) && (defined(__AVR__) || DISABLED(SDSUPPORT) || EITHER(SDCARD_READONLY, DISABLE_M503))
#if ENABLED(CONFIGURATION_EMBEDDING) && !defined(FORCE_CONFIG_EMBED) && (defined(__AVR__) || !HAS_MEDIA || EITHER(SDCARD_READONLY, DISABLE_M503))
#undef CONFIGURATION_EMBEDDING
#define CANNOT_EMBED_CONFIGURATION defined(__AVR__)
#endif