|
@@ -48,7 +48,6 @@
|
48
|
48
|
*/
|
49
|
49
|
|
50
|
50
|
#define USE_BIG_EDIT_FONT // save 3120 bytes of PROGMEM by commenting out this line
|
51
|
|
-#define FONT_STATUSMENU u8g_font_6x9
|
52
|
51
|
#define FONT_MENU u8g_font_6x10_marlin
|
53
|
52
|
|
54
|
53
|
// DOGM parameters (size in pixels)
|
|
@@ -66,6 +65,8 @@
|
66
|
65
|
#define LCD_WIDTH_EDIT 22
|
67
|
66
|
#endif
|
68
|
67
|
|
|
68
|
+#define FONT_STATUSMENU FONT_MENU
|
|
69
|
+
|
69
|
70
|
#define START_ROW 0
|
70
|
71
|
|
71
|
72
|
/* Custom characters defined in font font_6x10_marlin.c */
|
|
@@ -153,10 +154,10 @@ static void _draw_heater_status(int x, int heater) {
|
153
|
154
|
bool isBed = heater < 0;
|
154
|
155
|
int y = 17 + (isBed ? 1 : 0);
|
155
|
156
|
u8g.setFont(FONT_STATUSMENU);
|
156
|
|
- u8g.setPrintPos(x,6);
|
|
157
|
+ u8g.setPrintPos(x,7);
|
157
|
158
|
u8g.print(itostr3(int((heater >= 0 ? degTargetHotend(heater) : degTargetBed()) + 0.5)));
|
158
|
159
|
lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
|
159
|
|
- u8g.setPrintPos(x,27);
|
|
160
|
+ u8g.setPrintPos(x,28);
|
160
|
161
|
u8g.print(itostr3(int(heater >= 0 ? degHotend(heater) : degBed()) + 0.5));
|
161
|
162
|
lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
|
162
|
163
|
if (!isHeatingHotend(0)) {
|