Browse Source

Corrected Cyrillic fonts.

Cleaned typo in language_test.h Cyrillic part.
pull/1/head
AnHardt 10 years ago
parent
commit
44a205d9d9
  1. 62
      Marlin/dogm_font_data_HD44780_C.h
  2. 153
      Marlin/dogm_font_data_ISO10646_5_Cyrillic.h
  3. 4
      Marlin/language_test.h
  4. BIN
      Marlin/scripts/Fonts/HD44780_C.fon
  5. BIN
      Marlin/scripts/Fonts/ISO10646-5_Cyrillic.fon

62
Marlin/dogm_font_data_HD44780_C.h

@ -2,7 +2,7 @@
Fontname: HD44780_C
Copyright: A. Hardtung, public domain
Capital A Height: 7, '1' Height: 7
Calculated Max Values w= 5 h= 8 x= 2 y= 8 dx= 6 dy= 0 ascent= 8 len= 8
Calculated Max Values w= 5 h= 8 x= 2 y= 7 dx= 6 dy= 0 ascent= 8 len= 8
Font Bounding box w= 6 h= 9 x= 0 y=-2
Calculated Min Values x= 0 y=-1 dx= 0 dy= 0
Pure Font ascent = 7 descent=-1
@ -10,9 +10,9 @@
Max Font ascent = 8 descent=-1
*/
#include <utility/u8g.h>
const u8g_fntpgm_uint8_t HD44780_C_5x7[2520] U8G_SECTION(".progmem.HD44780_C_5x7") = {
const u8g_fntpgm_uint8_t HD44780_C_5x7[2522] U8G_SECTION(".progmem.HD44780_C_5x7") = {
0,6,9,0,254,7,1,145,3,34,32,255,255,8,255,7,
255,0,0,0,6,0,8,1,7,7,6,2,0,128,128,128,
255,0,0,0,6,0,0,1,7,7,6,2,0,128,128,128,
128,128,0,128,3,2,2,6,1,5,160,160,5,7,7,6,
0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,32,
120,160,112,40,240,32,5,7,7,6,0,0,192,200,16,32,
@ -84,18 +84,18 @@ const u8g_fntpgm_uint8_t HD44780_C_5x7[2520] U8G_SECTION(".progmem.HD44780_C_5x7
168,184,5,5,5,6,0,2,184,136,184,160,184,5,5,5,
6,0,2,184,160,184,136,184,5,6,6,6,0,1,8,40,
72,248,64,32,5,5,5,6,0,0,56,112,224,136,240,0,
0,0,6,0,8,0,0,0,6,0,8,0,0,0,6,0,
8,0,0,0,6,0,8,0,0,0,6,0,8,0,0,0,
6,0,8,0,0,0,6,0,8,0,0,0,6,0,8,0,
0,0,6,0,8,0,0,0,6,0,8,0,0,0,6,0,
8,0,0,0,6,0,8,0,0,0,6,0,8,0,0,0,
6,0,8,0,0,0,6,0,8,0,0,0,6,0,8,0,
0,0,6,0,8,0,0,0,6,0,8,0,0,0,6,0,
8,0,0,0,6,0,8,0,0,0,6,0,8,0,0,0,
6,0,8,0,0,0,6,0,8,0,0,0,6,0,8,0,
0,0,6,0,8,0,0,0,6,0,8,0,0,0,6,0,
8,0,0,0,6,0,8,0,0,0,6,0,8,0,0,0,
6,0,8,0,0,0,6,0,8,0,0,0,6,0,8,5,
0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,5,
7,7,6,0,0,248,136,128,240,136,136,240,5,7,7,6,
0,0,248,136,128,128,128,128,128,5,7,7,6,0,0,80,
0,248,128,240,128,248,5,7,7,6,0,0,168,168,168,112,
@ -108,7 +108,7 @@ const u8g_fntpgm_uint8_t HD44780_C_5x7[2520] U8G_SECTION(".progmem.HD44780_C_5x7
7,7,6,0,0,136,136,136,120,8,8,8,5,7,7,6,
0,0,168,168,168,168,168,168,248,5,7,7,6,0,0,192,
64,64,112,72,72,112,5,7,7,6,0,0,136,136,136,200,
168,168,200,5,7,7,6,0,0,112,136,8,112,8,136,112,
168,168,200,5,7,7,6,0,0,112,136,8,48,8,136,112,
5,7,7,6,0,0,144,168,168,232,168,168,144,5,7,7,
6,0,0,120,136,136,120,40,72,136,5,7,7,6,0,0,
24,96,128,240,136,136,112,4,5,5,6,0,0,224,144,224,
@ -146,8 +146,8 @@ const u8g_fntpgm_uint8_t HD44780_C_5x7[2520] U8G_SECTION(".progmem.HD44780_C_5x7
128,2,2,2,6,2,2,192,192,5,8,8,6,0,255,120,
40,40,40,72,136,248,136,5,8,8,6,0,255,136,136,136,
136,136,136,248,8,5,8,8,6,0,255,168,168,168,168,168,
168,248,8,5,6,6,6,0,0,120,40,72,136,248,136,5,
7,7,6,0,0,32,32,112,168,168,112,32,5,6,6,6,
168,248,8,5,6,6,6,0,255,120,40,72,136,248,136,5,
7,7,6,0,255,32,32,112,168,168,112,32,5,6,6,6,
0,255,136,136,136,136,248,8,5,6,6,6,0,255,168,168,
168,168,248,8,2,2,2,6,2,6,64,128,3,1,1,6,
1,7,160,5,2,2,6,0,6,72,176,5,8,8,6,0,
@ -156,16 +156,16 @@ const u8g_fntpgm_uint8_t HD44780_C_5x7[2520] U8G_SECTION(".progmem.HD44780_C_5x7
32,192,5,6,6,6,0,1,32,112,112,112,248,32,5,5,
5,6,0,1,80,0,136,0,80,5,5,5,6,0,1,112,
136,136,136,112,5,7,7,6,0,0,136,144,168,88,184,8,
8,5,7,7,6,0,0,136,144,184,72,152,32,56,5,8,
8,6,0,0,192,64,192,72,216,56,8,8,5,7,7,6,
0,0,136,248,136,248,136,248,136,4,5,5,6,0,2,192,
0,48,0,96,5,8,8,6,0,0,64,160,224,168,8,40,
120,32,5,8,8,6,0,0,64,112,64,120,64,112,64,224,
5,8,8,6,0,0,64,112,64,120,64,112,64,224,5,8,
8,6,0,0,32,112,32,248,32,112,32,112,5,7,7,6,
0,0,104,0,232,0,104,16,56,5,7,7,6,0,0,112,
16,240,16,112,16,56,5,7,7,6,0,0,32,112,32,248,
32,112,32,5,7,7,6,0,0,16,144,80,48,80,144,56,
5,8,8,6,0,0,48,72,32,80,80,32,144,96,5,7,
7,6,0,0,120,168,168,120,40,40,40,5,7,7,6,0,
0,248,248,248,248,248,248,248};
8,5,7,7,6,0,0,136,144,184,72,184,8,56,5,7,
7,6,0,0,136,144,184,72,152,32,56,5,8,8,6,0,
0,192,64,192,72,216,56,8,8,5,7,7,6,0,0,136,
248,136,248,136,248,136,4,5,5,6,0,2,192,0,48,0,
96,5,8,8,6,0,0,64,160,224,168,8,40,120,32,5,
8,8,6,0,0,64,112,64,120,64,112,64,224,5,8,8,
6,0,0,32,112,32,248,32,112,32,112,5,7,7,6,0,
0,104,0,232,0,104,16,56,5,8,8,6,0,0,16,112,
16,240,16,112,16,56,5,7,7,6,0,1,32,112,32,248,
32,112,32,5,8,8,6,0,0,16,144,80,48,80,144,16,
56,5,8,8,6,0,0,48,72,32,80,80,32,144,96,5,
7,7,6,0,0,120,168,168,120,40,40,40,5,8,8,6,
0,0,248,248,248,248,248,248,248,248};

153
Marlin/dogm_font_data_ISO10646_5_Cyrillic.h

@ -10,7 +10,7 @@
Max Font ascent = 8 descent=-1
*/
#include <utility/u8g.h>
const u8g_fntpgm_uint8_t ISO10646_5_Cyrillic_5x7[2559] U8G_SECTION(".progmem.ISO10646_5_Cyrillic_5x7") = {
const u8g_fntpgm_uint8_t ISO10646_5_Cyrillic_5x7[2560] U8G_SECTION(".progmem.ISO10646_5_Cyrillic_5x7") = {
0,6,9,0,254,7,1,145,3,32,32,255,255,8,255,7,
255,0,0,0,6,0,0,1,7,7,6,2,0,128,128,128,
128,128,0,128,3,2,2,6,1,5,160,160,5,7,7,6,
@ -96,78 +96,79 @@ const u8g_fntpgm_uint8_t ISO10646_5_Cyrillic_5x7[2559] U8G_SECTION(".progmem.ISO
0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,
0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,
0,6,0,0,0,0,0,6,0,0,5,8,8,6,0,0,
64,32,0,248,128,240,128,248,5,7,7,6,0,0,80,0,
248,128,240,128,248,5,7,7,6,0,0,248,128,128,240,136,
136,240,5,8,8,6,0,0,16,32,248,136,128,128,128,128,
5,7,7,6,0,0,48,72,128,224,128,72,48,5,7,7,
6,0,0,112,136,128,112,8,136,112,3,7,7,6,1,0,
224,64,64,64,64,64,224,3,8,8,6,1,0,160,0,224,
64,64,64,64,224,5,7,7,6,0,0,56,16,16,16,16,
144,96,5,7,7,6,0,255,160,160,160,184,168,168,184,5,
7,7,6,0,255,160,160,160,248,168,168,184,4,7,7,6,
0,255,224,64,112,80,80,80,80,5,8,8,6,0,0,16,
32,136,144,160,224,144,136,5,8,8,6,0,0,64,32,136,
152,168,200,136,136,5,9,9,6,0,255,80,32,136,136,136,
80,32,32,32,5,8,8,6,0,255,136,136,136,136,136,136,
248,32,5,7,7,6,0,0,112,136,136,248,136,136,136,5,
7,7,6,0,0,224,64,64,112,72,72,112,5,7,7,6,
0,0,240,136,136,240,136,136,240,5,7,7,6,0,255,248,
136,128,128,128,128,128,5,8,8,6,0,255,120,40,40,40,
72,136,248,136,5,7,7,6,0,0,248,128,128,240,128,128,
248,5,7,7,6,0,0,168,168,168,112,168,168,168,5,7,
7,6,0,0,240,8,8,112,8,8,240,5,7,7,6,0,
0,136,136,152,168,200,136,136,5,8,8,6,0,0,80,32,
136,152,168,168,200,136,5,7,7,6,0,0,136,144,160,192,
160,144,136,5,7,7,6,0,0,120,40,40,40,40,168,72,
5,7,7,6,0,0,136,216,168,136,136,136,136,5,7,7,
6,0,0,136,136,136,248,136,136,136,5,7,7,6,0,0,
112,136,136,136,136,136,112,5,7,7,6,0,0,248,136,136,
136,136,136,136,5,7,7,6,0,0,240,136,136,240,128,128,
128,5,7,7,6,0,0,112,136,128,128,128,136,112,5,7,
7,6,0,0,248,32,32,32,32,32,32,5,7,7,6,0,
0,136,136,136,80,32,64,128,5,7,7,6,0,0,32,112,
168,168,168,112,32,5,7,7,6,0,0,136,136,80,32,80,
136,136,5,8,8,6,0,255,136,136,136,136,136,136,248,8,
5,7,7,6,0,255,136,136,136,152,104,8,8,5,7,7,
6,0,0,168,168,168,168,168,168,248,5,8,8,6,0,255,
168,168,168,168,168,168,248,8,5,7,7,6,0,0,192,64,
64,112,72,72,112,5,7,7,6,0,0,136,136,136,200,168,
168,200,5,7,7,6,0,0,128,128,240,136,136,136,240,5,
7,7,6,0,0,112,136,8,112,8,136,112,5,7,7,6,
0,0,144,168,168,232,168,168,144,5,7,7,6,0,0,120,
136,136,120,40,72,136,5,5,5,6,0,0,112,8,120,136,
120,5,7,7,6,0,0,24,96,128,240,136,136,112,4,5,
5,6,0,0,224,144,224,144,224,5,5,5,6,0,0,248,
136,128,128,128,5,6,6,6,0,0,120,40,72,136,248,136,
5,5,5,6,0,0,112,136,248,128,112,5,5,5,6,0,
0,168,168,112,168,168,5,5,5,6,0,0,240,8,48,8,
240,5,5,5,6,0,0,136,152,168,200,136,5,7,7,6,
0,0,80,32,136,152,168,200,136,4,5,5,6,0,0,144,
160,192,160,144,5,5,5,6,0,0,248,40,40,168,72,5,
5,5,6,0,0,136,216,168,136,136,5,5,5,6,0,0,
136,136,248,136,136,5,5,5,6,0,0,112,136,136,136,112,
5,5,5,6,0,0,248,136,136,136,136,5,6,6,6,0,
255,240,136,136,240,128,128,5,5,5,6,0,0,112,128,128,
136,112,5,5,5,6,0,0,248,32,32,32,32,5,6,6,
6,0,255,136,136,136,120,8,112,5,6,6,6,0,0,32,
112,168,168,112,32,5,5,5,6,0,0,136,80,32,80,136,
5,6,6,6,0,255,136,136,136,136,248,8,5,5,5,6,
0,0,136,136,248,8,8,5,5,5,6,0,0,168,168,168,
168,248,5,6,6,6,0,255,168,168,168,168,248,8,5,5,
5,6,0,0,192,64,112,72,112,5,5,5,6,0,0,136,
136,200,168,200,3,5,5,6,1,0,128,128,192,160,192,5,
5,5,6,0,0,112,136,56,136,112,5,5,5,6,0,0,
144,168,232,168,144,5,5,5,6,0,0,120,136,120,40,72,
5,8,8,6,0,0,64,32,0,112,136,248,128,112,5,7,
7,6,0,0,80,0,112,136,248,128,112,5,9,9,6,0,
255,64,224,64,64,120,72,72,72,16,5,8,8,6,0,0,
16,32,0,248,136,128,128,128,5,5,5,6,0,0,112,136,
96,136,112,5,5,5,6,0,0,112,128,112,8,240,1,7,
7,6,2,0,128,0,128,128,128,128,128,3,7,7,6,1,
0,160,0,64,64,64,64,64,3,8,8,6,1,255,32,0,
32,32,32,32,160,64,5,5,5,6,0,0,160,160,184,168,
184,5,5,5,6,0,0,160,160,248,168,184,5,6,6,6,
0,0,64,224,64,120,72,72,4,8,8,6,0,0,16,32,
0,144,160,192,160,144,5,8,8,6,0,0,64,32,0,136,
152,168,200,136,5,9,9,6,0,255,80,32,0,136,136,136,
120,8,112,5,6,6,6,0,255,136,136,136,136,248,32};
64,248,128,128,240,128,128,248,5,8,8,6,0,0,80,248,
128,128,240,128,128,248,5,7,7,6,0,0,224,64,64,112,
72,72,112,5,8,8,6,0,0,16,32,248,136,128,128,128,
128,5,7,7,6,0,0,48,72,128,224,128,72,48,5,7,
7,6,0,0,112,136,128,112,8,136,112,3,7,7,6,1,
0,224,64,64,64,64,64,224,3,8,8,6,1,0,160,0,
224,64,64,64,64,224,5,7,7,6,0,0,56,16,16,16,
16,144,96,5,7,7,6,0,0,160,160,160,184,168,168,184,
5,7,7,6,0,0,160,160,160,248,168,168,184,4,7,7,
6,0,0,224,64,112,80,80,80,80,5,8,8,6,0,0,
16,32,136,144,160,224,144,136,5,8,8,6,0,0,64,32,
136,152,168,200,136,136,5,9,9,6,0,255,80,32,136,136,
136,80,32,32,32,5,8,8,6,0,255,136,136,136,136,136,
136,248,32,5,7,7,6,0,0,112,136,136,248,136,136,136,
5,7,7,6,0,0,248,128,128,240,136,136,240,5,7,7,
6,0,0,240,136,136,240,136,136,240,5,7,7,6,0,0,
248,136,128,128,128,128,128,5,8,8,6,0,255,120,40,40,
40,72,136,248,136,5,7,7,6,0,0,248,128,128,240,128,
128,248,5,7,7,6,0,0,168,168,168,112,168,168,168,5,
7,7,6,0,0,240,8,8,112,8,8,240,5,7,7,6,
0,0,136,136,152,168,200,136,136,5,8,8,6,0,0,80,
32,136,152,168,168,200,136,5,7,7,6,0,0,136,144,160,
192,160,144,136,5,7,7,6,0,0,120,40,40,40,40,168,
72,5,7,7,6,0,0,136,216,168,136,136,136,136,5,7,
7,6,0,0,136,136,136,248,136,136,136,5,7,7,6,0,
0,112,136,136,136,136,136,112,5,7,7,6,0,0,248,136,
136,136,136,136,136,5,7,7,6,0,0,240,136,136,240,128,
128,128,5,7,7,6,0,0,112,136,128,128,128,136,112,5,
7,7,6,0,0,248,32,32,32,32,32,32,5,7,7,6,
0,0,136,136,136,80,32,64,128,5,7,7,6,0,0,32,
112,168,168,168,112,32,5,7,7,6,0,0,136,136,80,32,
80,136,136,5,8,8,6,0,255,136,136,136,136,136,136,248,
8,5,7,7,6,0,0,136,136,136,152,104,8,8,5,7,
7,6,0,0,168,168,168,168,168,168,248,5,8,8,6,0,
255,168,168,168,168,168,168,248,8,5,7,7,6,0,0,192,
64,64,112,72,72,112,5,7,7,6,0,0,136,136,136,200,
168,168,200,5,7,7,6,0,0,128,128,128,240,136,136,240,
5,7,7,6,0,0,112,136,8,48,8,136,112,5,7,7,
6,0,0,144,168,168,232,168,168,144,5,7,7,6,0,0,
120,136,136,120,40,72,136,5,5,5,6,0,0,112,8,120,
136,120,5,7,7,6,0,0,24,96,128,240,136,136,112,4,
5,5,6,0,0,224,144,224,144,224,5,5,5,6,0,0,
248,136,128,128,128,5,6,6,6,0,0,120,40,72,136,248,
136,5,5,5,6,0,0,112,136,248,128,112,5,5,5,6,
0,0,168,168,112,168,168,5,5,5,6,0,0,240,8,48,
8,240,5,5,5,6,0,0,136,152,168,200,136,5,7,7,
6,0,0,80,32,136,152,168,200,136,4,5,5,6,0,0,
144,160,192,160,144,5,5,5,6,0,0,248,40,40,168,72,
5,5,5,6,0,0,136,216,168,136,136,5,5,5,6,0,
0,136,136,248,136,136,5,5,5,6,0,0,112,136,136,136,
112,5,5,5,6,0,0,248,136,136,136,136,5,6,6,6,
0,255,240,136,136,240,128,128,5,5,5,6,0,0,112,128,
128,136,112,5,5,5,6,0,0,248,32,32,32,32,5,6,
6,6,0,255,136,136,136,120,8,112,5,6,6,6,0,0,
32,112,168,168,112,32,5,5,5,6,0,0,136,80,32,80,
136,5,6,6,6,0,255,136,136,136,136,248,8,5,5,5,
6,0,0,136,136,248,8,8,5,5,5,6,0,0,168,168,
168,168,248,5,6,6,6,0,255,168,168,168,168,248,8,5,
5,5,6,0,0,192,64,112,72,112,5,5,5,6,0,0,
136,136,200,168,200,3,5,5,6,1,0,128,128,192,160,192,
5,5,5,6,0,0,112,136,56,136,112,5,5,5,6,0,
0,144,168,232,168,144,5,5,5,6,0,0,120,136,120,40,
72,5,8,8,6,0,0,64,32,0,112,136,248,128,112,5,
7,7,6,0,0,80,0,112,136,248,128,112,5,9,9,6,
0,255,64,224,64,64,120,72,72,72,16,5,8,8,6,0,
0,16,32,0,248,136,128,128,128,5,5,5,6,0,0,112,
136,96,136,112,5,5,5,6,0,0,112,128,112,8,240,1,
7,7,6,2,0,128,0,128,128,128,128,128,3,7,7,6,
1,0,160,0,64,64,64,64,64,3,8,8,6,1,255,32,
0,32,32,32,32,160,64,5,5,5,6,0,0,160,160,184,
168,184,5,5,5,6,0,0,160,160,248,168,184,5,6,6,
6,0,0,64,224,64,120,72,72,4,8,8,6,0,0,16,
32,0,144,160,192,160,144,5,8,8,6,0,0,64,32,0,
136,152,168,200,136,5,9,9,6,0,255,80,32,0,136,136,
136,120,8,112,5,6,6,6,0,255,136,136,136,136,248,32
};

4
Marlin/language_test.h

@ -65,11 +65,11 @@
#define STRG_C3_a "àáâãäåæçèéêëìíîï"
#define STRG_C3_b "ðñòóôõö÷øùúûüýþÿ"
#define STRG_D0_8 "ЈЁЂЃЄЅІЇЈЉЊЋЌЍЎЏ"
#define STRG_D0_8 "ЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏ"
#define STRG_D0_9 "АБВГДЕЖЗИЙКЛМНОП"
#define STRG_D0_a "РСТУФХЦЧШЩЪЫЬЭЮЯ"
#define STRG_D0_b "абвгдежзийклмноп"
#define STRG_D1_8 "шстуфхцчшщъыьэюя"
#define STRG_D1_8 "рстуфхцчшщъыьэюя"
#define STRG_D1_9 "ѐёђѓєѕіїјљњћќѝўџ"
#define STRG_D1_a "ѠѡѢѣѤѥѦѧѨѩѪѫѬѭѮѯ"
#define STRG_D1_b "ѰѱѲѳѴѵѶѷѸѹѺѻѼѽѾѿ"

BIN
Marlin/scripts/Fonts/HD44780_C.fon

Binary file not shown.

BIN
Marlin/scripts/Fonts/ISO10646-5_Cyrillic.fon

Binary file not shown.
Loading…
Cancel
Save