Merge pull request #4014 from thinkyhead/rc_one_less_ultipanel_cond

No need to check ULTIPANEL with DOGLCD
8 years ago · e51f8df097
parent c7eeb09e8f b322ac4417
commit e51f8df097
1 changed files with 4 additions and 10 deletions
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@ -2311,18 +2311,12 @@ void lcd_update() {
          u8g.setColorIndex(dot_color); // Set color for the alive dot
          u8g.drawPixel(127, 63); // draw alive dot
          u8g.setColorIndex(1); // black on white
-          #if ENABLED(ULTIPANEL)
-            (*currentScreen)();
-          #else
-            lcd_status_screen();
-          #endif
+          (*currentScreen)();
        } while (u8g.nextPage());
+      #elif ENABLED(ULTIPANEL)
+        (*currentScreen)();
      #else
-        #if ENABLED(ULTIPANEL)
-          (*currentScreen)();
-        #else
-          lcd_status_screen();
-        #endif
+        lcd_status_screen();
      #endif
    }