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