Browse Source

Beautivy statusscreen

by shifting things some pixels around
AnHardt 9 years ago
parent
commit
fa889cd6e1
1 changed files with 17 additions and 16 deletions
  1. 17
    16
      Marlin/dogm_lcd_implementation.h

+ 17
- 16
Marlin/dogm_lcd_implementation.h View File

@@ -197,7 +197,7 @@ static void lcd_implementation_status_screen() {
197 197
       u8g.drawBox(55, 50, (unsigned int)(71.f * card.percentDone() / 100.f), 2);
198 198
     }
199 199
 
200
-    u8g.setPrintPos(80,47);
200
+    u8g.setPrintPos(80,48);
201 201
     if (starttime != 0) {
202 202
       uint16_t time = (millis() - starttime) / 60000;
203 203
       u8g.print(itostr2(time/60));
@@ -231,26 +231,27 @@ static void lcd_implementation_status_screen() {
231 231
     }
232 232
 
233 233
   // X, Y, Z-Coordinates
234
+  #define XYZ_BASELINE 38
234 235
   u8g.setFont(FONT_STATUSMENU);
235
-  u8g.drawBox(0,29,128,10);
236
+  u8g.drawBox(0,30,128,9);
236 237
   u8g.setColorIndex(0); // white on black
237
-  u8g.setPrintPos(2,37);
238
+  u8g.setPrintPos(2,XYZ_BASELINE);
238 239
   u8g.print("X");
239
-  u8g.drawPixel(8,33);
240
-  u8g.drawPixel(8,35);
241
-  u8g.setPrintPos(10,37);
240
+  u8g.drawPixel(8,XYZ_BASELINE - 5);
241
+  u8g.drawPixel(8,XYZ_BASELINE - 3);
242
+  u8g.setPrintPos(10,XYZ_BASELINE);
242 243
   u8g.print(ftostr31ns(current_position[X_AXIS]));
243
-  u8g.setPrintPos(43,37);
244
+  u8g.setPrintPos(43,XYZ_BASELINE);
244 245
   lcd_printPGM(PSTR("Y"));
245
-  u8g.drawPixel(49,33);
246
-  u8g.drawPixel(49,35);
247
-  u8g.setPrintPos(51,37);
246
+  u8g.drawPixel(49,XYZ_BASELINE - 5);
247
+  u8g.drawPixel(49,XYZ_BASELINE - 3);
248
+  u8g.setPrintPos(51,XYZ_BASELINE);
248 249
   u8g.print(ftostr31ns(current_position[Y_AXIS]));
249
-  u8g.setPrintPos(83,37);
250
+  u8g.setPrintPos(83,XYZ_BASELINE);
250 251
   u8g.print("Z");
251
-  u8g.drawPixel(89,33);
252
-  u8g.drawPixel(89,35);
253
-  u8g.setPrintPos(91,37);
252
+  u8g.drawPixel(89,XYZ_BASELINE - 5);
253
+  u8g.drawPixel(89,XYZ_BASELINE - 3);
254
+  u8g.setPrintPos(91,XYZ_BASELINE);
254 255
   u8g.print(ftostr31(current_position[Z_AXIS]));
255 256
   u8g.setColorIndex(1); // black on white
256 257
  
@@ -259,13 +260,13 @@ static void lcd_implementation_status_screen() {
259 260
   u8g.setPrintPos(3,49);
260 261
   u8g.print(LCD_STR_FEEDRATE[0]);
261 262
   u8g.setFont(FONT_STATUSMENU);
262
-  u8g.setPrintPos(12,48);
263
+  u8g.setPrintPos(12,49);
263 264
   u8g.print(itostr3(feedmultiply));
264 265
   u8g.print('%');
265 266
 
266 267
   // Status line
267 268
   u8g.setFont(FONT_STATUSMENU);
268
-  u8g.setPrintPos(0,61);
269
+  u8g.setPrintPos(0,63);
269 270
   #ifndef FILAMENT_LCD_DISPLAY
270 271
     u8g.print(lcd_status_message);
271 272
   #else

Loading…
Cancel
Save