Browse Source

Non-reentrant "Moving..." screen to safely wait in LCD

pull/1/head
Scott Lahteine 8 years ago
parent
commit
b4dbf4d18a
  1. 3
      Marlin/language_en.h
  2. 34
      Marlin/ultralcd.cpp
  3. 4
      Marlin/ultralcd_impl_DOGM.h
  4. 4
      Marlin/ultralcd_impl_HD44780.h

3
Marlin/language_en.h

@ -138,6 +138,9 @@
#ifndef MSG_LEVEL_BED #ifndef MSG_LEVEL_BED
#define MSG_LEVEL_BED "Level bed" #define MSG_LEVEL_BED "Level bed"
#endif #endif
#ifndef MSG_MOVING
#define MSG_MOVING "Moving..."
#endif
#ifndef MSG_MOVE_X #ifndef MSG_MOVE_X
#define MSG_MOVE_X "Move X" #define MSG_MOVE_X "Move X"
#endif #endif

34
Marlin/ultralcd.cpp

@ -390,7 +390,7 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
bool screen_changed; bool screen_changed;
// LCD and menu clicks // LCD and menu clicks
bool lcd_clicked, wait_for_unclick, defer_return_to_status; bool lcd_clicked, wait_for_unclick, defer_return_to_status, no_reentrance;
// Variables used when editing values. // Variables used when editing values.
const char* editLabel; const char* editLabel;
@ -422,6 +422,27 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
} }
} }
/**
* Synchronize safely while holding the current screen
* This blocks all further screen or stripe updates once called
*/
inline void lcd_synchronize() {
lcd_implementation_drawmenu_static(LCD_HEIGHT >= 4 ? 1 : 0, PSTR(MSG_MOVING));
if (no_reentrance) return;
no_reentrance = true;
screenFunc_t old_screen = currentScreen;
lcd_goto_screen(lcd_synchronize);
stepper.synchronize();
no_reentrance = false;
lcd_goto_screen(old_screen);
}
inline void lcd_wait_for_homing() {
no_reentrance = true;
while (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) idle();
no_reentrance = true;
}
void lcd_return_to_status() { lcd_goto_screen(lcd_status_screen); } void lcd_return_to_status() { lcd_goto_screen(lcd_status_screen); }
void lcd_save_previous_screen() { void lcd_save_previous_screen() {
@ -1063,6 +1084,7 @@ void kill_screen(const char* lcd_msg) {
// Note: During Manual Bed Leveling the homed Z position is MESH_HOME_SEARCH_Z // Note: During Manual Bed Leveling the homed Z position is MESH_HOME_SEARCH_Z
// Z position will be restored with the final action, a G28 // Z position will be restored with the final action, a G28
inline void _mbl_goto_xy(float x, float y) { inline void _mbl_goto_xy(float x, float y) {
if (no_reentrance) return;
current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT); current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT);
line_to_current(Z_AXIS); line_to_current(Z_AXIS);
current_position[X_AXIS] = LOGICAL_X_POSITION(x); current_position[X_AXIS] = LOGICAL_X_POSITION(x);
@ -1072,7 +1094,7 @@ void kill_screen(const char* lcd_msg) {
current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z); current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
line_to_current(Z_AXIS); line_to_current(Z_AXIS);
#endif #endif
stepper.synchronize(); lcd_synchronize();
} }
void _lcd_level_goto_next_point(); void _lcd_level_goto_next_point();
@ -1094,6 +1116,8 @@ void kill_screen(const char* lcd_msg) {
void _lcd_level_bed_get_z() { void _lcd_level_bed_get_z() {
ENCODER_DIRECTION_NORMAL(); ENCODER_DIRECTION_NORMAL();
if (no_reentrance) goto KeepDrawing;
// Encoder wheel adjusts the Z position // Encoder wheel adjusts the Z position
if (encoderPosition) { if (encoderPosition) {
refresh_cmd_timeout(); refresh_cmd_timeout();
@ -1121,7 +1145,7 @@ void kill_screen(const char* lcd_msg) {
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT; current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT;
line_to_current(Z_AXIS); line_to_current(Z_AXIS);
stepper.synchronize(); lcd_synchronize();
mbl.set_has_mesh(true); mbl.set_has_mesh(true);
enqueue_and_echo_commands_P(PSTR("G28")); enqueue_and_echo_commands_P(PSTR("G28"));
@ -1141,6 +1165,7 @@ void kill_screen(const char* lcd_msg) {
debounce_click = false; debounce_click = false;
} }
KeepDrawing:
// Update on first display, then only on updates to Z position // Update on first display, then only on updates to Z position
// Show message above on clicks instead // Show message above on clicks instead
if (lcdDrawUpdate) { if (lcdDrawUpdate) {
@ -1215,7 +1240,8 @@ void kill_screen(const char* lcd_msg) {
LCDVIEW_CALL_NO_REDRAW LCDVIEW_CALL_NO_REDRAW
#endif #endif
; ;
if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) if (no_reentrance) return;
lcd_wait_for_homing();
lcd_goto_screen(_lcd_level_bed_homing_done); lcd_goto_screen(_lcd_level_bed_homing_done);
} }

4
Marlin/ultralcd_impl_DOGM.h

@ -656,8 +656,6 @@ static void lcd_implementation_status_screen() {
u8g.setPrintPos((START_COL) * (DOG_CHAR_WIDTH), row_y2); u8g.setPrintPos((START_COL) * (DOG_CHAR_WIDTH), row_y2);
} }
#if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
// Draw a static line of text in the same idiom as a menu item // Draw a static line of text in the same idiom as a menu item
static void lcd_implementation_drawmenu_static(const uint8_t row, const char* pstr, const bool center=true, const bool invert=false, const char* valstr=NULL) { static void lcd_implementation_drawmenu_static(const uint8_t row, const char* pstr, const bool center=true, const bool invert=false, const char* valstr=NULL) {
@ -683,8 +681,6 @@ static void lcd_implementation_status_screen() {
while (n-- > 0) u8g.print(' '); while (n-- > 0) u8g.print(' ');
} }
#endif // LCD_INFO_MENU || FILAMENT_CHANGE_FEATURE
// Draw a generic menu item // Draw a generic menu item
static void lcd_implementation_drawmenu_generic(const bool isSelected, const uint8_t row, const char* pstr, const char pre_char, const char post_char) { static void lcd_implementation_drawmenu_generic(const bool isSelected, const uint8_t row, const char* pstr, const char pre_char, const char post_char) {
UNUSED(pre_char); UNUSED(pre_char);

4
Marlin/ultralcd_impl_HD44780.h

@ -792,8 +792,6 @@ static void lcd_implementation_status_screen() {
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
#if ENABLED(LCD_INFO_MENU) || ENABLED(FILAMENT_CHANGE_FEATURE)
static void lcd_implementation_drawmenu_static(const uint8_t row, const char* pstr, const bool center=true, const bool invert=false, const char *valstr=NULL) { static void lcd_implementation_drawmenu_static(const uint8_t row, const char* pstr, const bool center=true, const bool invert=false, const char *valstr=NULL) {
UNUSED(invert); UNUSED(invert);
char c; char c;
@ -814,8 +812,6 @@ static void lcd_implementation_status_screen() {
while (n-- > 0) lcd.print(' '); while (n-- > 0) lcd.print(' ');
} }
#endif // LCD_INFO_MENU || FILAMENT_CHANGE_FEATURE
static void lcd_implementation_drawmenu_generic(const bool sel, const uint8_t row, const char* pstr, const char pre_char, const char post_char) { static void lcd_implementation_drawmenu_generic(const bool sel, const uint8_t row, const char* pstr, const char pre_char, const char post_char) {
char c; char c;
uint8_t n = LCD_WIDTH - 2; uint8_t n = LCD_WIDTH - 2;

Loading…
Cancel
Save