sv/Marlin
1
1
Fork 0
Code Issues Pull Requests Wiki Activity

🧑‍💻 Generalize SDSUPPORT as HAS_MEDIA

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

14
Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
View File

@@ -41,7 +41,7 @@
#include "../../module/planner.h"
#include "../../module/motion.h"
#if DISABLED(LCD_PROGRESS_BAR) && BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
#if DISABLED(LCD_PROGRESS_BAR) && BOTH(FILAMENT_LCD_DISPLAY, HAS_MEDIA)
#include "../../feature/filwidth.h"
#include "../../gcode/parser.h"
#endif
@@ -289,7 +289,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS
#endif // LCD_PROGRESS_BAR
#if BOTH(SDSUPPORT, HAS_MARLINUI_MENU)
#if BOTH(HAS_MEDIA, HAS_MARLINUI_MENU)
// CHARSET_MENU
const static PROGMEM byte refresh[8] = {
@@ -313,7 +313,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS
B00000
};
#endif // SDSUPPORT
#endif // HAS_MEDIA
#if ENABLED(SHOW_BOOTSCREEN)
// Set boot screen corner characters
@@ -339,7 +339,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS
#endif
{
createChar_P(LCD_STR_UPLEVEL[0], uplevel);
#if BOTH(SDSUPPORT, HAS_MARLINUI_MENU)
#if BOTH(HAS_MEDIA, HAS_MARLINUI_MENU)
// SD Card sub-menu special characters
createChar_P(LCD_STR_REFRESH[0], refresh);
createChar_P(LCD_STR_FOLDER[0], folder);
@@ -697,7 +697,7 @@ void MarlinUI::draw_status_message(const bool blink) {
if (progress > 2) return draw_progress_bar(progress);
}
#elif BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
#elif BOTH(FILAMENT_LCD_DISPLAY, HAS_MEDIA)
// Alternate Status message and Filament display
if (ELAPSED(millis(), next_filament_display)) {
@@ -709,7 +709,7 @@ void MarlinUI::draw_status_message(const bool blink) {
return;
}
#endif // FILAMENT_LCD_DISPLAY && SDSUPPORT
#endif // FILAMENT_LCD_DISPLAY && HAS_MEDIA
#if ENABLED(STATUS_MESSAGE_SCROLLING)
static bool last_blink = false;
@@ -1218,7 +1218,7 @@ void MarlinUI::draw_status_screen() {
}
}
#if ENABLED(SDSUPPORT)
#if HAS_MEDIA
void MenuItem_sdbase::draw(const bool sel, const uint8_t row, FSTR_P const, CardReader &theCard, const bool isDir) {
lcd_put_lchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');