bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Revert "Remove 6x9 font"

Browse Source 
This reverts commit e6cb8ee188.

Conflicts:
	Marlin/dogm_lcd_implementation.h
Confilkt solved
Needs rework.
This commit is contained in:
AnHardt
2015-03-16 11:18:27 +01:00
parent b00a531df8
commit c686069ccd
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/dogm_lcd_implementation.h
View File

@@ -43,6 +43,8 @@
#if defined( MAPPER_C2C3 ) || defined( MAPPER_NON ) #if defined( MAPPER_C2C3 ) || defined( MAPPER_NON )
#define USE_BIG_EDIT_FONT #define USE_BIG_EDIT_FONT
#endif #endif
#define FONT_STATUSMENU u8g_font_6x9
#define FONT_MENU u8g_font_6x10_marlin
#ifndef SIMULATE_ROMFONT #ifndef SIMULATE_ROMFONT
#if defined( DISPLAY_CHARSET_ISO10646_1 ) #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 " ")); lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
u8g.setPrintPos(x,28); u8g.setPrintPos(x,28);
lcd_print(itostr3(int(heater >= 0 ? degHotend(heater) : degBed()) + 0.5)); lcd_print(itostr3(int(heater >= 0 ? degHotend(heater) : degBed()) + 0.5));
lcd_printPGM(PSTR(LCD_STR_DEGREE " ")); lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
if (!isHeatingHotend(0)) { if (!isHeatingHotend(0)) {
u8g.drawBox(x+7,y,2,2); u8g.drawBox(x+7,y,2,2);