Adjust ENSURE_SMOOTH_MOVES coding style

Marlin/planner.h

@@ -374,7 +374,7 @@ class Planner {
       static bool long_move() {
         if (blocks_queued()) {
           block_t* block = &block_buffer[block_buffer_tail];
-          return (block->segment_time > (LCD_UPDATE_THRESHOLD * 1000UL));
+          return block->segment_time > (LCD_UPDATE_THRESHOLD) * 1000UL;
         }
         else
           return true;

Marlin/ultralcd.cpp

@@ -2707,90 +2707,94 @@ void lcd_update() {
       }
     #endif // ULTIPANEL
 
-    // We arrive here every ~100ms when idling often enough.
-    // Instead of tracking the changes simply redraw the Info Screen ~1 time a second.
-    static int8_t lcd_status_update_delay = 1; // first update one loop delayed
-    #if ENABLED(ENSURE_SMOOTH_MOVES) && ENABLED(ALWAYS_ALLOW_MENU)
-      if (planner.long_move()) {
-    #endif
-        if (
-          #if ENABLED(ULTIPANEL)
-            currentScreen == lcd_status_screen &&
-          #endif
-            !lcd_status_update_delay--) {
-          lcd_status_update_delay = 9;
-          lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
-        }
     #if ENABLED(ENSURE_SMOOTH_MOVES) && ENABLED(ALWAYS_ALLOW_MENU)
-      }
+      #define STATUS_UPDATE_CONDITION planner.long_move()
+    #else
+      #define STATUS_UPDATE_CONDITION true
     #endif
-
     #if ENABLED(ENSURE_SMOOTH_MOVES) && DISABLED(ALWAYS_ALLOW_MENU)
-      if (planner.long_move()) {
+      #define LCD_HANDLER_CONDITION planner.long_move()
+    #else
+      #define LCD_HANDLER_CONDITION true
     #endif
-    if (lcdDrawUpdate) {
-
-      switch (lcdDrawUpdate) {
-        case LCDVIEW_CALL_NO_REDRAW:
-          lcdDrawUpdate = LCDVIEW_NONE;
-          break;
-        case LCDVIEW_CLEAR_CALL_REDRAW: // set by handlers, then altered after (rarely occurs here)
-        case LCDVIEW_CALL_REDRAW_NEXT:  // set by handlers, then altered after (never occurs here?)
-          lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
-        case LCDVIEW_REDRAW_NOW:        // set above, or by a handler through LCDVIEW_CALL_REDRAW_NEXT
-        case LCDVIEW_NONE:
-          break;
-      }
 
+    // We arrive here every ~100ms when idling often enough.
+    // Instead of tracking the changes simply redraw the Info Screen ~1 time a second.
+    static int8_t lcd_status_update_delay = 1; // first update one loop delayed
+    if (STATUS_UPDATE_CONDITION &&
       #if ENABLED(ULTIPANEL)
-        #define CURRENTSCREEN() (*currentScreen)(), lcd_clicked = false
+        currentScreen == lcd_status_screen &&
-      #else
-        #define CURRENTSCREEN() lcd_status_screen()
       #endif
+        !lcd_status_update_delay--
+    ) {
+      lcd_status_update_delay = 9;
+      lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
+    }
+
+    if (LCD_HANDLER_CONDITION) {
 
-      #if ENABLED(DOGLCD)  // Changes due to different driver architecture of the DOGM display
+      if (lcdDrawUpdate) {
-        static int8_t dot_color = 0;
+
-        dot_color = 1 - dot_color;
+        switch (lcdDrawUpdate) {
-        u8g.firstPage();
+          case LCDVIEW_CALL_NO_REDRAW:
-        do {
+            lcdDrawUpdate = LCDVIEW_NONE;
-          lcd_setFont(FONT_MENU);
+            break;
-          u8g.setPrintPos(125, 0);
+          case LCDVIEW_CLEAR_CALL_REDRAW: // set by handlers, then altered after (rarely occurs here)
-          u8g.setColorIndex(dot_color); // Set color for the alive dot
+          case LCDVIEW_CALL_REDRAW_NEXT:  // set by handlers, then altered after (never occurs here?)
-          u8g.drawPixel(127, 63); // draw alive dot
+            lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
-          u8g.setColorIndex(1); // black on white
+          case LCDVIEW_REDRAW_NOW:        // set above, or by a handler through LCDVIEW_CALL_REDRAW_NEXT
+          case LCDVIEW_NONE:
+            break;
+        } // switch
+
+        #if ENABLED(ULTIPANEL)
+          #define CURRENTSCREEN() (*currentScreen)(), lcd_clicked = false
+        #else
+          #define CURRENTSCREEN() lcd_status_screen()
+        #endif
+
+        #if ENABLED(DOGLCD)  // Changes due to different driver architecture of the DOGM display
+          static int8_t dot_color = 0;
+          dot_color = 1 - dot_color;
+          u8g.firstPage();
+          do {
+            lcd_setFont(FONT_MENU);
+            u8g.setPrintPos(125, 0);
+            u8g.setColorIndex(dot_color); // Set color for the alive dot
+            u8g.drawPixel(127, 63); // draw alive dot
+            u8g.setColorIndex(1); // black on white
+            CURRENTSCREEN();
+          } while (u8g.nextPage());
+        #else
           CURRENTSCREEN();
-        } while (u8g.nextPage());
+        #endif
-      #else
+      }
-        CURRENTSCREEN();
-      #endif
-    }
 
-    #if ENABLED(ULTIPANEL)
+      #if ENABLED(ULTIPANEL)
 
-      // Return to Status Screen after a timeout
+        // Return to Status Screen after a timeout
-      if (currentScreen == lcd_status_screen || defer_return_to_status)
+        if (currentScreen == lcd_status_screen || defer_return_to_status)
-        return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
+          return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
-      else if (ELAPSED(ms, return_to_status_ms))
+        else if (ELAPSED(ms, return_to_status_ms))
-        lcd_return_to_status();
+          lcd_return_to_status();
 
-    #endif // ULTIPANEL
+      #endif // ULTIPANEL
 
-    switch (lcdDrawUpdate) {
+      switch (lcdDrawUpdate) {
-      case LCDVIEW_CLEAR_CALL_REDRAW:
+        case LCDVIEW_CLEAR_CALL_REDRAW:
-        lcd_implementation_clear();
+          lcd_implementation_clear();
-      case LCDVIEW_CALL_REDRAW_NEXT:
+        case LCDVIEW_CALL_REDRAW_NEXT:
-        lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
+          lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
-        break;
+          break;
-      case LCDVIEW_REDRAW_NOW:
+        case LCDVIEW_REDRAW_NOW:
-        lcdDrawUpdate = LCDVIEW_NONE;
+          lcdDrawUpdate = LCDVIEW_NONE;
-        break;
+          break;
-      case LCDVIEW_NONE:
+        case LCDVIEW_NONE:
-        break;
+          break;
-    }
+      } // switch
+
+    } // LCD_HANDLER_CONDITION
 
-    #if ENABLED(ENSURE_SMOOTH_MOVES) && DISABLED(ALWAYS_ALLOW_MENU)
-      }
-    #endif
   }
 }