🔧 SDSUPPORT => HAS_MEDIA

This commit is contained in:
Scott Lahteine 2023-04-22 22:57:26 -05:00
parent d9711a27c2
commit 140d3ee9c9
310 changed files with 2478 additions and 2478 deletions

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1614,13 +1614,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1641,7 +1641,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1881,7 +1881,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1894,7 +1894,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2519,9 +2519,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 32 #define BLOCK_BUFFER_SIZE 32
#else #else
#define BLOCK_BUFFER_SIZE 16 // Marlin default #define BLOCK_BUFFER_SIZE 16 // Marlin default
@ -2554,7 +2554,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 32 #define BLOCK_BUFFER_SIZE 32
#else #else
#define BLOCK_BUFFER_SIZE 16 // Marlin default #define BLOCK_BUFFER_SIZE 16 // Marlin default
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1610,13 +1610,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1637,7 +1637,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1877,7 +1877,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1890,7 +1890,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2514,9 +2514,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2549,7 +2549,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1602,13 +1602,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1629,7 +1629,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1869,7 +1869,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1882,7 +1882,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2506,9 +2506,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2541,7 +2541,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 32 #define BLOCK_BUFFER_SIZE 32
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 32 #define BLOCK_BUFFER_SIZE 32
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1874,7 +1874,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1887,7 +1887,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2511,9 +2511,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 32 #define BLOCK_BUFFER_SIZE 32
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2546,7 +2546,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 32 #define BLOCK_BUFFER_SIZE 32
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1613,13 +1613,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1640,7 +1640,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1880,7 +1880,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1893,7 +1893,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2517,9 +2517,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 64 #define BLOCK_BUFFER_SIZE 64
@ -2552,7 +2552,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1604,13 +1604,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1631,7 +1631,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1871,7 +1871,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1884,7 +1884,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2508,9 +2508,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2543,7 +2543,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
#define SERIAL_STATS_MAX_RX_QUEUED #define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2514,9 +2514,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2549,7 +2549,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1607,13 +1607,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1634,7 +1634,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1874,7 +1874,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1887,7 +1887,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2516,9 +2516,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2551,7 +2551,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1606,13 +1606,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1633,7 +1633,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1873,7 +1873,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1886,7 +1886,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2510,9 +2510,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2545,7 +2545,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

View file

@ -1605,13 +1605,13 @@
//#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time //#define SET_REMAINING_TIME // Add 'R' parameter to set remaining time
//#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction
//#define M73_REPORT // Report M73 values to host //#define M73_REPORT // Report M73 values to host
#if BOTH(M73_REPORT, SDSUPPORT) #if BOTH(M73_REPORT, HAS_MEDIA)
#define M73_REPORT_SD_ONLY // Report only when printing from SD #define M73_REPORT_SD_ONLY // Report only when printing from SD
#endif #endif
#endif #endif
// LCD Print Progress options. Multiple times may be displayed in turn. // LCD Print Progress options. Multiple times may be displayed in turn.
#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #if HAS_DISPLAY && EITHER(HAS_MEDIA, SET_PROGRESS_MANUALLY)
#define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar)
#define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E')
//#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R')
@ -1632,7 +1632,7 @@
#endif #endif
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
/** /**
* SD Card SPI Speed * SD Card SPI Speed
* May be required to resolve "volume init" errors. * May be required to resolve "volume init" errors.
@ -1872,7 +1872,7 @@
#define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
#endif #endif
#endif // SDSUPPORT #endif // HAS_MEDIA
/** /**
* By default an onboard SD card reader may be shared as a USB mass- * By default an onboard SD card reader may be shared as a USB mass-
@ -1885,7 +1885,7 @@
* Enable this if you need Marlin to take care of the shared media I/O. * Enable this if you need Marlin to take care of the shared media I/O.
* Useful if shared media isn't working properly on some boards. * Useful if shared media isn't working properly on some boards.
*/ */
#if ENABLED(SDSUPPORT) && DISABLED(NO_SD_HOST_DRIVE) #if HAS_MEDIA && DISABLED(NO_SD_HOST_DRIVE)
//#define DISKIO_HOST_DRIVE //#define DISKIO_HOST_DRIVE
#endif #endif
@ -2509,9 +2509,9 @@
// The number of linear moves that can be in the planner at once. // The number of linear moves that can be in the planner at once.
// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32) // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
#if BOTH(SDSUPPORT, DIRECT_STEPPING) #if BOTH(HAS_MEDIA, DIRECT_STEPPING)
#define BLOCK_BUFFER_SIZE 8 #define BLOCK_BUFFER_SIZE 8
#elif ENABLED(SDSUPPORT) #elif HAS_MEDIA
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
#else #else
#define BLOCK_BUFFER_SIZE 16 #define BLOCK_BUFFER_SIZE 16
@ -2544,7 +2544,7 @@
//#define SERIAL_XON_XOFF //#define SERIAL_XON_XOFF
#endif #endif
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
// Enable this option to collect and display the maximum // Enable this option to collect and display the maximum
// RX queue usage after transferring a file to SD. // RX queue usage after transferring a file to SD.
//#define SERIAL_STATS_MAX_RX_QUEUED //#define SERIAL_STATS_MAX_RX_QUEUED

Some files were not shown because too many files have changed in this diff Show more