Browse Source

Testloop cleanup

Shifted condition should still be in.
AnHardt 9 years ago
parent
commit
6361404b91
2 changed files with 5 additions and 8 deletions
  1. 2
    2
      Marlin/dogm_lcd_implementation.h
  2. 3
    6
      Marlin/ultralcd.cpp

+ 2
- 2
Marlin/dogm_lcd_implementation.h View File

318
   lcd_setFont(FONT_STATUSMENU);
318
   lcd_setFont(FONT_STATUSMENU);
319
 
319
 
320
   #ifdef USE_SMALL_INFOFONT
320
   #ifdef USE_SMALL_INFOFONT
321
-    u8g.drawBox(0,30,127,10);
321
+    u8g.drawBox(0,30,128,10);
322
   #else
322
   #else
323
-    u8g.drawBox(0,30,127,9);
323
+    u8g.drawBox(0,30,128,9);
324
   #endif
324
   #endif
325
   u8g.setColorIndex(0); // white on black
325
   u8g.setColorIndex(0); // white on black
326
   u8g.setPrintPos(2,XYZ_BASELINE);
326
   u8g.setPrintPos(2,XYZ_BASELINE);

+ 3
- 6
Marlin/ultralcd.cpp View File

1299
     }
1299
     }
1300
   #endif//CARDINSERTED
1300
   #endif//CARDINSERTED
1301
 
1301
 
1302
-  static uint8_t dotcounter = 63;
1303
-  
1304
   uint32_t ms = millis();
1302
   uint32_t ms = millis();
1305
   if (ms > lcd_next_update_millis) {
1303
   if (ms > lcd_next_update_millis) {
1306
 
1304
 
1366
       (*currentMenu)();
1364
       (*currentMenu)();
1367
       if (lcdDrawUpdate) {
1365
       if (lcdDrawUpdate) {
1368
         do {
1366
         do {
1369
-          if (!dotcounter) dotcounter = 63;
1370
           lcd_setFont(FONT_MENU);
1367
           lcd_setFont(FONT_MENU);
1371
           u8g.setPrintPos(125, 0);
1368
           u8g.setPrintPos(125, 0);
1372
-  //        if (blink % 2) u8g.setColorIndex(1); else u8g.setColorIndex(0); // Set color for the alive dot
1373
-          u8g.drawPixel(127, dotcounter--); // draw alive dot
1374
-  //        u8g.setColorIndex(1); // black on white
1369
+          if (blink % 2) u8g.setColorIndex(1); else u8g.setColorIndex(0); // Set color for the alive dot
1370
+          u8g.drawPixel(127, 63); // draw alive dot
1371
+          u8g.setColorIndex(1); // black on white
1375
           (*currentMenu)();
1372
           (*currentMenu)();
1376
         } while( u8g.nextPage() );
1373
         } while( u8g.nextPage() );
1377
       }
1374
       }

Loading…
Cancel
Save