Browse Source

Merge pull request #4014 from thinkyhead/rc_one_less_ultipanel_cond

No need to check ULTIPANEL with DOGLCD
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
commit
e51f8df097
  1. 14
      Marlin/ultralcd.cpp

14
Marlin/ultralcd.cpp

@ -2311,18 +2311,12 @@ void lcd_update() {
u8g.setColorIndex(dot_color); // Set color for the alive dot u8g.setColorIndex(dot_color); // Set color for the alive dot
u8g.drawPixel(127, 63); // draw alive dot u8g.drawPixel(127, 63); // draw alive dot
u8g.setColorIndex(1); // black on white u8g.setColorIndex(1); // black on white
#if ENABLED(ULTIPANEL) (*currentScreen)();
(*currentScreen)();
#else
lcd_status_screen();
#endif
} while (u8g.nextPage()); } while (u8g.nextPage());
#elif ENABLED(ULTIPANEL)
(*currentScreen)();
#else #else
#if ENABLED(ULTIPANEL) lcd_status_screen();
(*currentScreen)();
#else
lcd_status_screen();
#endif
#endif #endif
} }

Loading…
Cancel
Save