Browse Source

Revert "Removed now unneded FONT_STATUSMENU"

This reverts commit 8c5bb38748.
AnHardt 9 years ago
parent
commit
b00a531df8
1 changed files with 14 additions and 4 deletions
  1. 14
    4
      Marlin/dogm_lcd_implementation.h

+ 14
- 4
Marlin/dogm_lcd_implementation.h View File

@@ -74,9 +74,12 @@
74 74
   #endif
75 75
 #endif // SIMULATE_ROMFONT
76 76
 
77
-#define FONT_MENU 1
77
+#define FONT_STATUSMENU_NAME FONT_MENU_NAME
78
+
79
+#define FONT_STATUSMENU 1
78 80
 #define FONT_SPECIAL 2
79 81
 #define FONT_MENU_EDIT 3
82
+#define FONT_MENU 4
80 83
 
81 84
 // DOGM parameters (size in pixels)
82 85
 #define DOG_CHAR_WIDTH         6
@@ -134,6 +137,7 @@ char currentfont = 0;
134 137
 
135 138
 static void lcd_setFont(char font_nr) {
136 139
   switch(font_nr) {
140
+    case FONT_STATUSMENU : {u8g.setFont(FONT_STATUSMENU_NAME); currentfont = FONT_STATUSMENU;}; break;
137 141
     case FONT_MENU       : {u8g.setFont(FONT_MENU_NAME); currentfont = FONT_MENU;}; break;
138 142
     case FONT_SPECIAL    : {u8g.setFont(FONT_SPECIAL_NAME); currentfont = FONT_SPECIAL;}; break;
139 143
     case FONT_MENU_EDIT  : {u8g.setFont(FONT_MENU_EDIT_NAME); currentfont = FONT_MENU_EDIT;}; break;
@@ -223,7 +227,7 @@ static void _draw_heater_status(int x, int heater) {
223 227
   bool isBed = heater < 0;
224 228
   int y = 17 + (isBed ? 1 : 0);
225 229
 
226
-  lcd_setFont(FONT_MENU);
230
+  lcd_setFont(FONT_STATUSMENU);
227 231
   u8g.setPrintPos(x,7);
228 232
   lcd_print(itostr3(int((heater >= 0 ? degTargetHotend(heater) : degTargetBed()) + 0.5)));
229 233
   lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
@@ -248,8 +252,7 @@ static void lcd_implementation_status_screen() {
248 252
 
249 253
   // Symbols menu graphics, animated fan
250 254
   u8g.drawBitmapP(9,1,STATUS_SCREENBYTEWIDTH,STATUS_SCREENHEIGHT, (blink % 2) && fanSpeed ? status_screen0_bmp : status_screen1_bmp);
251
-  lcd_setFont(FONT_MENU);
252
-
255
+ 
253 256
   #ifdef SDSUPPORT
254 257
     // SD Card Symbol
255 258
     u8g.drawBox(42,42,8,7);
@@ -261,6 +264,8 @@ static void lcd_implementation_status_screen() {
261 264
     u8g.drawFrame(54,49,73,4);
262 265
 
263 266
     // SD Card Progress bar and clock
267
+    lcd_setFont(FONT_STATUSMENU);
268
+ 
264 269
     if (IS_SD_PRINTING) {
265 270
       // Progress bar solid part
266 271
       u8g.drawBox(55, 50, (unsigned int)(71.f * card.percentDone() / 100.f), 2);
@@ -285,6 +290,7 @@ static void lcd_implementation_status_screen() {
285 290
   if (EXTRUDERS < 4) _draw_heater_status(81, -1);
286 291
  
287 292
   // Fan
293
+  lcd_setFont(FONT_STATUSMENU);
288 294
   u8g.setPrintPos(104,27);
289 295
   #if defined(FAN_PIN) && FAN_PIN > -1
290 296
     int per = ((fanSpeed + 1) * 100) / 256;
@@ -301,6 +307,7 @@ static void lcd_implementation_status_screen() {
301 307
 
302 308
   // X, Y, Z-Coordinates
303 309
   #define XYZ_BASELINE 38
310
+  u8g.setFont(FONT_STATUSMENU);
304 311
   u8g.drawBox(0,30,128,9);
305 312
   u8g.setColorIndex(0); // white on black
306 313
   u8g.setPrintPos(2,XYZ_BASELINE);
@@ -324,13 +331,16 @@ static void lcd_implementation_status_screen() {
324 331
   u8g.setColorIndex(1); // black on white
325 332
  
326 333
   // Feedrate
334
+  lcd_setFont(FONT_MENU);
327 335
   u8g.setPrintPos(3,49);
328 336
   lcd_print(LCD_STR_FEEDRATE[0]);
337
+  u8g.setFont(FONT_STATUSMENU);
329 338
   u8g.setPrintPos(12,49);
330 339
   lcd_print(itostr3(feedmultiply));
331 340
   lcd_print('%');
332 341
 
333 342
   // Status line
343
+  u8g.setFont(FONT_STATUSMENU);
334 344
   u8g.setPrintPos(0,63);
335 345
   #ifndef FILAMENT_LCD_DISPLAY
336 346
     lcd_print(lcd_status_message);

Loading…
Cancel
Save