diff --git a/UI/UI_global.h b/UI/UI_global.h index 40ec976..0b071b5 100644 --- a/UI/UI_global.h +++ b/UI/UI_global.h @@ -58,7 +58,8 @@ void CallUI_RestoreSelect(void); (sz) == 9 ? 8 : \ (sz) == 11 ? 7 : \ (sz) == 12 ? 8 : \ - (sz) == 13 || (sz) == 15 || (sz) == 16 ? 11 : ((sz) / 2 + 1)) + (sz) == 13 || (sz) == 15 ? 11 : \ + (sz) == 16 ? 13 : ((sz) / 2 + 1)) /* 移调卡文字（主值加宽+下移 KEY，防 Cb/101 底/右裁切） */ #define UI0902_CARD_TEXT_CX_L (UI0902_MARGIN_X + UI0902_CARD_W / 2) /* 64 */ @@ -72,13 +73,13 @@ void CallUI_RestoreSelect(void); #define UI0902_CARD_VALUE_SIZE UI0902_FONT_HERO /* 16 */ #define UI0902_CARD_VALUE_LH 16 -#define UI0902_CARD_VALUE_W 36 /* 3×11 字距步进 */ +#define UI0902_CARD_VALUE_W 42 /* 3×13：101/Cb 完整 */ #define UI0902_CARD_VALUE_H 17 #define UI0902_CARD_VALUE_Y 69 #define UI0902_CARD_SUB_SIZE UI0902_FONT_SUB /* 9 */ #define UI0902_CARD_SUB_LH 9 -#define UI0902_CARD_SUB_W 28 +#define UI0902_CARD_SUB_W 32 #define UI0902_CARD_SUB_H 9 #define UI0902_CARD_SUB_Y 91 diff --git a/device/LCD_ILI9341/Drv_ILI9341_Lcd_App.c b/device/LCD_ILI9341/Drv_ILI9341_Lcd_App.c index c6ad1b7..6341fce 100644 --- a/device/LCD_ILI9341/Drv_ILI9341_Lcd_App.c +++ b/device/LCD_ILI9341/Drv_ILI9341_Lcd_App.c @@ -101,7 +101,7 @@ static uint8_t LCD_GetAsciiMetrics(uint8_t size, uint8_t *char_width, uint8_t *c case 12: *char_width = 7; return 1; case 13: *char_width = 8; return 1; case 15: *char_width = 8; return 1; - case 16: *char_width = 8; return 1; + case 16: *char_width = 10; return 1; case 24: *char_width = 12; return 1; case 28: *char_width = 14; return 1; default: return 0; diff --git a/device/LCD_ILI9341/Drv_ILI9341_Lcd_EnglishFont.h b/device/LCD_ILI9341/Drv_ILI9341_Lcd_EnglishFont.h index af6c9e0..fb236ff 100644 --- a/device/LCD_ILI9341/Drv_ILI9341_Lcd_EnglishFont.h +++ b/device/LCD_ILI9341/Drv_ILI9341_Lcd_EnglishFont.h @@ -103,102 +103,102 @@ const unsigned char ascii_1306[][13]={ -const unsigned char ascii_1608[][16]={ -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*" ",0*/ -{0x00,0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x00,0x08,0x08,0x00,0x00,0x00},/*"!",1*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x24,0x24,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*""",2*/ -{0x00,0x00,0x00,0x00,0x08,0x08,0x7E,0x24,0x7E,0x10,0x10,0x00,0x00,0x00,0x00,0x00},/*"#",3*/ -{0x00,0x00,0x00,0x3C,0x46,0x02,0x04,0x18,0x20,0x40,0x42,0x3C,0x00,0x00,0x00,0x00},/*"$",4*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x2E,0x50,0x54,0x00,0x00,0x00,0x00,0x00,0x00},/*"%",5*/ -{0x00,0x00,0x00,0x00,0x18,0x24,0x14,0x08,0x22,0x32,0x4C,0x00,0x00,0x00,0x00,0x00},/*"&",6*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x08,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"'",7*/ -{0x00,0x10,0x08,0x00,0x00,0x04,0x04,0x04,0x04,0x04,0x04,0x00,0x00,0x08,0x10,0x00},/*"(",8*/ -{0x00,0x04,0x00,0x08,0x08,0x10,0x10,0x10,0x10,0x10,0x10,0x08,0x08,0x00,0x04,0x00},/*")",9*/ -{0x00,0x00,0x00,0x00,0x00,0x08,0x08,0x3E,0x08,0x14,0x22,0x00,0x00,0x00,0x00,0x00},/*"*",10*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"+",11*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x08,0x00,0x00,0x00,0x00,0x00,0x00},/*",",12*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"-",13*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*".",14*/ -{0x00,0x00,0x20,0x20,0x10,0x10,0x10,0x10,0x08,0x08,0x08,0x08,0x04,0x04,0x00,0x00},/*"/",15*/ -{0x00,0x00,0x00,0x18,0x24,0x42,0x42,0x42,0x42,0x42,0x24,0x18,0x00,0x00,0x00,0x00},/*"0",16*/ -{0x00,0x00,0x00,0x08,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0x00},/*"1",17*/ -{0x00,0x00,0x00,0x1C,0x22,0x40,0x40,0x20,0x10,0x08,0x02,0x7E,0x00,0x00,0x00,0x00},/*"2",18*/ -{0x00,0x00,0x00,0x1C,0x22,0x40,0x20,0x10,0x20,0x40,0x22,0x1C,0x00,0x00,0x00,0x00},/*"3",19*/ -{0x00,0x00,0x00,0x00,0x20,0x28,0x24,0x24,0x22,0x7E,0x20,0x20,0x00,0x00,0x00,0x00},/*"4",20*/ -{0x00,0x00,0x00,0x7E,0x02,0x02,0x1A,0x26,0x40,0x40,0x22,0x1C,0x00,0x00,0x00,0x00},/*"5",21*/ -{0x00,0x00,0x00,0x38,0x44,0x02,0x1A,0x26,0x42,0x42,0x24,0x18,0x00,0x00,0x00,0x00},/*"6",22*/ -{0x00,0x00,0x00,0x7E,0x40,0x10,0x10,0x00,0x00,0x00,0x08,0x08,0x00,0x00,0x00,0x00},/*"7",23*/ -{0x00,0x00,0x00,0x18,0x24,0x42,0x24,0x18,0x24,0x42,0x24,0x18,0x00,0x00,0x00,0x00},/*"8",24*/ -{0x00,0x00,0x00,0x18,0x24,0x42,0x42,0x64,0x58,0x40,0x22,0x1C,0x00,0x00,0x00,0x00},/*"9",25*/ -{0x00,0x00,0x00,0x08,0x08,0x00,0x00,0x00,0x00,0x00,0x08,0x08,0x00,0x00,0x00,0x00},/*":",26*/ -{0x00,0x00,0x10,0x10,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x08,0x00,0x00,0x00},/*";",27*/ -{0x00,0x00,0x00,0x00,0x00,0x40,0x30,0x0C,0x0E,0x30,0x40,0x00,0x00,0x00,0x00,0x00},/*"<",28*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00},/*"=",29*/ -{0x00,0x00,0x00,0x00,0x00,0x02,0x0C,0x30,0x30,0x0C,0x02,0x00,0x00,0x00,0x00,0x00},/*">",30*/ -{0x00,0x00,0x00,0x18,0x24,0x40,0x40,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"?",31*/ -{0x00,0x00,0x00,0x00,0x00,0x04,0x72,0x00,0x14,0x2A,0x24,0x00,0x00,0x00,0x00,0x00},/*"@",32*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x24,0x00,0x42,0x00,0x00,0x00,0x00,0x00},/*"A",33*/ -{0x00,0x00,0x00,0x00,0x3E,0x42,0x42,0x3E,0x42,0x42,0x3E,0x00,0x00,0x00,0x00,0x00},/*"B",34*/ -{0x00,0x00,0x00,0x00,0x00,0x38,0x40,0x02,0x02,0x40,0x38,0x00,0x00,0x00,0x00,0x00},/*"C",35*/ -{0x00,0x00,0x00,0x00,0x00,0x1E,0x02,0x42,0x42,0x02,0x1E,0x00,0x00,0x00,0x00,0x00},/*"D",36*/ -{0x00,0x00,0x00,0x00,0x7E,0x02,0x02,0x3E,0x02,0x02,0x7E,0x00,0x00,0x00,0x00,0x00},/*"E",37*/ -{0x00,0x00,0x00,0x00,0x7E,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00},/*"F",38*/ -{0x00,0x00,0x00,0x00,0x00,0x38,0x40,0x02,0x62,0x40,0x38,0x00,0x00,0x00,0x00,0x00},/*"G",39*/ -{0x00,0x00,0x00,0x00,0x42,0x42,0x42,0x7E,0x42,0x42,0x42,0x00,0x00,0x00,0x00,0x00},/*"H",40*/ -{0x00,0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x00,0x00,0x00},/*"I",41*/ -{0x00,0x00,0x70,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x42,0x42,0x3C,0x00,0x00,0x00},/*"J",42*/ -{0x00,0x00,0x00,0x00,0x00,0x22,0x12,0x02,0x12,0x22,0x42,0x00,0x00,0x00,0x00,0x00},/*"K",43*/ -{0x00,0x00,0x00,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x7E,0x00,0x00,0x00,0x00},/*"L",44*/ -{0x00,0x00,0x00,0x00,0x00,0x42,0x42,0x66,0x42,0x5A,0x42,0x00,0x00,0x00,0x00,0x00},/*"M",45*/ -{0x00,0x00,0x00,0x00,0x42,0x46,0x4A,0x42,0x52,0x62,0x42,0x00,0x00,0x00,0x00,0x00},/*"N",46*/ -{0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x42,0x42,0x00,0x18,0x00,0x00,0x00,0x00,0x00},/*"O",47*/ -{0x00,0x00,0x00,0x00,0x3E,0x42,0x42,0x3E,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00},/*"P",48*/ -{0x00,0x00,0x00,0x00,0x18,0x00,0x42,0x42,0x42,0x24,0x10,0x20,0x00,0x00,0x00,0x00},/*"Q",49*/ -{0x00,0x00,0x00,0x00,0x3E,0x42,0x42,0x3E,0x12,0x22,0x42,0x00,0x00,0x00,0x00,0x00},/*"R",50*/ -{0x00,0x00,0x00,0x00,0x3C,0x42,0x02,0x38,0x40,0x42,0x3C,0x00,0x00,0x00,0x00,0x00},/*"S",51*/ -{0x00,0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"T",52*/ -{0x00,0x00,0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x42,0x3C,0x00,0x00,0x00,0x00,0x00},/*"U",53*/ -{0x00,0x00,0x00,0x00,0x00,0x42,0x00,0x24,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00},/*"V",54*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x00,0x24,0x00,0x00,0x00,0x00,0x00,0x00},/*"W",55*/ -{0x00,0x00,0x00,0x00,0x00,0x42,0x24,0x18,0x18,0x24,0x42,0x00,0x00,0x00,0x00,0x00},/*"X",56*/ -{0x00,0x00,0x00,0x00,0x42,0x24,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"Y",57*/ -{0x00,0x00,0x00,0x7E,0x40,0x10,0x10,0x00,0x08,0x08,0x02,0x7E,0x00,0x00,0x00,0x00},/*"Z",58*/ -{0x00,0x18,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x18,0x00},/*"[",59*/ -{0x00,0x00,0x04,0x04,0x08,0x08,0x08,0x08,0x10,0x10,0x10,0x10,0x20,0x20,0x00,0x00},/*"\",60*/ -{0x00,0x18,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x18,0x00},/*"]",61*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x24,0x24,0x42,0x00,0x00,0x00,0x00,0x00,0x00},/*"^",62*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"_",63*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x08,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"`",64*/ -{0x00,0x00,0x00,0x00,0x00,0x3C,0x00,0x00,0x02,0x02,0x5C,0x00,0x00,0x00,0x00,0x00},/*"a",65*/ -{0x00,0x00,0x7C,0x6C,0x4C,0x6C,0x7C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x00},/*"b",66*/ -{0x00,0x00,0x00,0x38,0x44,0x02,0x02,0x02,0x02,0x02,0x44,0x38,0x00,0x00,0x00,0x00},/*"c",67*/ -{0x00,0x00,0x00,0x40,0x40,0x58,0x64,0x42,0x42,0x42,0x42,0x64,0x58,0x00,0x00,0x00},/*"d",68*/ -{0x00,0x00,0x00,0x00,0x18,0x24,0x42,0x7E,0x02,0x44,0x38,0x00,0x00,0x00,0x00,0x00},/*"e",69*/ -{0x00,0x00,0x30,0x08,0x08,0x3C,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x00,0x00},/*"f",70*/ -{0x00,0x00,0x00,0x58,0x64,0x42,0x42,0x42,0x42,0x64,0x40,0x22,0x1C,0x00,0x00,0x00},/*"g",71*/ -{0x00,0x00,0x02,0x02,0x02,0x3A,0x46,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x00,0x00},/*"h",72*/ -{0x00,0x00,0x08,0x00,0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x00,0x00},/*"i",73*/ -{0x00,0x08,0x00,0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x00,0x00},/*"j",74*/ -{0x00,0x00,0x00,0x02,0x02,0x22,0x12,0x02,0x0A,0x0E,0x12,0x22,0x42,0x00,0x00,0x00},/*"k",75*/ -{0x00,0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x00,0x00},/*"l",76*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x52,0x42,0x42,0x42,0x00,0x00,0x00,0x00,0x00,0x00},/*"m",77*/ -{0x00,0x00,0x00,0x3A,0x46,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x00,0x00,0x00,0x00},/*"n",78*/ -{0x00,0x00,0x00,0x00,0x18,0x24,0x42,0x42,0x42,0x24,0x18,0x00,0x00,0x00,0x00,0x00},/*"o",79*/ -{0x00,0x00,0x00,0x1A,0x26,0x42,0x42,0x42,0x42,0x26,0x02,0x02,0x02,0x00,0x00,0x00},/*"p",80*/ -{0x00,0x00,0x00,0x58,0x64,0x42,0x42,0x42,0x42,0x64,0x40,0x40,0x40,0x00,0x00,0x00},/*"q",81*/ -{0x00,0x00,0x00,0x34,0x0C,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x00,0x00,0x00,0x00},/*"r",82*/ -{0x00,0x00,0x00,0x3C,0x42,0x02,0x02,0x3C,0x40,0x40,0x42,0x3C,0x00,0x00,0x00,0x00},/*"s",83*/ -{0x00,0x00,0x08,0x08,0x3C,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x30,0x00,0x00,0x00},/*"t",84*/ -{0x00,0x00,0x00,0x42,0x42,0x42,0x42,0x42,0x42,0x42,0x62,0x5C,0x00,0x00,0x00,0x00},/*"u",85*/ -{0x00,0x00,0x00,0x00,0x42,0x42,0x24,0x24,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00},/*"v",86*/ -{0x00,0x00,0x00,0x00,0x00,0x42,0x5A,0x18,0x18,0x18,0x24,0x00,0x00,0x00,0x00,0x00},/*"w",87*/ -{0x00,0x00,0x00,0x00,0x42,0x24,0x18,0x00,0x18,0x24,0x42,0x00,0x00,0x00,0x00,0x00},/*"x",88*/ -{0x00,0x00,0x00,0x42,0x42,0x24,0x24,0x18,0x18,0x00,0x00,0x08,0x06,0x00,0x00,0x00},/*"y",89*/ -{0x00,0x00,0x00,0x00,0x7E,0x40,0x10,0x00,0x08,0x02,0x7E,0x00,0x00,0x00,0x00,0x00},/*"z",90*/ -{0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x30,0x00},/*"{",91*/ -{0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x00},/*"|",92*/ -{0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x0C,0x00},/*"}",93*/ -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"~",94*/ +const unsigned char ascii_1608[][32]={ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*" ",0*/ +{0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"!",1*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x48,0x00,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*""",2*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x90,0x00,0x90,0x00,0xFE,0x01,0x48,0x00,0x48,0x00,0x48,0x00,0xFE,0x01,0x24,0x00,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"#",3*/ +{0x00,0x00,0x10,0x00,0x7C,0x00,0x96,0x00,0x12,0x00,0x12,0x00,0x14,0x00,0x38,0x00,0x50,0x00,0x90,0x00,0x90,0x00,0x92,0x00,0x7C,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*"$",4*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8C,0x00,0x42,0x00,0x02,0x00,0xDC,0x00,0x00,0x01,0x08,0x01,0xC4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"%",5*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x48,0x00,0x28,0x00,0x08,0x00,0x94,0x00,0x82,0x00,0x42,0x00,0x62,0x00,0x9C,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"&",6*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"'",7*/ +{0x00,0x00,0x20,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x20,0x00,0x00,0x00},/*"(",8*/ +{0x00,0x00,0x08,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x08,0x00,0x00,0x00},/*")",9*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x7C,0x00,0x10,0x00,0x28,0x00,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"*",10*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0xFE,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"+",11*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*",",12*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"-",13*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*".",14*/ +{0x00,0x00,0x00,0x00,0x40,0x00,0x40,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00},/*"/",15*/ +{0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"0",16*/ +{0x00,0x00,0x00,0x00,0x18,0x00,0x14,0x00,0x12,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"1",17*/ +{0x00,0x00,0x00,0x00,0x3C,0x00,0x42,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x18,0x00,0x04,0x00,0x02,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"2",18*/ +{0x00,0x00,0x00,0x00,0x3C,0x00,0x42,0x00,0x80,0x00,0x80,0x00,0x40,0x00,0x30,0x00,0x40,0x00,0x80,0x00,0x80,0x00,0x42,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"3",19*/ +{0x00,0x00,0x00,0x00,0x40,0x00,0x60,0x00,0x50,0x00,0x48,0x00,0x48,0x00,0x44,0x00,0x42,0x00,0xFE,0x01,0x40,0x00,0x40,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"4",20*/ +{0x00,0x00,0x00,0x00,0xFE,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x3A,0x00,0x46,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x42,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"5",21*/ +{0x00,0x00,0x00,0x00,0x78,0x00,0x84,0x00,0x02,0x00,0x02,0x00,0x3A,0x00,0x46,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"6",22*/ +{0x00,0x00,0x00,0x00,0xFE,0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"7",23*/ +{0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"8",24*/ +{0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0xC4,0x00,0xB8,0x00,0x80,0x00,0x80,0x00,0x42,0x00,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"9",25*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*":",26*/ +{0x00,0x00,0x00,0x00,0x20,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*";",27*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x70,0x00,0x0C,0x00,0x02,0x00,0x0E,0x00,0x70,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"<",28*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"=",29*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x1C,0x00,0x60,0x00,0x80,0x00,0x60,0x00,0x1C,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*">",30*/ +{0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x80,0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"?",31*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x04,0x00,0x40,0x01,0x42,0x01,0x42,0x01,0x62,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"@",32*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x30,0x00,0x48,0x00,0x84,0x00,0xFC,0x00,0x00,0x00,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"A",33*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x02,0x01,0x02,0x01,0x02,0x01,0xFE,0x00,0x02,0x01,0x02,0x01,0x02,0x01,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"B",34*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x04,0x01,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x04,0x01,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"C",35*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x82,0x00,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x82,0x00,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"D",36*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x01,0x02,0x00,0x02,0x00,0x02,0x00,0xFE,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0xFE,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"E",37*/ +{0x00,0x00,0x00,0x00,0xFE,0x01,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0xFE,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"F",38*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x04,0x01,0x02,0x00,0x02,0x00,0xC2,0x01,0x02,0x01,0x04,0x01,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"G",39*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0xFE,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"H",40*/ +{0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"I",41*/ +{0x00,0x00,0x00,0x00,0xE0,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x84,0x00,0x84,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"J",42*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x22,0x00,0x12,0x00,0x0A,0x00,0x22,0x00,0x42,0x00,0x02,0x00,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"K",43*/ +{0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"L",44*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x02,0x01,0x86,0x01,0x86,0x01,0x4A,0x01,0x32,0x01,0x32,0x01,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"M",45*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x06,0x01,0x12,0x01,0x12,0x01,0x02,0x01,0x22,0x01,0x22,0x01,0x82,0x01,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"N",46*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x84,0x00,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x84,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"O",47*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x7E,0x00,0x82,0x01,0x02,0x01,0x02,0x01,0xFE,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"P",48*/ +{0x00,0x00,0x00,0x00,0x78,0x00,0x84,0x00,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x84,0x00,0x84,0x00,0x78,0x00,0x40,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"Q",49*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x02,0x01,0x02,0x01,0x02,0x01,0xFE,0x00,0x02,0x00,0x22,0x00,0x82,0x00,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"R",50*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x84,0x00,0x02,0x00,0x0C,0x00,0x70,0x00,0x80,0x00,0x00,0x01,0x84,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"S",51*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"T",52*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x84,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"U",53*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x00,0x00,0x84,0x00,0x84,0x00,0x48,0x00,0x30,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"V",54*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x30,0x00,0x00,0x00,0xCC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"W",55*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x84,0x00,0x48,0x00,0x30,0x00,0x30,0x00,0x48,0x00,0x84,0x00,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"X",56*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x84,0x00,0x48,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"Y",57*/ +{0x00,0x00,0x00,0x00,0xFE,0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x20,0x00,0x10,0x00,0x08,0x00,0x08,0x00,0x04,0x00,0x02,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"Z",58*/ +{0x00,0x00,0x30,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x30,0x00,0x00,0x00},/*"[",59*/ +{0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x40,0x00,0x40,0x00,0x00,0x00,0x00,0x00},/*"\",60*/ +{0x00,0x00,0x30,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x30,0x00,0x00,0x00},/*"]",61*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x28,0x00,0x28,0x00,0x44,0x00,0x44,0x00,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"^",62*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"_",63*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x10,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"`",64*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0xC2,0x00,0x80,0x00,0x80,0x00,0xFC,0x00,0x82,0x00,0x82,0x00,0xC2,0x00,0x3C,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"a",65*/ +{0x00,0x00,0x00,0x00,0xF8,0x01,0x98,0x01,0x18,0x01,0x98,0x01,0xF8,0x01,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x00,0x00,0x00,0x00},/*"b",66*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x88,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x88,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"c",67*/ +{0x00,0x00,0x00,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0xB8,0x00,0xC4,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0xC4,0x00,0xB8,0x00,0x00,0x00,0x00,0x00},/*"d",68*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0xFE,0x00,0x02,0x00,0x02,0x00,0x84,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"e",69*/ +{0x00,0x00,0x00,0x00,0x60,0x00,0x10,0x00,0x10,0x00,0x78,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*"f",70*/ +{0x00,0x00,0x00,0x00,0xB8,0x00,0xC4,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0xC4,0x00,0xB8,0x00,0x80,0x00,0x42,0x00,0x3C,0x00,0x00,0x00,0x00,0x00},/*"g",71*/ +{0x00,0x00,0x00,0x00,0x04,0x00,0x04,0x00,0x04,0x00,0x74,0x00,0x8C,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x00,0x00,0x00,0x00},/*"h",72*/ +{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*"i",73*/ +{0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*"j",74*/ +{0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x42,0x00,0x22,0x00,0x12,0x00,0x0A,0x00,0x0E,0x00,0x12,0x00,0x22,0x00,0x42,0x00,0x82,0x00,0x00,0x00,0x00,0x00},/*"k",75*/ +{0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00},/*"l",76*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xDE,0x00,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"m",77*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x00,0x8C,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"n",78*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x44,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"o",79*/ +{0x00,0x00,0x00,0x00,0x3A,0x00,0x46,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x46,0x00,0x3A,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00},/*"p",80*/ +{0x00,0x00,0x00,0x00,0xB8,0x00,0xC4,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0xC4,0x00,0xB8,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x00,0x00,0x00,0x00},/*"q",81*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x68,0x00,0x18,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"r",82*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x84,0x00,0x04,0x00,0x04,0x00,0x78,0x00,0x80,0x00,0x80,0x00,0x84,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"s",83*/ +{0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x78,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"t",84*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0xC4,0x00,0xB8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"u",85*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x44,0x00,0x44,0x00,0x28,0x00,0x28,0x00,0x28,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"v",86*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01,0x02,0x01,0x32,0x01,0xB4,0x00,0xB4,0x00,0xB4,0x00,0x48,0x00,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"w",87*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x82,0x00,0x44,0x00,0x44,0x00,0x28,0x00,0x10,0x00,0x28,0x00,0x4C,0x00,0x44,0x00,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"x",88*/ +{0x00,0x00,0x00,0x00,0x82,0x00,0x82,0x00,0x44,0x00,0x44,0x00,0x44,0x00,0x28,0x00,0x28,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x08,0x00,0x06,0x00,0x00,0x00,0x00,0x00},/*"y",89*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x10,0x00,0x08,0x00,0x04,0x00,0x02,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"z",90*/ +{0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00},/*"{",91*/ +{0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x00,0x00},/*"|",92*/ +{0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00},/*"}",93*/ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x92,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"~",94*/ }; const unsigned char ascii_2412[][48]={ diff --git a/tools/gen_wqy_font.py b/tools/gen_wqy_font.py index 5336f2f..d4e0c55 100644 --- a/tools/gen_wqy_font.py +++ b/tools/gen_wqy_font.py @@ -123,9 +123,9 @@ def load_bdf(name: str) -> dict: def ascii_cell_width(size: int) -> int: - """Must match Drv LCD_GetAsciiMetrics / UI0902_ASCII_W.""" + """Must match Drv LCD_GetAsciiMetrics / UI0902_ASCII_W glyph width.""" return { - 8: 5, 9: 7, 11: 6, 12: 7, 13: 8, 15: 8, 16: 8, 24: 12, 28: 14, + 8: 5, 9: 7, 11: 6, 12: 7, 13: 8, 15: 8, 16: 10, 24: 12, 28: 14, }.get(size, max(3, size // 2))