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

🧑‍💻 Update some SDSUPPORT

Browse Source
This commit is contained in:
Scott Lahteine
2023-08-04 18:29:52 -05:00
parent 4e31fa66e2
commit 27e68a61fa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/tft/ui_color_ui.cpp
View File

@@ -319,7 +319,7 @@ void MarlinUI::draw_status_screen() {
#if ENABLED(TOUCH_SCREEN) #if ENABLED(TOUCH_SCREEN)
add_control(MENU_ICON_X, MENU_ICON_Y, menu_main, imgSettings); add_control(MENU_ICON_X, MENU_ICON_Y, menu_main, imgSettings);
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
const bool cm = card.isMounted(), pa = printingIsActive(); const bool cm = card.isMounted(), pa = printingIsActive();
if (cm && pa) if (cm && pa)
add_control(SDCARD_ICON_X, SDCARD_ICON_Y, STOP, imgCancel, true, COLOR_CONTROL_CANCEL); add_control(SDCARD_ICON_X, SDCARD_ICON_Y, STOP, imgCancel, true, COLOR_CONTROL_CANCEL);

2
Marlin/src/pins/sanguino/pins_MELZI_CREALITY_E2.h
View File

@@ -58,7 +58,7 @@
// //
#if ANY(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY) #if ANY(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#if ENABLED(SDSUPPORT) #if HAS_MEDIA
#error "Cannot have SDSUPPORT with CR10_STOCKDISPLAY on this motherboard." // Hardware SDCARD SCK and MOSI pins are reallocated. #error "Cannot have SDSUPPORT with CR10_STOCKDISPLAY on this motherboard." // Hardware SDCARD SCK and MOSI pins are reallocated.
#endif #endif
#define LCD_PINS_RS EXP1_07_PIN // ST9720 CS #define LCD_PINS_RS EXP1_07_PIN // ST9720 CS