Browse Source

Merge pull request #4014 from thinkyhead/rc_one_less_ultipanel_cond

No need to check ULTIPANEL with DOGLCD
Scott Lahteine 9 years ago
parent
commit
e51f8df097
1 changed files with 4 additions and 10 deletions
  1. 4
    10
      Marlin/ultralcd.cpp

+ 4
- 10
Marlin/ultralcd.cpp View File

2311
           u8g.setColorIndex(dot_color); // Set color for the alive dot
2311
           u8g.setColorIndex(dot_color); // Set color for the alive dot
2312
           u8g.drawPixel(127, 63); // draw alive dot
2312
           u8g.drawPixel(127, 63); // draw alive dot
2313
           u8g.setColorIndex(1); // black on white
2313
           u8g.setColorIndex(1); // black on white
2314
-          #if ENABLED(ULTIPANEL)
2315
-            (*currentScreen)();
2316
-          #else
2317
-            lcd_status_screen();
2318
-          #endif
2314
+          (*currentScreen)();
2319
         } while (u8g.nextPage());
2315
         } while (u8g.nextPage());
2316
+      #elif ENABLED(ULTIPANEL)
2317
+        (*currentScreen)();
2320
       #else
2318
       #else
2321
-        #if ENABLED(ULTIPANEL)
2322
-          (*currentScreen)();
2323
-        #else
2324
-          lcd_status_screen();
2325
-        #endif
2319
+        lcd_status_screen();
2326
       #endif
2320
       #endif
2327
     }
2321
     }
2328
 
2322
 

Loading…
Cancel
Save