Wrap all items depending on ULTIPANEL

[thinkyhead]

To view differences without whitespace use this link.

• Also changes menu to screen because not all screens are menus

[AnHardt]

-        (*currentMenu)();
+        #if ENABLED(ULTIPANEL)
+          (*currentScreen)();
+        #else
+          lcd_status_screen();
+        #endif

Maybe i'm bit slow this evening.
Without buttons -> no menu -> you can't change *currentScreen -> you can't leave the status screen.
So, why differentiate here?

[thinkyhead]

why differentiate here?

Because now currentScreen isn't even defined without ULTIPANEL.

[AnHardt]

Shouldn't trow

      #if ENABLED(ULTIPANEL)
         (*currentScreen)();
       #else
         (*currentScreen)();
       #endif

an error if only ULTRA_LCD is defined?

[thinkyhead]

Let's see. There are two instances of this little block.

The first one is wrapped in #if ENABLED(DOGLCD) so as long as ULTIPANEL and DOGLCD are mutually-exclusive, that can go back to just plain (*currentScreen)().

The second one would still apply. So we get…

#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());
#elif ENABLED(ULTIPANEL)
  (*currentScreen)();
#else
  lcd_status_screen();
#endif