Pārlūkot izejas kodu

move dogm font selection to configuration_adv.h

Christian Bohn 10 gadus atpakaļ
vecāks
revīzija
258bcdefe0

+ 11
- 0
Marlin/Configuration_adv.h Parādīt failu

315
 
315
 
316
 #endif // SDSUPPORT
316
 #endif // SDSUPPORT
317
 
317
 
318
+// for dogm lcd displays you can choose some additional fonts:
319
+#ifdef DOGLCD
320
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
321
+  // we don't have a big font for Cyrillic, Kana
322
+  //#define USE_BIG_EDIT_FONT
323
+ 
324
+  // If you have spare 2300Byte of progmem and want to use a 
325
+  // smaller font on the Info-screen uncomment the next line.
326
+  //#define USE_SMALL_INFOFONT
327
+#endif // DOGLCD
328
+
318
 // @section more
329
 // @section more
319
 
330
 
320
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
331
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 11
- 0
Marlin/configurator/config/Configuration_adv.h Parādīt failu

323
 
323
 
324
 #endif // SDSUPPORT
324
 #endif // SDSUPPORT
325
 
325
 
326
+// for dogm lcd displays you can choose some additional fonts:
327
+#ifdef DOGLCD
328
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
329
+  // we don't have a big font for Cyrillic, Kana
330
+  //#define USE_BIG_EDIT_FONT
331
+ 
332
+  // If you have spare 2300Byte of progmem and want to use a 
333
+  // smaller font on the Info-screen uncomment the next line.
334
+  //#define USE_SMALL_INFOFONT
335
+#endif // DOGLCD
336
+
326
 // @section more
337
 // @section more
327
 
338
 
328
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
339
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 3
- 7
Marlin/dogm_lcd_implementation.h Parādīt failu

35
 #include "ultralcd_st7920_u8glib_rrd.h"
35
 #include "ultralcd_st7920_u8glib_rrd.h"
36
 #include "Configuration.h"
36
 #include "Configuration.h"
37
 
37
 
38
-// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
39
-// we don't have a big font for Cyrillic, Kana
40
-#if defined(MAPPER_C2C3) || defined(MAPPER_NON)
41
-  //#define USE_BIG_EDIT_FONT
38
+#if !defined(MAPPER_C2C3) && !defined(MAPPER_NON) && defined(USE_BIG_EDIT_FONT)
39
+   #undef USE_BIG_EDIT_FONT
42
 #endif
40
 #endif
43
 
41
 
44
-// If you have spare 2300Byte of progmem and want to use a 
45
-// smaller font on the Info-screen uncomment the next line.
46
-//#define USE_SMALL_INFOFONT
42
+
47
 #ifdef USE_SMALL_INFOFONT
43
 #ifdef USE_SMALL_INFOFONT
48
   #include "dogm_font_data_6x9_marlin.h"
44
   #include "dogm_font_data_6x9_marlin.h"
49
   #define FONT_STATUSMENU_NAME u8g_font_6x9
45
   #define FONT_STATUSMENU_NAME u8g_font_6x9

+ 12
- 0
Marlin/example_configurations/Felix/Configuration_adv.h Parādīt failu

323
 
323
 
324
 #endif // SDSUPPORT
324
 #endif // SDSUPPORT
325
 
325
 
326
+// for dogm lcd displays you can choose some additional fonts:
327
+#ifdef DOGLCD
328
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
329
+  // we don't have a big font for Cyrillic, Kana
330
+  //#define USE_BIG_EDIT_FONT
331
+ 
332
+  // If you have spare 2300Byte of progmem and want to use a 
333
+  // smaller font on the Info-screen uncomment the next line.
334
+  //#define USE_SMALL_INFOFONT
335
+#endif // DOGLCD
336
+
337
+
326
 // @section more
338
 // @section more
327
 
339
 
328
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
340
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 12
- 0
Marlin/example_configurations/Hephestos/Configuration_adv.h Parādīt failu

323
 
323
 
324
 #endif // SDSUPPORT
324
 #endif // SDSUPPORT
325
 
325
 
326
+// for dogm lcd displays you can choose some additional fonts:
327
+#ifdef DOGLCD
328
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
329
+  // we don't have a big font for Cyrillic, Kana
330
+  //#define USE_BIG_EDIT_FONT
331
+ 
332
+  // If you have spare 2300Byte of progmem and want to use a 
333
+  // smaller font on the Info-screen uncomment the next line.
334
+  //#define USE_SMALL_INFOFONT
335
+#endif // DOGLCD
336
+
337
+
326
 // @section more
338
 // @section more
327
 
339
 
328
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
340
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 12
- 0
Marlin/example_configurations/K8200/Configuration_adv.h Parādīt failu

323
 
323
 
324
 #endif // SDSUPPORT
324
 #endif // SDSUPPORT
325
 
325
 
326
+// for dogm lcd displays you can choose some additional fonts:
327
+#ifdef DOGLCD
328
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
329
+  // we don't have a big font for Cyrillic, Kana
330
+  //#define USE_BIG_EDIT_FONT
331
+ 
332
+  // If you have spare 2300Byte of progmem and want to use a 
333
+  // smaller font on the Info-screen uncomment the next line.
334
+  //#define USE_SMALL_INFOFONT
335
+#endif // DOGLCD
336
+
337
+
326
 // @section more
338
 // @section more
327
 
339
 
328
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
340
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 12
- 0
Marlin/example_configurations/SCARA/Configuration_adv.h Parādīt failu

323
 
323
 
324
 #endif // SDSUPPORT
324
 #endif // SDSUPPORT
325
 
325
 
326
+// for dogm lcd displays you can choose some additional fonts:
327
+#ifdef DOGLCD
328
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
329
+  // we don't have a big font for Cyrillic, Kana
330
+  //#define USE_BIG_EDIT_FONT
331
+ 
332
+  // If you have spare 2300Byte of progmem and want to use a 
333
+  // smaller font on the Info-screen uncomment the next line.
334
+  //#define USE_SMALL_INFOFONT
335
+#endif // DOGLCD
336
+
337
+
326
 // @section more
338
 // @section more
327
 
339
 
328
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
340
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 12
- 0
Marlin/example_configurations/WITBOX/Configuration_adv.h Parādīt failu

323
 
323
 
324
 #endif // SDSUPPORT
324
 #endif // SDSUPPORT
325
 
325
 
326
+// for dogm lcd displays you can choose some additional fonts:
327
+#ifdef DOGLCD
328
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
329
+  // we don't have a big font for Cyrillic, Kana
330
+  //#define USE_BIG_EDIT_FONT
331
+ 
332
+  // If you have spare 2300Byte of progmem and want to use a 
333
+  // smaller font on the Info-screen uncomment the next line.
334
+  //#define USE_SMALL_INFOFONT
335
+#endif // DOGLCD
336
+
337
+
326
 // @section more
338
 // @section more
327
 
339
 
328
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
340
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 11
- 0
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h Parādīt failu

324
 
324
 
325
 #endif // SDSUPPORT
325
 #endif // SDSUPPORT
326
 
326
 
327
+// for dogm lcd displays you can choose some additional fonts:
328
+#ifdef DOGLCD
329
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
330
+  // we don't have a big font for Cyrillic, Kana
331
+  //#define USE_BIG_EDIT_FONT
332
+ 
333
+  // If you have spare 2300Byte of progmem and want to use a 
334
+  // smaller font on the Info-screen uncomment the next line.
335
+  //#define USE_SMALL_INFOFONT
336
+#endif // DOGLCD
337
+
327
 // @section more
338
 // @section more
328
 
339
 
329
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
340
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 12
- 0
Marlin/example_configurations/delta/generic/Configuration_adv.h Parādīt failu

324
 
324
 
325
 #endif // SDSUPPORT
325
 #endif // SDSUPPORT
326
 
326
 
327
+// for dogm lcd displays you can choose some additional fonts:
328
+#ifdef DOGLCD
329
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
330
+  // we don't have a big font for Cyrillic, Kana
331
+  //#define USE_BIG_EDIT_FONT
332
+ 
333
+  // If you have spare 2300Byte of progmem and want to use a 
334
+  // smaller font on the Info-screen uncomment the next line.
335
+  //#define USE_SMALL_INFOFONT
336
+#endif // DOGLCD
337
+
338
+
327
 // @section more
339
 // @section more
328
 
340
 
329
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
341
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 12
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Parādīt failu

323
 
323
 
324
 #endif // SDSUPPORT
324
 #endif // SDSUPPORT
325
 
325
 
326
+// for dogm lcd displays you can choose some additional fonts:
327
+#ifdef DOGLCD
328
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
329
+  // we don't have a big font for Cyrillic, Kana
330
+  //#define USE_BIG_EDIT_FONT
331
+ 
332
+  // If you have spare 2300Byte of progmem and want to use a 
333
+  // smaller font on the Info-screen uncomment the next line.
334
+  //#define USE_SMALL_INFOFONT
335
+#endif // DOGLCD
336
+
337
+
326
 // @section more
338
 // @section more
327
 
339
 
328
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
340
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 12
- 0
Marlin/example_configurations/makibox/Configuration_adv.h Parādīt failu

323
 
323
 
324
 #endif // SDSUPPORT
324
 #endif // SDSUPPORT
325
 
325
 
326
+// for dogm lcd displays you can choose some additional fonts:
327
+#ifdef DOGLCD
328
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
329
+  // we don't have a big font for Cyrillic, Kana
330
+  //#define USE_BIG_EDIT_FONT
331
+ 
332
+  // If you have spare 2300Byte of progmem and want to use a 
333
+  // smaller font on the Info-screen uncomment the next line.
334
+  //#define USE_SMALL_INFOFONT
335
+#endif // DOGLCD
336
+
337
+
326
 // @section more
338
 // @section more
327
 
339
 
328
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
340
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

+ 12
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h Parādīt failu

323
 
323
 
324
 #endif // SDSUPPORT
324
 #endif // SDSUPPORT
325
 
325
 
326
+// for dogm lcd displays you can choose some additional fonts:
327
+#ifdef DOGLCD
328
+  // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
329
+  // we don't have a big font for Cyrillic, Kana
330
+  //#define USE_BIG_EDIT_FONT
331
+ 
332
+  // If you have spare 2300Byte of progmem and want to use a 
333
+  // smaller font on the Info-screen uncomment the next line.
334
+  //#define USE_SMALL_INFOFONT
335
+#endif // DOGLCD
336
+
337
+
326
 // @section more
338
 // @section more
327
 
339
 
328
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
340
 // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.

Notiek ielāde…
Atcelt
Saglabāt