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

Update SD card connection / sharing options (#14325)

Browse Source
This commit is contained in:
Andy Shaw
2019-06-26 09:55:57 +01:00
committed by Scott Lahteine
parent 9f136a7c67
commit 064177154c
100 changed files with 1508 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/lcd/ultralcd.cpp
View File

@ -104,7 +104,7 @@
#endif
#endif
#if ENABLED(SDSUPPORT)
#if ENABLED(INIT_SDCARD_ON_BOOT)
uint8_t lcd_sd_status;
#endif
@ -319,7 +319,9 @@ void MarlinUI::init() {
#if PIN_EXISTS(SD_DETECT)
SET_INPUT_PULLUP(SD_DETECT_PIN);
#endif
lcd_sd_status = 2; // UNKNOWN
#if ENABLED(INIT_SDCARD_ON_BOOT)
lcd_sd_status = 2; // UNKNOWN
#endif
#endif
#if HAS_ENCODER_ACTION && HAS_SLOW_BUTTONS
@ -770,7 +772,7 @@ void MarlinUI::update() {
#endif // HAS_LCD_MENU
#if ENABLED(SDSUPPORT)
#if ENABLED(INIT_SDCARD_ON_BOOT)
const uint8_t sd_status = (uint8_t)IS_SD_INSERTED();
if (sd_status != lcd_sd_status && detected()) {
@ -811,7 +813,7 @@ void MarlinUI::update() {
#endif
}
#endif // SDSUPPORT
#endif // INIT_SDCARD_ON_BOOT
if (ELAPSED(ms, next_lcd_update_ms)
#if HAS_GRAPHICAL_LCD