Browse Source

Revert "Remove 6x9 font"

This reverts commit e6cb8ee188.

Conflicts:
	Marlin/dogm_lcd_implementation.h
Confilkt solved
Needs rework.
AnHardt 10 years ago
parent
commit
c686069ccd
1 changed files with 3 additions and 0 deletions
  1. 3
    0
      Marlin/dogm_lcd_implementation.h

+ 3
- 0
Marlin/dogm_lcd_implementation.h View File

43
 #if defined( MAPPER_C2C3 ) || defined( MAPPER_NON )
43
 #if defined( MAPPER_C2C3 ) || defined( MAPPER_NON )
44
   #define USE_BIG_EDIT_FONT
44
   #define USE_BIG_EDIT_FONT
45
 #endif
45
 #endif
46
+#define FONT_STATUSMENU u8g_font_6x9
47
+#define FONT_MENU u8g_font_6x10_marlin
46
 
48
 
47
 #ifndef SIMULATE_ROMFONT
49
 #ifndef SIMULATE_ROMFONT
48
   #if defined( DISPLAY_CHARSET_ISO10646_1 )
50
   #if defined( DISPLAY_CHARSET_ISO10646_1 )
233
   lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
235
   lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
234
   u8g.setPrintPos(x,28);
236
   u8g.setPrintPos(x,28);
235
   lcd_print(itostr3(int(heater >= 0 ? degHotend(heater) : degBed()) + 0.5));
237
   lcd_print(itostr3(int(heater >= 0 ? degHotend(heater) : degBed()) + 0.5));
238
+
236
   lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
239
   lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
237
   if (!isHeatingHotend(0)) {
240
   if (!isHeatingHotend(0)) {
238
     u8g.drawBox(x+7,y,2,2);
241
     u8g.drawBox(x+7,y,2,2);

Loading…
Cancel
Save