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

Fix lcd_synchronize with message

Browse source
This commit is contained in:
Scott Lahteine 2017-05-29 12:19:02 -05:00
parent eb39d6e3e2
commit 78d8c598e1
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Marlin/ultralcd.cpp
View file

@ -481,21 +481,28 @@ uint16_t max_display_update_time = 0;
/**
* Show "Moving..." till moves are done, then revert to previous display.
*/
inline void lcd_synchronize(const char * const msg=NULL) {
static const char moving[] PROGMEM = MSG_MOVING;
static const char *sync_message = moving;
void _lcd_synchronize() {
static bool no_reentry = false;
const static char moving[] PROGMEM = MSG_MOVING;
lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, msg ? msg : moving);
if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, sync_message);
if (no_reentry) return;
// Make this the current handler till all moves are done
no_reentry = true;
screenFunc_t old_screen = currentScreen;
lcd_goto_screen(lcd_synchronize);
lcd_goto_screen(_lcd_synchronize);
stepper.synchronize();
no_reentry = false;
lcd_goto_screen(old_screen);
}
void lcd_synchronize(const char * const msg=NULL) {
sync_message = msg ? msg : moving;
_lcd_synchronize();
}
void lcd_return_to_status() { lcd_goto_screen(lcd_status_screen); }
void lcd_save_previous_screen() {