From c686069ccd24d29d12768b655fa7c44dc96289ac Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 16 Mar 2015 11:18:27 +0100 Subject: [PATCH] Revert "Remove 6x9 font" This reverts commit e6cb8ee1884db31d0a4034ded7f26e928e7b8a22. Conflicts: Marlin/dogm_lcd_implementation.h Confilkt solved Needs rework. --- Marlin/dogm_lcd_implementation.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index cd0e09a17d..812c290f0b 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -43,6 +43,8 @@ #if defined( MAPPER_C2C3 ) || defined( MAPPER_NON ) #define USE_BIG_EDIT_FONT #endif +#define FONT_STATUSMENU u8g_font_6x9 +#define FONT_MENU u8g_font_6x10_marlin #ifndef SIMULATE_ROMFONT #if defined( DISPLAY_CHARSET_ISO10646_1 ) @@ -233,6 +235,7 @@ static void _draw_heater_status(int x, int heater) { lcd_printPGM(PSTR(LCD_STR_DEGREE " ")); u8g.setPrintPos(x,28); lcd_print(itostr3(int(heater >= 0 ? degHotend(heater) : degBed()) + 0.5)); + lcd_printPGM(PSTR(LCD_STR_DEGREE " ")); if (!isHeatingHotend(0)) { u8g.drawBox(x+7,y,2,2);