Browse Source

Codestyle tweaks to ultralcd.cpp

Scott Lahteine 8 years ago
parent
commit
67ca6c7bfe
1 changed files with 7 additions and 7 deletions
  1. 7
    7
      Marlin/ultralcd.cpp

+ 7
- 7
Marlin/ultralcd.cpp View File

2970
       !lcd_status_update_delay--
2970
       !lcd_status_update_delay--
2971
     ) {
2971
     ) {
2972
       lcd_status_update_delay = 9
2972
       lcd_status_update_delay = 9
2973
-      #if ENABLED(DOGLCD)
2974
-        + 3
2975
-      #endif
2973
+        #if ENABLED(DOGLCD)
2974
+          + 3
2975
+        #endif
2976
       ;
2976
       ;
2977
       max_display_update_time--;
2977
       max_display_update_time--;
2978
       lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
2978
       lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
2981
     millis_t bbr = planner.block_buffer_runtime();
2981
     millis_t bbr = planner.block_buffer_runtime();
2982
 
2982
 
2983
     #if ENABLED(DOGLCD)
2983
     #if ENABLED(DOGLCD)
2984
-      if ((lcdDrawUpdate || drawing_screen) && (!bbr || (bbr > max_display_update_time * 2000)))
2984
+      if ((lcdDrawUpdate || drawing_screen) && (!bbr || (bbr > 2 * max_display_update_time * 1000)))
2985
     #else
2985
     #else
2986
-      if (lcdDrawUpdate && (!bbr || (bbr > max_display_update_time * 2000)))
2986
+      if (lcdDrawUpdate && (!bbr || (bbr > 2 * max_display_update_time * 1000)))
2987
     #endif
2987
     #endif
2988
     {
2988
     {
2989
       #if ENABLED(DOGLCD)
2989
       #if ENABLED(DOGLCD)
3016
         lcd_setFont(FONT_MENU);
3016
         lcd_setFont(FONT_MENU);
3017
         CURRENTSCREEN();
3017
         CURRENTSCREEN();
3018
         if (drawing_screen && (drawing_screen = u8g.nextPage())) {
3018
         if (drawing_screen && (drawing_screen = u8g.nextPage())) {
3019
-          max_display_update_time = max(max_display_update_time, millis() - ms);
3019
+          NOLESS(max_display_update_time, millis() - ms);
3020
           return;
3020
           return;
3021
         }
3021
         }
3022
       #else
3022
       #else
3023
         CURRENTSCREEN();
3023
         CURRENTSCREEN();
3024
       #endif
3024
       #endif
3025
-      max_display_update_time = max(max_display_update_time, millis() - ms);
3025
+      NOLESS(max_display_update_time, millis() - ms);
3026
     }
3026
     }
3027
 
3027
 
3028
     #if ENABLED(ULTIPANEL)
3028
     #if ENABLED(ULTIPANEL)

Loading…
Cancel
Save