Browse Source

Use redraw flag for both types of LCD

Scott Lahteine 7 years ago
parent
commit
26ffa558a3
1 changed files with 7 additions and 13 deletions
  1. 7
    13
      Marlin/ultralcd.cpp

+ 7
- 13
Marlin/ultralcd.cpp View File

@@ -470,7 +470,7 @@ uint16_t max_display_update_time = 0;
470 470
         // For LCD_PROGRESS_BAR re-initialize custom characters
471 471
         lcd_set_custom_characters(screen == lcd_status_screen);
472 472
       #endif
473
-      lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
473
+      lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
474 474
       screen_changed = true;
475 475
       #if ENABLED(DOGLCD)
476 476
         drawing_screen = false;
@@ -716,7 +716,7 @@ void kill_screen(const char* lcd_msg) {
716 716
 
717 717
     void toggle_case_light() {
718 718
       case_light_on ^= true;
719
-      lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
719
+      lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
720 720
       update_case_light();
721 721
     }
722 722
 
@@ -879,7 +879,7 @@ void kill_screen(const char* lcd_msg) {
879 879
       if (encoderPosition) {
880 880
         const int babystep_increment = (int32_t)encoderPosition * (BABYSTEP_MULTIPLICATOR);
881 881
         encoderPosition = 0;
882
-        lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
882
+        lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
883 883
         thermalManager.babystep_axis(axis, babystep_increment);
884 884
         babysteps_done += babystep_increment;
885 885
       }
@@ -912,7 +912,7 @@ void kill_screen(const char* lcd_msg) {
912 912
 
913 913
             zprobe_zoffset = new_zoffset;
914 914
             refresh_zprobe_zoffset(true);
915
-            lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
915
+            lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
916 916
           }
917 917
         }
918 918
         if (lcdDrawUpdate)
@@ -943,7 +943,7 @@ void kill_screen(const char* lcd_msg) {
943 943
         mesh_edit_accumulator += float(ubl_encoderPosition) * 0.005 / 2.0;
944 944
         mesh_edit_value = mesh_edit_accumulator;
945 945
         encoderPosition = 0;
946
-        lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
946
+        lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
947 947
 
948 948
         const int32_t rounded = (int32_t)(mesh_edit_value * 1000.0);
949 949
         mesh_edit_value = float(rounded - (rounded % 5L)) / 1000.0;
@@ -957,14 +957,8 @@ void kill_screen(const char* lcd_msg) {
957 957
       defer_return_to_status = true;
958 958
     }
959 959
 
960
-    void _lcd_mesh_edit() {
961
-      lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
962
-      _lcd_mesh_fine_tune(PSTR("Mesh Editor"));
963
-    }
964
-
965 960
     float lcd_mesh_edit() {
966 961
       lcd_goto_screen(_lcd_mesh_edit_NOP);
967
-      lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
968 962
       _lcd_mesh_fine_tune(PSTR("Mesh Editor"));
969 963
       return mesh_edit_value;
970 964
     }
@@ -2278,7 +2272,7 @@ void kill_screen(const char* lcd_msg) {
2278 2272
       manual_move_to_current(axis);
2279 2273
 
2280 2274
       encoderPosition = 0;
2281
-      lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
2275
+      lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
2282 2276
     }
2283 2277
     if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr41sign(current_position[axis]));
2284 2278
   }
@@ -2300,7 +2294,7 @@ void kill_screen(const char* lcd_msg) {
2300 2294
           , eindex
2301 2295
         #endif
2302 2296
       );
2303
-      lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
2297
+      lcdDrawUpdate = LCDVIEW_KEEP_REDRAWING;
2304 2298
     }
2305 2299
     if (lcdDrawUpdate) {
2306 2300
       PGM_P pos_label;

Loading…
Cancel
Save