forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6830 from thinkyhead/bf_redraw_flags

Browse Source 
Use redraw flag for both types of LCD
master
Scott Lahteine 8 years ago committed by GitHub
parent 3ff7515527 26ffa558a3
commit 6d574883a0
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File

20
Marlin/ultralcd.cpp
Unescape View File

@ -470,7 +470,7 @@ uint16_t max_display_update_time = 0;
// For LCD_PROGRESS_BAR re-initialize custom characters // For LCD_PROGRESS_BAR re-initialize custom characters
lcd_set_custom_characters(screen == lcd_status_screen); lcd_set_custom_characters(screen == lcd_status_screen);
#endif #endif
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
screen_changed = true; screen_changed = true;
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD)
drawing_screen = false; drawing_screen = false;
@ -716,7 +716,7 @@ void kill_screen(const char* lcd_msg) {
void toggle_case_light() { void toggle_case_light() {
case_light_on ^= true; case_light_on ^= true;
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
update_case_light(); update_case_light();
} }
@ -879,7 +879,7 @@ void kill_screen(const char* lcd_msg) {
if (encoderPosition) { if (encoderPosition) {
const int babystep_increment = (int32_t)encoderPosition * (BABYSTEP_MULTIPLICATOR); const int babystep_increment = (int32_t)encoderPosition * (BABYSTEP_MULTIPLICATOR);
encoderPosition = 0; encoderPosition = 0;
lcdDrawUpdate = LCDVIEW_REDRAW_NOW; lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
thermalManager.babystep_axis(axis, babystep_increment); thermalManager.babystep_axis(axis, babystep_increment);
babysteps_done += babystep_increment; babysteps_done += babystep_increment;
} }
@ -912,7 +912,7 @@ void kill_screen(const char* lcd_msg) {
zprobe_zoffset = new_zoffset; zprobe_zoffset = new_zoffset;
refresh_zprobe_zoffset(true); refresh_zprobe_zoffset(true);
lcdDrawUpdate = LCDVIEW_REDRAW_NOW; lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
} }
} }
if (lcdDrawUpdate) if (lcdDrawUpdate)
@ -943,7 +943,7 @@ void kill_screen(const char* lcd_msg) {
mesh_edit_accumulator += float(ubl_encoderPosition) * 0.005 / 2.0; mesh_edit_accumulator += float(ubl_encoderPosition) * 0.005 / 2.0;
mesh_edit_value = mesh_edit_accumulator; mesh_edit_value = mesh_edit_accumulator;
encoderPosition = 0; encoderPosition = 0;
lcdDrawUpdate = LCDVIEW_REDRAW_NOW; lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
const int32_t rounded = (int32_t)(mesh_edit_value * 1000.0); const int32_t rounded = (int32_t)(mesh_edit_value * 1000.0);
mesh_edit_value = float(rounded - (rounded % 5L)) / 1000.0; mesh_edit_value = float(rounded - (rounded % 5L)) / 1000.0;
@ -957,14 +957,8 @@ void kill_screen(const char* lcd_msg) {
defer_return_to_status = true; defer_return_to_status = true;
} }
void _lcd_mesh_edit() {
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
_lcd_mesh_fine_tune(PSTR("Mesh Editor"));
}
float lcd_mesh_edit() { float lcd_mesh_edit() {
lcd_goto_screen(_lcd_mesh_edit_NOP); lcd_goto_screen(_lcd_mesh_edit_NOP);
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
_lcd_mesh_fine_tune(PSTR("Mesh Editor")); _lcd_mesh_fine_tune(PSTR("Mesh Editor"));
return mesh_edit_value; return mesh_edit_value;
} }
@ -2278,7 +2272,7 @@ void kill_screen(const char* lcd_msg) {
manual_move_to_current(axis); manual_move_to_current(axis);
encoderPosition = 0; encoderPosition = 0;
lcdDrawUpdate = LCDVIEW_REDRAW_NOW; lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
} }
if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr41sign(current_position[axis])); if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr41sign(current_position[axis]));
} }
@ -2300,7 +2294,7 @@ void kill_screen(const char* lcd_msg) {
, eindex , eindex
#endif #endif
); );
lcdDrawUpdate = LCDVIEW_REDRAW_NOW; lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
} }
if (lcdDrawUpdate) { if (lcdDrawUpdate) {
PGM_P pos_label; PGM_P pos_label;

Write Preview
Loading…
Cancel
Save