zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Init lcd_sd_status as false to force lcd_update test

Browse source 
Replaces #145 which is way out of date
This commit is contained in:
Scott Lahteine 2015-09-11 21:53:07 -07:00 committed by Richard Wackerbarth
parent e27dd5c22d
commit fc882c34a3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/ultralcd.cpp
View file

@ -227,7 +227,7 @@ static void lcd_status_screen();
uint8_t lastEncoderBits;
uint32_t encoderPosition;
#if PIN_EXISTS(SD_DETECT)
bool lcd_oldcardstatus;
bool lcd_sd_status;
#endif
#endif // ULTIPANEL
@ -1516,7 +1516,7 @@ void lcd_init() {
#if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
pinMode(SD_DETECT_PIN, INPUT);
WRITE(SD_DETECT_PIN, HIGH);
lcd_oldcardstatus = IS_SD_INSERTED;
lcd_sd_status = false;
#endif
#if ENABLED(LCD_HAS_SLOW_BUTTONS)
@ -1574,16 +1574,17 @@ void lcd_update() {
#if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
if (IS_SD_INSERTED != lcd_oldcardstatus && lcd_detected()) {
bool sd_status = IS_SD_INSERTED;
if (sd_status != lcd_sd_status && lcd_detected()) {
lcdDrawUpdate = 2;
lcd_oldcardstatus = IS_SD_INSERTED;
lcd_sd_status = sd_status;
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR)
currentMenu == lcd_status_screen
#endif
);
if (lcd_oldcardstatus) {
if (lcd_sd_status) {
card.initsd();
LCD_MESSAGEPGM(MSG_SD_INSERTED);
}