Kaynağa Gözat

继续修改ui的bug

guohui 1 yıl önce
ebeveyn
işleme
95ac7bfa89
5 değiştirilmiş dosya ile 372 ekleme ve 367 silme
  1. 5 10
      pro/config/cfg.h
  2. 279 279
      pro/ui/font.c
  3. 84 74
      pro/ui/menu.c
  4. 3 3
      pro/ui/timer.c
  5. 1 1
      pro/ui/ui.c

+ 5 - 10
pro/config/cfg.h

@@ -20,11 +20,11 @@
 //#define PRJ_ANDERSON_AC_I3_O3
 //#define PRJ_ANDERSON_AC_I3_O3
 //#define PRJ_HYPERTEC_AC_I3_O1
 //#define PRJ_HYPERTEC_AC_I3_O1
 //#define PRJ_SG_I3_O3
 //#define PRJ_SG_I3_O3
-//#define PRJ_TEST
+#define PRJ_TEST
 //#define PRJ_TEST_AC_I1_O1
 //#define PRJ_TEST_AC_I1_O1
 //#define PRJ_TEST_AC_I3_O1
 //#define PRJ_TEST_AC_I3_O1
 //#define PRJ_IP_AC_I3_O3
 //#define PRJ_IP_AC_I3_O3
-#define PRJ_INST2302_DC_OLED
+//#define PRJ_INST2302_DC_OLED
 
 
 
 
 //#define USE_BOARD_UPGRADE
 //#define USE_BOARD_UPGRADE
@@ -177,6 +177,9 @@
 
 
     #define PROD_POWER_TYPE                     5
     #define PROD_POWER_TYPE                     5
 
 
+    #define USE_UI
+    #define USE_SCREEN_LED
+    //#define USE_SCREEN_LCD
 #elif defined PRJ_TEST_AC_I1_O1
 #elif defined PRJ_TEST_AC_I1_O1
     #define LANGUAGE                            0           //chinese
     #define LANGUAGE                            0           //chinese
     #define SMPLE_TIME                          30          //ms
     #define SMPLE_TIME                          30          //ms
@@ -219,14 +222,6 @@
     #define CHANNEL_DELAY                       8
     #define CHANNEL_DELAY                       8
 
 
     #define PROD_POWER_TYPE                     1
     #define PROD_POWER_TYPE                     1
-
-    #define USE_UI
-    #define USE_SCREEN_LED
-    //#define USE_SCREEN_LCD
-
-    //#define MENU_SLIDER
-    //#define CHANNEL_SLIDER
-
 #else
 #else
     #error define a PRJ_XXXX please!
     #error define a PRJ_XXXX please!
 #endif
 #endif

+ 279 - 279
pro/ui/font.c

@@ -104,296 +104,296 @@ static const uint8_t font_en_0806[95][6] =
 static const uint8_t font_en_1206[95][12] =
 static const uint8_t font_en_1206[95][12] =
 {
 {
 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*" ",0*/
 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*" ",0*/
-{0x00,0x00,0x00,0x00,0x7F,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"!",1*/
-{0x00,0x00,0x07,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x00,0x00},/*""",2*/
-{0xE0,0x01,0x38,0x00,0xEF,0x01,0x38,0x00,0x2F,0x00,0x08,0x00},/*"#",3*/
-{0x0E,0x01,0x19,0x01,0xFF,0x03,0x31,0x01,0xE1,0x00,0x00,0x00},/*"$",4*/
-{0x0F,0x01,0xC9,0x00,0x3F,0x00,0xF8,0x01,0x26,0x01,0xE1,0x01},/*"%",5*/
-{0xE0,0x00,0x9F,0x01,0x39,0x01,0x47,0x01,0x80,0x01,0x70,0x01},/*"&",6*/
-{0x00,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"'",7*/
-{0x00,0x00,0x00,0x00,0xF8,0x00,0x06,0x03,0x03,0x06,0x01,0x04},/*"(",8*/
-{0x01,0x04,0x02,0x06,0x06,0x03,0xF8,0x00,0x00,0x00,0x00,0x00},/*")",9*/
-{0x02,0x00,0x1C,0x00,0x03,0x00,0x1C,0x00,0x02,0x00,0x00,0x00},/*"*",10*/
-{0x20,0x00,0x20,0x00,0xF8,0x01,0x20,0x00,0x20,0x00,0x00,0x00},/*"+",11*/
-{0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00},/*",",12*/
-{0x00,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x00,0x00},/*"-",13*/
-{0x00,0x00,0x00,0x00,0x80,0x01,0x80,0x01,0x00,0x00,0x00,0x00},/*".",14*/
-{0x00,0x04,0x00,0x03,0xE0,0x00,0x38,0x00,0x06,0x00,0x01,0x00},/*"/",15*/
-{0x7C,0x00,0x83,0x01,0x01,0x01,0x83,0x01,0x7C,0x00,0x00,0x00},/*"0",16*/
-{0x02,0x01,0x02,0x01,0xFF,0x01,0x00,0x01,0x00,0x01,0x00,0x00},/*"1",17*/
-{0x00,0x00,0x81,0x01,0x61,0x01,0x11,0x01,0x0E,0x01,0x00,0x00},/*"2",18*/
-{0x00,0x00,0x01,0x01,0x11,0x01,0x11,0x01,0xEE,0x00,0x00,0x00},/*"3",19*/
-{0x60,0x00,0x58,0x00,0x46,0x00,0xFF,0x01,0x40,0x00,0x00,0x00},/*"4",20*/
-{0x00,0x00,0x0F,0x01,0x09,0x01,0x19,0x01,0xF1,0x00,0x00,0x00},/*"5",21*/
-{0xFC,0x00,0x92,0x01,0x09,0x01,0x09,0x01,0xF1,0x00,0x00,0x00},/*"6",22*/
-{0x00,0x00,0x81,0x01,0x71,0x00,0x0D,0x00,0x03,0x00,0x00,0x00},/*"7",23*/
-{0xE6,0x00,0x19,0x01,0x11,0x01,0x39,0x01,0xE6,0x00,0x00,0x00},/*"8",24*/
-{0x1E,0x01,0x21,0x01,0x21,0x01,0x93,0x00,0x7E,0x00,0x00,0x00},/*"9",25*/
-{0x00,0x00,0x00,0x00,0x98,0x01,0x98,0x01,0x00,0x00,0x00,0x00},/*":",26*/
-{0x00,0x00,0x00,0x00,0x98,0x05,0x98,0x03,0x00,0x00,0x00,0x00},/*";",27*/
-{0x00,0x00,0x60,0x00,0x90,0x00,0x90,0x00,0x08,0x01,0x00,0x00},/*"<",28*/
+{0x00,0x00,0x00,0x00,0x7C,0x02,0x00,0x00,0x00,0x00,0x00,0x00},/*"!",1*/
+{0x00,0x00,0x04,0x00,0x03,0x00,0x04,0x00,0x03,0x00,0x00,0x00},/*""",2*/
+{0x90,0x00,0xFC,0x03,0x90,0x00,0xFC,0x03,0x90,0x00,0x00,0x00},/*"#",3*/
+{0x18,0x01,0x24,0x02,0xFE,0x07,0x44,0x02,0x88,0x01,0x00,0x00},/*"$",4*/
+{0x38,0x00,0x44,0x03,0xF8,0x00,0xD0,0x01,0x2C,0x02,0xC0,0x01},/*"%",5*/
+{0xC0,0x01,0x38,0x02,0xE4,0x02,0x18,0x01,0xE0,0x02,0x20,0x01},/*"&",6*/
+{0x04,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"'",7*/
+{0x00,0x00,0x00,0x00,0xF8,0x00,0x06,0x03,0x01,0x04,0x00,0x00},/*"(",8*/
+{0x00,0x00,0x01,0x04,0x06,0x03,0xF8,0x00,0x00,0x00,0x00,0x00},/*")",9*/
+{0x90,0x00,0x60,0x00,0xF8,0x01,0x60,0x00,0x90,0x00,0x00,0x00},/*"*",10*/
+{0x00,0x00,0x20,0x00,0x20,0x00,0xF8,0x00,0x20,0x00,0x20,0x00},/*"+",11*/
+{0x00,0x04,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*",",12*/
+{0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00},/*"-",13*/
+{0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*".",14*/
+{0x00,0x04,0x00,0x03,0xC0,0x00,0x30,0x00,0x0C,0x00,0x02,0x00},/*"/",15*/
+{0xF8,0x01,0x04,0x02,0x04,0x02,0x04,0x02,0xF8,0x01,0x00,0x00},/*"0",16*/
+{0x00,0x00,0x08,0x02,0xFC,0x03,0x00,0x02,0x00,0x00,0x00,0x00},/*"1",17*/
+{0x18,0x03,0x84,0x02,0x44,0x02,0x24,0x02,0x18,0x02,0x00,0x00},/*"2",18*/
+{0x08,0x01,0x04,0x02,0x24,0x02,0x24,0x02,0xD8,0x01,0x00,0x00},/*"3",19*/
+{0xC0,0x00,0xA0,0x00,0x98,0x02,0xFC,0x03,0x80,0x02,0x00,0x00},/*"4",20*/
+{0x7C,0x01,0x24,0x02,0x24,0x02,0x24,0x02,0xC4,0x01,0x00,0x00},/*"5",21*/
+{0xF0,0x01,0x48,0x02,0x24,0x02,0x24,0x02,0xC8,0x01,0x00,0x00},/*"6",22*/
+{0x00,0x00,0x04,0x00,0xC4,0x03,0x34,0x00,0x0C,0x00,0x00,0x00},/*"7",23*/
+{0xD8,0x01,0x24,0x02,0x24,0x02,0x24,0x02,0xD8,0x01,0x00,0x00},/*"8",24*/
+{0x38,0x01,0x44,0x02,0x44,0x02,0x24,0x01,0xF8,0x00,0x00,0x00},/*"9",25*/
+{0x00,0x00,0x00,0x00,0x10,0x02,0x00,0x00,0x00,0x00,0x00,0x00},/*":",26*/
+{0x00,0x00,0x00,0x00,0x20,0x06,0x00,0x00,0x00,0x00,0x00,0x00},/*";",27*/
+{0x00,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x04,0x02,0x00,0x00},/*"<",28*/
 {0x50,0x00,0x50,0x00,0x50,0x00,0x50,0x00,0x50,0x00,0x50,0x00},/*"=",29*/
 {0x50,0x00,0x50,0x00,0x50,0x00,0x50,0x00,0x50,0x00,0x50,0x00},/*"=",29*/
-{0x08,0x01,0x90,0x00,0x90,0x00,0x60,0x00,0x00,0x00,0x00,0x00},/*">",30*/
-{0x00,0x00,0x03,0x00,0x61,0x01,0x11,0x00,0x0E,0x00,0x00,0x00},/*"?",31*/
-{0x7C,0x00,0x82,0x00,0x79,0x01,0x45,0x01,0x7E,0x01,0x40,0x00},/*"@",32*/
-{0x80,0x01,0x78,0x00,0x47,0x00,0x4F,0x00,0x70,0x00,0x80,0x01},/*"A",33*/
-{0xFF,0x01,0x11,0x01,0x11,0x01,0x39,0x01,0xEE,0x00,0x00,0x00},/*"B",34*/
-{0x7C,0x00,0x82,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00},/*"C",35*/
-{0xFF,0x01,0x01,0x01,0x01,0x01,0x81,0x01,0xFE,0x00,0x00,0x00},/*"D",36*/
-{0x00,0x00,0xFF,0x01,0x11,0x01,0x11,0x01,0x01,0x01,0x00,0x00},/*"E",37*/
-{0x00,0x00,0xFF,0x01,0x11,0x00,0x11,0x00,0x01,0x00,0x00,0x00},/*"F",38*/
-{0x7C,0x00,0x82,0x00,0x01,0x01,0x21,0x01,0xE1,0x01,0x00,0x00},/*"G",39*/
-{0xFF,0x01,0x10,0x00,0x10,0x00,0x10,0x00,0xFF,0x01,0x00,0x00},/*"H",40*/
-{0x01,0x01,0x01,0x01,0xFF,0x01,0x01,0x01,0x01,0x01,0x00,0x00},/*"I",41*/
-{0x00,0x00,0x01,0x01,0x01,0x01,0xFF,0x00,0x00,0x00,0x00,0x00},/*"J",42*/
-{0xFF,0x01,0x18,0x00,0x24,0x00,0xC2,0x00,0x81,0x01,0x00,0x01},/*"K",43*/
-{0x00,0x00,0xFF,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x00},/*"L",44*/
-{0xFF,0x01,0x1E,0x00,0x70,0x00,0x0E,0x00,0xFF,0x01,0x00,0x00},/*"M",45*/
-{0xFF,0x01,0x06,0x00,0x38,0x00,0xC0,0x00,0xFF,0x01,0x00,0x00},/*"N",46*/
-{0x7C,0x00,0x83,0x01,0x01,0x01,0x83,0x01,0x7C,0x00,0x00,0x00},/*"O",47*/
-{0xFF,0x01,0x21,0x00,0x21,0x00,0x31,0x00,0x1E,0x00,0x00,0x00},/*"P",48*/
-{0x7C,0x00,0x83,0x01,0x01,0x01,0x83,0x01,0x7C,0x02,0x00,0x04},/*"Q",49*/
-{0xFF,0x01,0x11,0x00,0x31,0x00,0xCE,0x00,0x00,0x01,0x00,0x00},/*"R",50*/
-{0x00,0x00,0x0E,0x01,0x19,0x01,0x11,0x01,0xE1,0x00,0x00,0x00},/*"S",51*/
-{0x01,0x00,0x01,0x00,0xFF,0x01,0x01,0x00,0x01,0x00,0x00,0x00},/*"T",52*/
-{0xFF,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0xFF,0x00,0x00,0x00},/*"U",53*/
-{0x03,0x00,0x7C,0x00,0x80,0x01,0xE0,0x00,0x1C,0x00,0x03,0x00},/*"V",54*/
-{0x7F,0x00,0xC0,0x01,0x3C,0x00,0xE0,0x01,0x1F,0x00,0x00,0x00},/*"W",55*/
-{0x01,0x01,0xC6,0x00,0x28,0x00,0x38,0x00,0xC6,0x00,0x01,0x01},/*"X",56*/
-{0x01,0x00,0x0E,0x00,0xF0,0x01,0x0E,0x00,0x01,0x00,0x00,0x00},/*"Y",57*/
-{0x81,0x01,0x61,0x01,0x11,0x01,0x0D,0x01,0x03,0x01,0x00,0x00},/*"Z",58*/
+{0x00,0x00,0x04,0x02,0x08,0x01,0x90,0x00,0x60,0x00,0x00,0x00},/*">",30*/
+{0x18,0x00,0x04,0x00,0xC4,0x02,0x24,0x00,0x18,0x00,0x00,0x00},/*"?",31*/
+{0xF0,0x00,0x08,0x01,0xE4,0x02,0xF4,0x02,0x84,0x02,0x78,0x01},/*"@",32*/
+{0x00,0x02,0xE0,0x03,0x9C,0x00,0xF0,0x00,0x80,0x03,0x00,0x02},/*"A",33*/
+{0x04,0x02,0xFC,0x03,0x24,0x02,0x24,0x02,0xD8,0x01,0x00,0x00},/*"B",34*/
+{0xF8,0x01,0x04,0x02,0x04,0x02,0x04,0x02,0x0C,0x01,0x00,0x00},/*"C",35*/
+{0x04,0x02,0xFC,0x03,0x04,0x02,0x04,0x02,0xF8,0x01,0x00,0x00},/*"D",36*/
+{0x04,0x02,0xFC,0x03,0x24,0x02,0x74,0x02,0x0C,0x03,0x00,0x00},/*"E",37*/
+{0x04,0x02,0xFC,0x03,0x24,0x02,0x74,0x00,0x0C,0x00,0x00,0x00},/*"F",38*/
+{0xF0,0x00,0x08,0x01,0x04,0x02,0x44,0x02,0xCC,0x01,0x40,0x00},/*"G",39*/
+{0x04,0x02,0xFC,0x03,0x20,0x00,0x20,0x00,0xFC,0x03,0x04,0x02},/*"H",40*/
+{0x04,0x02,0x04,0x02,0xFC,0x03,0x04,0x02,0x04,0x02,0x00,0x00},/*"I",41*/
+{0x00,0x0C,0x04,0x08,0x04,0x08,0xFC,0x07,0x04,0x00,0x04,0x00},/*"J",42*/
+{0x04,0x02,0xFC,0x03,0x24,0x02,0x50,0x00,0x8C,0x03,0x04,0x02},/*"K",43*/
+{0x04,0x02,0xFC,0x03,0x04,0x02,0x00,0x02,0x00,0x02,0x00,0x03},/*"L",44*/
+{0xFC,0x03,0x3C,0x00,0xC0,0x03,0x3C,0x00,0xFC,0x03,0x04,0x02},/*"M",45*/
+{0x04,0x02,0xFC,0x03,0x30,0x02,0xC4,0x00,0xFC,0x03,0x04,0x00},/*"N",46*/
+{0xF8,0x01,0x04,0x02,0x04,0x02,0x04,0x02,0xF8,0x01,0x00,0x00},/*"O",47*/
+{0x04,0x02,0xFC,0x03,0x24,0x02,0x24,0x00,0x18,0x00,0x00,0x00},/*"P",48*/
+{0xF8,0x01,0x84,0x02,0x84,0x02,0x04,0x07,0xF8,0x05,0x00,0x00},/*"Q",49*/
+{0x04,0x02,0xFC,0x03,0x24,0x02,0x64,0x00,0x98,0x03,0x00,0x02},/*"R",50*/
+{0x18,0x03,0x24,0x02,0x24,0x02,0x44,0x02,0x8C,0x01,0x00,0x00},/*"S",51*/
+{0x0C,0x00,0x04,0x02,0xFC,0x03,0x04,0x02,0x0C,0x00,0x00,0x00},/*"T",52*/
+{0x04,0x00,0xFC,0x01,0x00,0x02,0x00,0x02,0xFC,0x01,0x04,0x00},/*"U",53*/
+{0x04,0x00,0x7C,0x00,0x80,0x03,0xE0,0x00,0x1C,0x00,0x04,0x00},/*"V",54*/
+{0x3C,0x00,0xC0,0x03,0x7C,0x00,0xC0,0x03,0x3C,0x00,0x00,0x00},/*"W",55*/
+{0x04,0x02,0x9C,0x03,0x60,0x00,0x9C,0x03,0x04,0x02,0x00,0x00},/*"X",56*/
+{0x04,0x00,0x3C,0x02,0xC0,0x03,0x3C,0x02,0x04,0x00,0x00,0x00},/*"Y",57*/
+{0x0C,0x02,0x84,0x03,0x64,0x02,0x1C,0x02,0x04,0x03,0x00,0x00},/*"Z",58*/
 {0x00,0x00,0x00,0x00,0xFF,0x07,0x01,0x04,0x01,0x04,0x00,0x00},/*"[",59*/
 {0x00,0x00,0x00,0x00,0xFF,0x07,0x01,0x04,0x01,0x04,0x00,0x00},/*"[",59*/
-{0x01,0x00,0x06,0x00,0x38,0x00,0xC0,0x00,0x00,0x03,0x00,0x04},/*"\",60*/
+{0x00,0x00,0x06,0x00,0x38,0x00,0xC0,0x01,0x00,0x06,0x00,0x00},/*"\",60*/
 {0x00,0x00,0x01,0x04,0x01,0x04,0xFF,0x07,0x00,0x00,0x00,0x00},/*"]",61*/
 {0x00,0x00,0x01,0x04,0x01,0x04,0xFF,0x07,0x00,0x00,0x00,0x00},/*"]",61*/
-{0x60,0x00,0x1C,0x00,0x07,0x00,0x38,0x00,0x40,0x00,0x00,0x00},/*"^",62*/
-{0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02},/*"_",63*/
-{0x00,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00},/*"`",64*/
-{0x00,0x00,0xC8,0x01,0x28,0x01,0x28,0x01,0xF0,0x01,0x00,0x01},/*"a",65*/
-{0xFF,0x01,0x10,0x01,0x08,0x01,0x08,0x01,0xF0,0x00,0x00,0x00},/*"b",66*/
-{0xF0,0x00,0x08,0x01,0x08,0x01,0x08,0x01,0x08,0x01,0x00,0x00},/*"c",67*/
-{0xF0,0x00,0x08,0x01,0x08,0x01,0x88,0x00,0xFF,0x01,0x00,0x00},/*"d",68*/
-{0xF0,0x00,0xA8,0x01,0x28,0x01,0x28,0x01,0x30,0x01,0x00,0x00},/*"e",69*/
-{0x00,0x00,0x08,0x00,0xFF,0x01,0x09,0x00,0x09,0x00,0x00,0x00},/*"f",70*/
-{0xF0,0x00,0x08,0x05,0x08,0x05,0x08,0x05,0xF8,0x03,0x00,0x00},/*"g",71*/
-{0xFF,0x01,0x10,0x00,0x08,0x00,0x08,0x00,0xF8,0x01,0x00,0x00},/*"h",72*/
-{0x00,0x00,0x08,0x00,0x08,0x00,0xF9,0x01,0x00,0x00,0x00,0x00},/*"i",73*/
-{0x00,0x04,0x08,0x04,0x08,0x04,0xF9,0x03,0x00,0x00,0x00,0x00},/*"j",74*/
-{0x00,0x00,0xFF,0x01,0x20,0x00,0xF0,0x00,0x98,0x01,0x08,0x01},/*"k",75*/
-{0x01,0x00,0x01,0x00,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"l",76*/
-{0xF8,0x01,0x08,0x00,0xF8,0x01,0x08,0x00,0xF8,0x01,0x00,0x00},/*"m",77*/
-{0xF8,0x01,0x10,0x00,0x08,0x00,0x08,0x00,0xF8,0x01,0x00,0x00},/*"n",78*/
-{0xF0,0x00,0x08,0x01,0x08,0x01,0x08,0x01,0xF0,0x00,0x00,0x00},/*"o",79*/
-{0xF8,0x07,0x10,0x01,0x08,0x01,0x08,0x01,0xF0,0x00,0x00,0x00},/*"p",80*/
-{0xF0,0x00,0x08,0x01,0x08,0x01,0x08,0x01,0xF8,0x07,0x00,0x00},/*"q",81*/
-{0x00,0x00,0xF8,0x01,0x10,0x00,0x08,0x00,0x18,0x00,0x00,0x00},/*"r",82*/
-{0x00,0x00,0x38,0x01,0x28,0x01,0x48,0x01,0xC8,0x00,0x00,0x00},/*"s",83*/
-{0x00,0x00,0x08,0x00,0xFF,0x00,0x08,0x01,0x08,0x01,0x00,0x00},/*"t",84*/
-{0xF8,0x01,0x00,0x01,0x00,0x01,0x80,0x00,0xF8,0x01,0x00,0x00},/*"u",85*/
-{0x18,0x00,0xE0,0x00,0x00,0x01,0xF0,0x00,0x18,0x00,0x00,0x00},/*"v",86*/
-{0x78,0x00,0x80,0x01,0x70,0x00,0x60,0x00,0x80,0x01,0x78,0x00},/*"w",87*/
-{0x08,0x01,0x90,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x00},/*"x",88*/
-{0x08,0x04,0x30,0x04,0xC0,0x03,0xC0,0x01,0x30,0x00,0x08,0x00},/*"y",89*/
-{0x08,0x01,0x88,0x01,0x48,0x01,0x28,0x01,0x18,0x01,0x00,0x00},/*"z",90*/
-{0x00,0x00,0x20,0x00,0xDF,0x03,0x01,0x04,0x01,0x04,0x00,0x00},/*"{",91*/
-{0x00,0x00,0x00,0x00,0xFF,0x07,0x00,0x00,0x00,0x00,0x00,0x00},/*"|",92*/
-{0x00,0x00,0x01,0x04,0x01,0x04,0xDE,0x07,0x20,0x00,0x00,0x00},/*"}",93*/
-{0x60,0x00,0x20,0x00,0x20,0x00,0x40,0x00,0x40,0x00,0x60,0x00},/*"~",94*/
+{0x00,0x00,0x02,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00},/*"^",62*/
+{0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08},/*"_",63*/
+{0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"`",64*/
+{0x00,0x00,0x40,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x03,0x00,0x02},/*"a",65*/
+{0x02,0x00,0xFE,0x03,0x20,0x02,0x20,0x02,0xC0,0x01,0x00,0x00},/*"b",66*/
+{0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0x60,0x01,0x00,0x00},/*"c",67*/
+{0x00,0x00,0xC0,0x01,0x20,0x02,0x22,0x02,0xFE,0x03,0x00,0x02},/*"d",68*/
+{0x00,0x00,0xC0,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x02,0x00,0x00},/*"e",69*/
+{0x00,0x00,0x20,0x02,0xFC,0x03,0x22,0x02,0x22,0x02,0x04,0x00},/*"f",70*/
+{0x00,0x00,0x40,0x05,0xA0,0x0A,0xA0,0x0A,0x60,0x0A,0x20,0x04},/*"g",71*/
+{0x02,0x02,0xFE,0x03,0x20,0x02,0x20,0x00,0xC0,0x03,0x00,0x02},/*"h",72*/
+{0x00,0x00,0x20,0x02,0xE6,0x03,0x00,0x02,0x00,0x00,0x00,0x00},/*"i",73*/
+{0x00,0x08,0x00,0x08,0x20,0x08,0xE6,0x07,0x00,0x00,0x00,0x00},/*"j",74*/
+{0x02,0x02,0xFE,0x03,0x80,0x00,0x60,0x01,0x20,0x02,0x00,0x00},/*"k",75*/
+{0x02,0x02,0x02,0x02,0xFE,0x03,0x00,0x02,0x00,0x02,0x00,0x00},/*"l",76*/
+{0xE0,0x03,0x20,0x00,0xE0,0x03,0x20,0x00,0xC0,0x03,0x00,0x00},/*"m",77*/
+{0x20,0x02,0xE0,0x03,0x20,0x02,0x20,0x00,0xC0,0x03,0x00,0x02},/*"n",78*/
+{0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xC0,0x01,0x00,0x00},/*"o",79*/
+{0x20,0x08,0xE0,0x0F,0x20,0x0A,0x20,0x02,0xC0,0x01,0x00,0x00},/*"p",80*/
+{0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x0A,0xE0,0x0F,0x00,0x08},/*"q",81*/
+{0x20,0x02,0xE0,0x03,0x40,0x02,0x20,0x00,0x20,0x00,0x00,0x00},/*"r",82*/
+{0x00,0x00,0x60,0x02,0xA0,0x02,0xA0,0x02,0x20,0x03,0x00,0x00},/*"s",83*/
+{0x00,0x00,0x20,0x00,0xF8,0x03,0x20,0x02,0x20,0x02,0x00,0x00},/*"t",84*/
+{0x20,0x00,0xE0,0x01,0x00,0x02,0x20,0x02,0xE0,0x03,0x00,0x02},/*"u",85*/
+{0x20,0x00,0xE0,0x00,0x00,0x03,0xE0,0x00,0x20,0x00,0x00,0x00},/*"v",86*/
+{0x60,0x00,0x80,0x03,0xE0,0x00,0x80,0x03,0x60,0x00,0x00,0x00},/*"w",87*/
+{0x20,0x02,0x60,0x03,0x80,0x00,0x60,0x03,0x20,0x02,0x00,0x00},/*"x",88*/
+{0x20,0x08,0xE0,0x08,0x00,0x05,0x00,0x03,0xE0,0x00,0x20,0x00},/*"y",89*/
+{0x00,0x00,0x20,0x02,0xA0,0x03,0x60,0x02,0x20,0x02,0x00,0x00},/*"z",90*/
+{0x00,0x00,0x00,0x00,0x20,0x00,0xFF,0x07,0x01,0x04,0x00,0x00},/*"{",91*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x0F,0x00,0x00,0x00,0x00},/*"|",92*/
+{0x00,0x00,0x01,0x04,0xDF,0x07,0x20,0x00,0x00,0x00,0x00,0x00},/*"}",93*/
+{0x02,0x00,0x01,0x00,0x01,0x00,0x02,0x00,0x01,0x00,0x00,0x00},/*"~",94*/
 };
 };
 static const uint8_t font_en_1608[95][16] =
 static const uint8_t font_en_1608[95][16] =
 {      
 {      
 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*" ",0*/
 {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*" ",0*/
-{0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x30,0x00,0x00,0x00},/*"!",1*/
-{0x00,0x10,0x0C,0x06,0x10,0x0C,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*""",2*/
-{0x40,0xC0,0x78,0x40,0xC0,0x78,0x40,0x00,0x04,0x3F,0x04,0x04,0x3F,0x04,0x04,0x00},/*"#",3*/
-{0x00,0x70,0x88,0xFC,0x08,0x30,0x00,0x00,0x00,0x18,0x20,0xFF,0x21,0x1E,0x00,0x00},/*"$",4*/
-{0xF0,0x08,0xF0,0x00,0xE0,0x18,0x00,0x00,0x00,0x21,0x1C,0x03,0x1E,0x21,0x1E,0x00},/*"%",5*/
-{0x00,0xF0,0x08,0x88,0x70,0x00,0x00,0x00,0x1E,0x21,0x23,0x24,0x19,0x27,0x21,0x10},/*"&",6*/
-{0x10,0x16,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"'",7*/
-{0x00,0x00,0x00,0xE0,0x18,0x04,0x02,0x00,0x00,0x00,0x00,0x07,0x18,0x20,0x40,0x00},/*"(",8*/
-{0x00,0x02,0x04,0x18,0xE0,0x00,0x00,0x00,0x00,0x40,0x20,0x18,0x07,0x00,0x00,0x00},/*")",9*/
-{0x40,0x40,0x80,0xF0,0x80,0x40,0x40,0x00,0x02,0x02,0x01,0x0F,0x01,0x02,0x02,0x00},/*"*",10*/
-{0x00,0x00,0x00,0xF0,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x1F,0x01,0x01,0x01,0x00},/*"+",11*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xB0,0x70,0x00,0x00,0x00,0x00,0x00},/*",",12*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01},/*"-",13*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x00,0x00},/*".",14*/
-{0x00,0x00,0x00,0x00,0x80,0x60,0x18,0x04,0x00,0x60,0x18,0x06,0x01,0x00,0x00,0x00},/*"/",15*/
-{0x00,0xE0,0x10,0x08,0x08,0x10,0xE0,0x00,0x00,0x0F,0x10,0x20,0x20,0x10,0x0F,0x00},/*"0",16*/
-{0x00,0x10,0x10,0xF8,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00},/*"1",17*/
-{0x00,0x70,0x08,0x08,0x08,0x88,0x70,0x00,0x00,0x30,0x28,0x24,0x22,0x21,0x30,0x00},/*"2",18*/
-{0x00,0x30,0x08,0x88,0x88,0x48,0x30,0x00,0x00,0x18,0x20,0x20,0x20,0x11,0x0E,0x00},/*"3",19*/
-{0x00,0x00,0xC0,0x20,0x10,0xF8,0x00,0x00,0x00,0x07,0x04,0x24,0x24,0x3F,0x24,0x00},/*"4",20*/
-{0x00,0xF8,0x08,0x88,0x88,0x08,0x08,0x00,0x00,0x19,0x21,0x20,0x20,0x11,0x0E,0x00},/*"5",21*/
-{0x00,0xE0,0x10,0x88,0x88,0x18,0x00,0x00,0x00,0x0F,0x11,0x20,0x20,0x11,0x0E,0x00},/*"6",22*/
-{0x00,0x38,0x08,0x08,0xC8,0x38,0x08,0x00,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x00},/*"7",23*/
-{0x00,0x70,0x88,0x08,0x08,0x88,0x70,0x00,0x00,0x1C,0x22,0x21,0x21,0x22,0x1C,0x00},/*"8",24*/
-{0x00,0xE0,0x10,0x08,0x08,0x10,0xE0,0x00,0x00,0x00,0x31,0x22,0x22,0x11,0x0F,0x00},/*"9",25*/
-{0x00,0x00,0x00,0xC0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00},/*":",26*/
-{0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x60,0x00,0x00,0x00,0x00},/*";",27*/
-{0x00,0x00,0x80,0x40,0x20,0x10,0x08,0x00,0x00,0x01,0x02,0x04,0x08,0x10,0x20,0x00},/*"<",28*/
-{0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x00},/*"=",29*/
-{0x00,0x08,0x10,0x20,0x40,0x80,0x00,0x00,0x00,0x20,0x10,0x08,0x04,0x02,0x01,0x00},/*">",30*/
-{0x00,0x70,0x48,0x08,0x08,0x08,0xF0,0x00,0x00,0x00,0x00,0x30,0x36,0x01,0x00,0x00},/*"?",31*/
-{0xC0,0x30,0xC8,0x28,0xE8,0x10,0xE0,0x00,0x07,0x18,0x27,0x24,0x23,0x14,0x0B,0x00},/*"@",32*/
-{0x00,0x00,0xC0,0x38,0xE0,0x00,0x00,0x00,0x20,0x3C,0x23,0x02,0x02,0x27,0x38,0x20},/*"A",33*/
-{0x08,0xF8,0x88,0x88,0x88,0x70,0x00,0x00,0x20,0x3F,0x20,0x20,0x20,0x11,0x0E,0x00},/*"B",34*/
-{0xC0,0x30,0x08,0x08,0x08,0x08,0x38,0x00,0x07,0x18,0x20,0x20,0x20,0x10,0x08,0x00},/*"C",35*/
-{0x08,0xF8,0x08,0x08,0x08,0x10,0xE0,0x00,0x20,0x3F,0x20,0x20,0x20,0x10,0x0F,0x00},/*"D",36*/
-{0x08,0xF8,0x88,0x88,0xE8,0x08,0x10,0x00,0x20,0x3F,0x20,0x20,0x23,0x20,0x18,0x00},/*"E",37*/
-{0x08,0xF8,0x88,0x88,0xE8,0x08,0x10,0x00,0x20,0x3F,0x20,0x00,0x03,0x00,0x00,0x00},/*"F",38*/
-{0xC0,0x30,0x08,0x08,0x08,0x38,0x00,0x00,0x07,0x18,0x20,0x20,0x22,0x1E,0x02,0x00},/*"G",39*/
-{0x08,0xF8,0x08,0x00,0x00,0x08,0xF8,0x08,0x20,0x3F,0x21,0x01,0x01,0x21,0x3F,0x20},/*"H",40*/
-{0x00,0x08,0x08,0xF8,0x08,0x08,0x00,0x00,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00},/*"I",41*/
-{0x00,0x00,0x08,0x08,0xF8,0x08,0x08,0x00,0xC0,0x80,0x80,0x80,0x7F,0x00,0x00,0x00},/*"J",42*/
-{0x08,0xF8,0x88,0xC0,0x28,0x18,0x08,0x00,0x20,0x3F,0x20,0x01,0x26,0x38,0x20,0x00},/*"K",43*/
-{0x08,0xF8,0x08,0x00,0x00,0x00,0x00,0x00,0x20,0x3F,0x20,0x20,0x20,0x20,0x30,0x00},/*"L",44*/
-{0x08,0xF8,0xF8,0x00,0xF8,0xF8,0x08,0x00,0x20,0x3F,0x00,0x3F,0x00,0x3F,0x20,0x00},/*"M",45*/
-{0x08,0xF8,0x30,0xC0,0x00,0x08,0xF8,0x08,0x20,0x3F,0x20,0x00,0x07,0x18,0x3F,0x00},/*"N",46*/
-{0xE0,0x10,0x08,0x08,0x08,0x10,0xE0,0x00,0x0F,0x10,0x20,0x20,0x20,0x10,0x0F,0x00},/*"O",47*/
-{0x08,0xF8,0x08,0x08,0x08,0x08,0xF0,0x00,0x20,0x3F,0x21,0x01,0x01,0x01,0x00,0x00},/*"P",48*/
-{0xE0,0x10,0x08,0x08,0x08,0x10,0xE0,0x00,0x0F,0x18,0x24,0x24,0x38,0x50,0x4F,0x00},/*"Q",49*/
-{0x08,0xF8,0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x3F,0x20,0x00,0x03,0x0C,0x30,0x20},/*"R",50*/
-{0x00,0x70,0x88,0x08,0x08,0x08,0x38,0x00,0x00,0x38,0x20,0x21,0x21,0x22,0x1C,0x00},/*"S",51*/
-{0x18,0x08,0x08,0xF8,0x08,0x08,0x18,0x00,0x00,0x00,0x20,0x3F,0x20,0x00,0x00,0x00},/*"T",52*/
-{0x08,0xF8,0x08,0x00,0x00,0x08,0xF8,0x08,0x00,0x1F,0x20,0x20,0x20,0x20,0x1F,0x00},/*"U",53*/
-{0x08,0x78,0x88,0x00,0x00,0xC8,0x38,0x08,0x00,0x00,0x07,0x38,0x0E,0x01,0x00,0x00},/*"V",54*/
-{0xF8,0x08,0x00,0xF8,0x00,0x08,0xF8,0x00,0x03,0x3C,0x07,0x00,0x07,0x3C,0x03,0x00},/*"W",55*/
-{0x08,0x18,0x68,0x80,0x80,0x68,0x18,0x08,0x20,0x30,0x2C,0x03,0x03,0x2C,0x30,0x20},/*"X",56*/
-{0x08,0x38,0xC8,0x00,0xC8,0x38,0x08,0x00,0x00,0x00,0x20,0x3F,0x20,0x00,0x00,0x00},/*"Y",57*/
-{0x10,0x08,0x08,0x08,0xC8,0x38,0x08,0x00,0x20,0x38,0x26,0x21,0x20,0x20,0x18,0x00},/*"Z",58*/
-{0x00,0x00,0x00,0xFE,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x7F,0x40,0x40,0x40,0x00},/*"[",59*/
-{0x00,0x0C,0x30,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x06,0x38,0xC0,0x00},/*"\",60*/
-{0x00,0x02,0x02,0x02,0xFE,0x00,0x00,0x00,0x00,0x40,0x40,0x40,0x7F,0x00,0x00,0x00},/*"]",61*/
-{0x00,0x00,0x04,0x02,0x02,0x02,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"^",62*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},/*"_",63*/
-{0x00,0x02,0x02,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"`",64*/
-{0x00,0x00,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x19,0x24,0x22,0x22,0x22,0x3F,0x20},/*"a",65*/
-{0x08,0xF8,0x00,0x80,0x80,0x00,0x00,0x00,0x00,0x3F,0x11,0x20,0x20,0x11,0x0E,0x00},/*"b",66*/
-{0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00,0x00,0x0E,0x11,0x20,0x20,0x20,0x11,0x00},/*"c",67*/
-{0x00,0x00,0x00,0x80,0x80,0x88,0xF8,0x00,0x00,0x0E,0x11,0x20,0x20,0x10,0x3F,0x20},/*"d",68*/
-{0x00,0x00,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x1F,0x22,0x22,0x22,0x22,0x13,0x00},/*"e",69*/
-{0x00,0x80,0x80,0xF0,0x88,0x88,0x88,0x18,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00},/*"f",70*/
-{0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x6B,0x94,0x94,0x94,0x93,0x60,0x00},/*"g",71*/
-{0x08,0xF8,0x00,0x80,0x80,0x80,0x00,0x00,0x20,0x3F,0x21,0x00,0x00,0x20,0x3F,0x20},/*"h",72*/
-{0x00,0x80,0x98,0x98,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00},/*"i",73*/
-{0x00,0x00,0x00,0x80,0x98,0x98,0x00,0x00,0x00,0xC0,0x80,0x80,0x80,0x7F,0x00,0x00},/*"j",74*/
-{0x08,0xF8,0x00,0x00,0x80,0x80,0x80,0x00,0x20,0x3F,0x24,0x02,0x2D,0x30,0x20,0x00},/*"k",75*/
-{0x00,0x08,0x08,0xF8,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00},/*"l",76*/
-{0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x20,0x3F,0x20,0x00,0x3F,0x20,0x00,0x3F},/*"m",77*/
-{0x80,0x80,0x00,0x80,0x80,0x80,0x00,0x00,0x20,0x3F,0x21,0x00,0x00,0x20,0x3F,0x20},/*"n",78*/
-{0x00,0x00,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x1F,0x20,0x20,0x20,0x20,0x1F,0x00},/*"o",79*/
-{0x80,0x80,0x00,0x80,0x80,0x00,0x00,0x00,0x80,0xFF,0xA1,0x20,0x20,0x11,0x0E,0x00},/*"p",80*/
-{0x00,0x00,0x00,0x80,0x80,0x80,0x80,0x00,0x00,0x0E,0x11,0x20,0x20,0xA0,0xFF,0x80},/*"q",81*/
-{0x80,0x80,0x80,0x00,0x80,0x80,0x80,0x00,0x20,0x20,0x3F,0x21,0x20,0x00,0x01,0x00},/*"r",82*/
-{0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x33,0x24,0x24,0x24,0x24,0x19,0x00},/*"s",83*/
-{0x00,0x80,0x80,0xE0,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x1F,0x20,0x20,0x00,0x00},/*"t",84*/
-{0x80,0x80,0x00,0x00,0x00,0x80,0x80,0x00,0x00,0x1F,0x20,0x20,0x20,0x10,0x3F,0x20},/*"u",85*/
-{0x80,0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x00,0x01,0x0E,0x30,0x08,0x06,0x01,0x00},/*"v",86*/
-{0x80,0x80,0x00,0x80,0x00,0x80,0x80,0x80,0x0F,0x30,0x0C,0x03,0x0C,0x30,0x0F,0x00},/*"w",87*/
-{0x00,0x80,0x80,0x00,0x80,0x80,0x80,0x00,0x00,0x20,0x31,0x2E,0x0E,0x31,0x20,0x00},/*"x",88*/
-{0x80,0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80,0x81,0x8E,0x70,0x18,0x06,0x01,0x00},/*"y",89*/
-{0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x21,0x30,0x2C,0x22,0x21,0x30,0x00},/*"z",90*/
-{0x00,0x00,0x00,0x00,0x80,0x7C,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x3F,0x40,0x40},/*"{",91*/
-{0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00},/*"|",92*/
-{0x00,0x02,0x02,0x7C,0x80,0x00,0x00,0x00,0x00,0x40,0x40,0x3F,0x00,0x00,0x00,0x00},/*"}",93*/
-{0x00,0x06,0x01,0x01,0x02,0x02,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"~",94*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"!",1*/
+{0x00,0x00,0x10,0x00,0x0C,0x00,0x02,0x00,0x10,0x00,0x0C,0x00,0x02,0x00,0x00,0x00},/*""",2*/
+{0x00,0x00,0x40,0x04,0xC0,0x3F,0x78,0x04,0x40,0x04,0xC0,0x3F,0x78,0x04,0x00,0x00},/*"#",3*/
+{0x00,0x00,0x70,0x18,0x88,0x20,0x88,0x20,0xFC,0xFF,0x08,0x21,0x30,0x1E,0x00,0x00},/*"$",4*/
+{0xF0,0x00,0x08,0x31,0xF0,0x0C,0x80,0x03,0x60,0x1E,0x18,0x21,0x00,0x1E,0x00,0x00},/*"%",5*/
+{0x00,0x1E,0xF0,0x21,0x08,0x23,0x88,0x2C,0x70,0x19,0x00,0x27,0x00,0x21,0x00,0x10},/*"&",6*/
+{0x00,0x00,0x12,0x00,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"'",7*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x18,0x18,0x04,0x20,0x02,0x40,0x00,0x00},/*"(",8*/
+{0x00,0x00,0x02,0x40,0x04,0x20,0x18,0x18,0xE0,0x07,0x00,0x00,0x00,0x00,0x00,0x00},/*")",9*/
+{0x40,0x02,0x40,0x02,0x80,0x01,0xF0,0x0F,0x80,0x01,0x40,0x02,0x40,0x02,0x00,0x00},/*"*",10*/
+{0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0xE0,0x0F,0x00,0x01,0x00,0x01,0x00,0x01},/*"+",11*/
+{0x00,0x00,0x00,0x90,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*",",12*/
+{0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x00},/*"-",13*/
+{0x00,0x00,0x00,0x30,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*".",14*/
+{0x00,0x00,0x00,0x60,0x00,0x18,0x00,0x07,0xC0,0x00,0x38,0x00,0x04,0x00,0x00,0x00},/*"/",15*/
+{0x00,0x00,0xE0,0x0F,0x10,0x10,0x08,0x20,0x08,0x20,0x10,0x10,0xE0,0x0F,0x00,0x00},/*"0",16*/
+{0x00,0x00,0x00,0x00,0x10,0x20,0x10,0x20,0xF8,0x3F,0x00,0x20,0x00,0x20,0x00,0x00},/*"1",17*/
+{0x00,0x00,0x70,0x30,0x08,0x28,0x08,0x24,0x08,0x22,0x08,0x21,0xF0,0x30,0x00,0x00},/*"2",18*/
+{0x00,0x00,0x30,0x18,0x08,0x20,0x08,0x21,0x08,0x21,0x88,0x22,0x70,0x1C,0x00,0x00},/*"3",19*/
+{0x00,0x00,0x00,0x06,0x80,0x05,0x40,0x24,0x30,0x24,0xF8,0x3F,0x00,0x24,0x00,0x24},/*"4",20*/
+{0x00,0x00,0xF8,0x19,0x88,0x20,0x88,0x20,0x88,0x20,0x08,0x11,0x08,0x0E,0x00,0x00},/*"5",21*/
+{0x00,0x00,0xE0,0x0F,0x10,0x11,0x88,0x20,0x88,0x20,0x90,0x20,0x00,0x1F,0x00,0x00},/*"6",22*/
+{0x00,0x00,0x18,0x00,0x08,0x00,0x08,0x3E,0x88,0x01,0x68,0x00,0x18,0x00,0x00,0x00},/*"7",23*/
+{0x00,0x00,0x70,0x1C,0x88,0x22,0x08,0x21,0x08,0x21,0x88,0x22,0x70,0x1C,0x00,0x00},/*"8",24*/
+{0x00,0x00,0xF0,0x01,0x08,0x12,0x08,0x22,0x08,0x22,0x10,0x11,0xE0,0x0F,0x00,0x00},/*"9",25*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x30,0xC0,0x30,0x00,0x00,0x00,0x00,0x00,0x00},/*":",26*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*";",27*/
+{0x00,0x00,0x00,0x01,0x80,0x02,0x40,0x04,0x20,0x08,0x10,0x10,0x08,0x20,0x00,0x00},/*"<",28*/
+{0x00,0x00,0x40,0x02,0x40,0x02,0x40,0x02,0x40,0x02,0x40,0x02,0x40,0x02,0x00,0x00},/*"=",29*/
+{0x00,0x00,0x08,0x20,0x10,0x10,0x20,0x08,0x40,0x04,0x80,0x02,0x00,0x01,0x00,0x00},/*">",30*/
+{0x00,0x00,0x70,0x00,0x48,0x00,0x08,0x30,0x08,0x37,0x88,0x00,0x70,0x00,0x00,0x00},/*"?",31*/
+{0xC0,0x07,0x30,0x18,0xC8,0x27,0x28,0x28,0xE8,0x2F,0x10,0x28,0xE0,0x17,0x00,0x00},/*"@",32*/
+{0x00,0x20,0x00,0x3C,0xC0,0x23,0x38,0x02,0xE0,0x02,0x00,0x27,0x00,0x38,0x00,0x20},/*"A",33*/
+{0x08,0x20,0xF8,0x3F,0x88,0x20,0x88,0x20,0x88,0x20,0x70,0x11,0x00,0x0E,0x00,0x00},/*"B",34*/
+{0xC0,0x07,0x30,0x18,0x08,0x20,0x08,0x20,0x08,0x20,0x08,0x10,0x38,0x08,0x00,0x00},/*"C",35*/
+{0x08,0x20,0xF8,0x3F,0x08,0x20,0x08,0x20,0x08,0x20,0x10,0x10,0xE0,0x0F,0x00,0x00},/*"D",36*/
+{0x08,0x20,0xF8,0x3F,0x88,0x20,0x88,0x20,0xE8,0x23,0x08,0x20,0x10,0x18,0x00,0x00},/*"E",37*/
+{0x08,0x20,0xF8,0x3F,0x88,0x20,0x88,0x00,0xE8,0x03,0x08,0x00,0x10,0x00,0x00,0x00},/*"F",38*/
+{0xC0,0x07,0x30,0x18,0x08,0x20,0x08,0x20,0x08,0x22,0x38,0x1E,0x00,0x02,0x00,0x00},/*"G",39*/
+{0x08,0x20,0xF8,0x3F,0x08,0x21,0x00,0x01,0x00,0x01,0x08,0x21,0xF8,0x3F,0x08,0x20},/*"H",40*/
+{0x00,0x00,0x08,0x20,0x08,0x20,0xF8,0x3F,0x08,0x20,0x08,0x20,0x00,0x00,0x00,0x00},/*"I",41*/
+{0x00,0xC0,0x00,0x80,0x08,0x80,0x08,0x80,0xF8,0x7F,0x08,0x00,0x08,0x00,0x00,0x00},/*"J",42*/
+{0x08,0x20,0xF8,0x3F,0x88,0x20,0xC0,0x01,0x28,0x26,0x18,0x38,0x08,0x20,0x00,0x00},/*"K",43*/
+{0x08,0x20,0xF8,0x3F,0x08,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x30,0x00,0x00},/*"L",44*/
+{0x08,0x20,0xF8,0x3F,0xF8,0x01,0x00,0x3E,0xF8,0x01,0xF8,0x3F,0x08,0x20,0x00,0x00},/*"M",45*/
+{0x08,0x20,0xF8,0x3F,0x30,0x20,0xC0,0x00,0x00,0x07,0x08,0x18,0xF8,0x3F,0x08,0x00},/*"N",46*/
+{0xE0,0x0F,0x10,0x10,0x08,0x20,0x08,0x20,0x08,0x20,0x10,0x10,0xE0,0x0F,0x00,0x00},/*"O",47*/
+{0x08,0x20,0xF8,0x3F,0x08,0x21,0x08,0x01,0x08,0x01,0x08,0x01,0xF0,0x00,0x00,0x00},/*"P",48*/
+{0xE0,0x0F,0x10,0x10,0x08,0x28,0x08,0x28,0x08,0x30,0x10,0x50,0xE0,0x4F,0x00,0x00},/*"Q",49*/
+{0x08,0x20,0xF8,0x3F,0x88,0x20,0x88,0x00,0x88,0x03,0x88,0x0C,0x70,0x30,0x00,0x20},/*"R",50*/
+{0x00,0x00,0x70,0x38,0x88,0x20,0x08,0x21,0x08,0x21,0x08,0x22,0x38,0x1C,0x00,0x00},/*"S",51*/
+{0x18,0x00,0x08,0x00,0x08,0x20,0xF8,0x3F,0x08,0x20,0x08,0x00,0x18,0x00,0x00,0x00},/*"T",52*/
+{0x08,0x00,0xF8,0x1F,0x08,0x20,0x00,0x20,0x00,0x20,0x08,0x20,0xF8,0x1F,0x08,0x00},/*"U",53*/
+{0x08,0x00,0x78,0x00,0x88,0x07,0x00,0x38,0x00,0x0E,0xC8,0x01,0x38,0x00,0x08,0x00},/*"V",54*/
+{0x08,0x00,0xF8,0x03,0x00,0x3E,0xF8,0x01,0x00,0x3E,0xF8,0x03,0x08,0x00,0x00,0x00},/*"W",55*/
+{0x08,0x20,0x18,0x30,0x68,0x2C,0x80,0x03,0x80,0x03,0x68,0x2C,0x18,0x30,0x08,0x20},/*"X",56*/
+{0x08,0x00,0x38,0x00,0xC8,0x20,0x00,0x3F,0xC8,0x20,0x38,0x00,0x08,0x00,0x00,0x00},/*"Y",57*/
+{0x10,0x20,0x08,0x38,0x08,0x26,0x08,0x21,0xC8,0x20,0x38,0x20,0x08,0x18,0x00,0x00},/*"Z",58*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x7F,0x02,0x40,0x02,0x40,0x02,0x40,0x00,0x00},/*"[",59*/
+{0x00,0x00,0x04,0x00,0x38,0x00,0xC0,0x01,0x00,0x06,0x00,0x38,0x00,0xC0,0x00,0x00},/*"\",60*/
+{0x00,0x00,0x02,0x40,0x02,0x40,0x02,0x40,0xFE,0x7F,0x00,0x00,0x00,0x00,0x00,0x00},/*"]",61*/
+{0x00,0x00,0x00,0x00,0x04,0x00,0x02,0x00,0x02,0x00,0x04,0x00,0x00,0x00,0x00,0x00},/*"^",62*/
+{0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80},/*"_",63*/
+{0x00,0x00,0x02,0x00,0x02,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"`",64*/
+{0x00,0x00,0x00,0x19,0x80,0x24,0x80,0x24,0x80,0x12,0x00,0x3F,0x00,0x20,0x00,0x00},/*"a",65*/
+{0x10,0x00,0xF0,0x3F,0x00,0x11,0x80,0x20,0x80,0x20,0x00,0x11,0x00,0x0E,0x00,0x00},/*"b",66*/
+{0x00,0x00,0x00,0x0E,0x00,0x11,0x80,0x20,0x80,0x20,0x80,0x20,0x00,0x11,0x00,0x00},/*"c",67*/
+{0x00,0x00,0x00,0x1F,0x80,0x20,0x80,0x20,0x80,0x20,0x90,0x10,0xF0,0x3F,0x00,0x20},/*"d",68*/
+{0x00,0x00,0x00,0x1F,0x80,0x24,0x80,0x24,0x80,0x24,0x80,0x24,0x00,0x17,0x00,0x00},/*"e",69*/
+{0x00,0x00,0x80,0x20,0x80,0x20,0xE0,0x3F,0x90,0x20,0x90,0x20,0x20,0x00,0x00,0x00},/*"f",70*/
+{0x00,0x00,0x00,0x6B,0x80,0x94,0x80,0x94,0x80,0x94,0x80,0x93,0x80,0x60,0x00,0x00},/*"g",71*/
+{0x10,0x20,0xF0,0x3F,0x00,0x21,0x80,0x00,0x80,0x00,0x80,0x20,0x00,0x3F,0x00,0x20},/*"h",72*/
+{0x00,0x00,0x80,0x20,0x98,0x20,0x98,0x3F,0x00,0x20,0x00,0x20,0x00,0x00,0x00,0x00},/*"i",73*/
+{0x00,0x00,0x00,0xC0,0x00,0x80,0x80,0x80,0x98,0x80,0x98,0x7F,0x00,0x00,0x00,0x00},/*"j",74*/
+{0x10,0x20,0xF0,0x3F,0x00,0x24,0x00,0x06,0x80,0x29,0x80,0x30,0x80,0x20,0x00,0x00},/*"k",75*/
+{0x00,0x00,0x10,0x20,0x10,0x20,0xF8,0x3F,0x00,0x20,0x00,0x20,0x00,0x00,0x00,0x00},/*"l",76*/
+{0x80,0x20,0x80,0x3F,0x80,0x20,0x80,0x00,0x80,0x3F,0x80,0x20,0x80,0x00,0x00,0x3F},/*"m",77*/
+{0x80,0x20,0x80,0x3F,0x00,0x21,0x80,0x00,0x80,0x00,0x80,0x20,0x00,0x3F,0x00,0x20},/*"n",78*/
+{0x00,0x00,0x00,0x1F,0x80,0x20,0x80,0x20,0x80,0x20,0x80,0x20,0x00,0x1F,0x00,0x00},/*"o",79*/
+{0x80,0x80,0x80,0xFF,0x00,0x91,0x80,0x20,0x80,0x20,0x00,0x11,0x00,0x0E,0x00,0x00},/*"p",80*/
+{0x00,0x00,0x00,0x0E,0x00,0x11,0x80,0x20,0x80,0x20,0x00,0x91,0x80,0xFF,0x00,0x80},/*"q",81*/
+{0x80,0x20,0x80,0x20,0x80,0x3F,0x00,0x21,0x80,0x20,0x80,0x00,0x80,0x01,0x00,0x00},/*"r",82*/
+{0x00,0x00,0x00,0x33,0x80,0x24,0x80,0x24,0x80,0x24,0x80,0x24,0x80,0x19,0x00,0x00},/*"s",83*/
+{0x00,0x00,0x80,0x00,0x80,0x00,0xE0,0x1F,0x80,0x20,0x80,0x20,0x00,0x10,0x00,0x00},/*"t",84*/
+{0x80,0x00,0x80,0x1F,0x00,0x20,0x00,0x20,0x00,0x20,0x80,0x10,0x80,0x3F,0x00,0x20},/*"u",85*/
+{0x80,0x00,0x80,0x03,0x80,0x0C,0x00,0x30,0x80,0x0C,0x80,0x03,0x80,0x00,0x00,0x00},/*"v",86*/
+{0x80,0x01,0x80,0x0E,0x00,0x30,0x80,0x0C,0x80,0x07,0x00,0x38,0x80,0x06,0x80,0x01},/*"w",87*/
+{0x00,0x00,0x80,0x20,0x80,0x31,0x80,0x0E,0x00,0x2E,0x80,0x31,0x80,0x20,0x00,0x00},/*"x",88*/
+{0x80,0x00,0x80,0x81,0x80,0x86,0x00,0x78,0x00,0x18,0x80,0x06,0x80,0x01,0x80,0x00},/*"y",89*/
+{0x00,0x00,0x80,0x21,0x80,0x30,0x80,0x2C,0x80,0x22,0x80,0x21,0x80,0x30,0x00,0x00},/*"z",90*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xFC,0x3E,0x02,0x40,0x02,0x40},/*"{",91*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00},/*"|",92*/
+{0x02,0x40,0x02,0x40,0xFC,0x3E,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"}",93*/
+{0x00,0x00,0x02,0x00,0x01,0x00,0x02,0x00,0x02,0x00,0x04,0x00,0x02,0x00,0x00,0x00},/*"~",94*/
 };
 };
 static const uint8_t font_en_2412[95][36] =
 static const uint8_t font_en_2412[95][36] =
 {
 {
 {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,0x00,0x00,0x00,0x00},/*" ",0*/
 {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,0x00,0x00,0x00,0x00},/*" ",0*/
-{0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x7F,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x1C,0x00,0x00,0x00,0x00},/*"!",1*/
-{0x00,0x00,0x80,0x60,0x30,0x1C,0x8C,0x60,0x30,0x1C,0x0C,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},/*""",2*/
-{0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x86,0xE6,0x9F,0x86,0x86,0x86,0x86,0xE6,0x9F,0x86,0x00,0x00,0x01,0x1F,0x01,0x01,0x01,0x01,0x01,0x1F,0x01,0x01,0x00},/*"#",3*/
-{0x00,0x00,0x80,0xC0,0x60,0x20,0xF8,0x20,0xE0,0xC0,0x00,0x00,0x00,0x00,0x03,0x07,0x0C,0x18,0xFF,0x70,0xE1,0x81,0x00,0x00,0x00,0x00,0x07,0x0F,0x10,0x10,0x7F,0x10,0x0F,0x07,0x00,0x00},/*"$",4*/
-{0x80,0x60,0x20,0x60,0x80,0x00,0x00,0x00,0xE0,0x20,0x00,0x00,0x0F,0x30,0x20,0x30,0x9F,0x70,0xDC,0x37,0x10,0x30,0xC0,0x00,0x00,0x00,0x10,0x0E,0x03,0x00,0x07,0x18,0x10,0x18,0x07,0x00},/*"%",5*/
-{0x00,0x00,0xC0,0x20,0x20,0xE0,0xC0,0x00,0x00,0x00,0x00,0x00,0x80,0xE0,0x1F,0x38,0xE8,0x87,0x03,0xC4,0x3C,0x04,0x00,0x00,0x07,0x0F,0x18,0x10,0x10,0x0B,0x07,0x0D,0x10,0x10,0x08,0x00},/*"&",6*/
-{0x00,0x80,0x8C,0x4C,0x38,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},/*"'",7*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xE0,0x30,0x08,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x0F,0x18,0x20,0x40,0x00},/*"(",8*/
-{0x00,0x04,0x08,0x30,0xE0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xFF,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x20,0x18,0x0F,0x03,0x00,0x00,0x00,0x00,0x00,0x00},/*")",9*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x66,0x66,0x3C,0x18,0xFF,0x18,0x3C,0x66,0x66,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00},/*"*",10*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x10,0x10,0xFF,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00},/*"+",11*/
-{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,0x80,0x8C,0x4C,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*",",12*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*".",14*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x38,0x0C,0x00,0x00,0x00,0x00,0x00,0x80,0x70,0x1C,0x03,0x00,0x00,0x00,0x00,0x00,0x60,0x38,0x0E,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"/",15*/
-{0x00,0x00,0x80,0xC0,0x60,0x20,0x20,0x60,0xC0,0x80,0x00,0x00,0x00,0xFE,0xFF,0x01,0x00,0x00,0x00,0x00,0x01,0xFF,0xFE,0x00,0x00,0x01,0x07,0x0E,0x18,0x10,0x10,0x18,0x0E,0x07,0x01,0x00},/*"0",16*/
-{0x00,0x00,0x80,0x80,0x80,0xC0,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x1F,0x1F,0x10,0x10,0x10,0x00,0x00},/*"1",17*/
-{0x00,0x80,0x40,0x20,0x20,0x20,0x20,0x60,0xC0,0x80,0x00,0x00,0x00,0x03,0x03,0x00,0x80,0x40,0x20,0x38,0x1F,0x07,0x00,0x00,0x00,0x1C,0x1A,0x19,0x18,0x18,0x18,0x18,0x18,0x1F,0x00,0x00},/*"2",18*/
-{0x00,0x80,0xC0,0x20,0x20,0x20,0x60,0xC0,0x80,0x00,0x00,0x00,0x00,0x03,0x03,0x00,0x10,0x10,0x18,0x2F,0xE7,0x80,0x00,0x00,0x00,0x07,0x0F,0x10,0x10,0x10,0x10,0x18,0x0F,0x07,0x00,0x00},/*"3",19*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xE0,0xF0,0x00,0x00,0x00,0x00,0xC0,0xB0,0x88,0x86,0x81,0x80,0xFF,0xFF,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x1F,0x1F,0x10,0x10,0x00},/*"4",20*/
-{0x00,0x00,0xE0,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x3F,0x10,0x08,0x08,0x08,0x18,0xF0,0xE0,0x00,0x00,0x00,0x07,0x0B,0x10,0x10,0x10,0x10,0x1C,0x0F,0x03,0x00,0x00},/*"5",21*/
-{0x00,0x00,0x80,0xC0,0x40,0x20,0x20,0x20,0xE0,0xC0,0x00,0x00,0x00,0xFC,0xFF,0x21,0x10,0x08,0x08,0x08,0x18,0xF0,0xE0,0x00,0x00,0x01,0x07,0x0C,0x18,0x10,0x10,0x10,0x08,0x0F,0x03,0x00},/*"6",22*/
-{0x00,0x00,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xE0,0x60,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0xE0,0x18,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x1F,0x00,0x00,0x00,0x00,0x00},/*"7",23*/
-{0x00,0x80,0xC0,0x60,0x20,0x20,0x20,0x20,0x60,0xC0,0x80,0x00,0x00,0x87,0xEF,0x2C,0x18,0x18,0x30,0x30,0x68,0xCF,0x83,0x00,0x00,0x07,0x0F,0x08,0x10,0x10,0x10,0x10,0x18,0x0F,0x07,0x00},/*"8",24*/
-{0x00,0x00,0xC0,0xC0,0x20,0x20,0x20,0x20,0xC0,0x80,0x00,0x00,0x00,0x1F,0x3F,0x60,0x40,0x40,0x40,0x20,0x10,0xFF,0xFE,0x00,0x00,0x00,0x0C,0x1C,0x10,0x10,0x10,0x08,0x0F,0x03,0x00,0x00},/*"9",25*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x0E,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x1C,0x00,0x00,0x00,0x00},/*":",26*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x38,0x00,0x00,0x00,0x00,0x00},/*";",27*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x40,0x20,0x10,0x00,0x00,0x00,0x10,0x28,0x44,0x82,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x02,0x04,0x08,0x10,0x00},/*"<",28*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x84,0x84,0x84,0x84,0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"=",29*/
-{0x00,0x00,0x10,0x20,0x40,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x82,0x44,0x28,0x10,0x00,0x00,0x00,0x10,0x08,0x04,0x02,0x01,0x00,0x00,0x00,0x00,0x00},/*">",30*/
-{0x00,0xC0,0x20,0x20,0x10,0x10,0x10,0x10,0x30,0xE0,0xC0,0x00,0x00,0x03,0x03,0x00,0x00,0xF0,0x10,0x08,0x0C,0x07,0x03,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x1C,0x00,0x00,0x00,0x00,0x00},/*"?",31*/
-{0x00,0x00,0x00,0xC0,0x40,0x60,0x20,0x20,0x20,0x40,0xC0,0x00,0x00,0xFC,0xFF,0x01,0xF0,0x0E,0x03,0xC1,0xFE,0x03,0x80,0x7F,0x00,0x01,0x07,0x0E,0x08,0x11,0x11,0x10,0x11,0x09,0x04,0x02},/*"@",32*/
-{0x00,0x00,0x00,0x00,0x80,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x7C,0x43,0x40,0x47,0x7F,0xF8,0x80,0x00,0x00,0x10,0x18,0x1F,0x10,0x00,0x00,0x00,0x00,0x13,0x1F,0x1C,0x10},/*"A",33*/
-{0x20,0xE0,0xE0,0x20,0x20,0x20,0x20,0x60,0xC0,0x80,0x00,0x00,0x00,0xFF,0xFF,0x10,0x10,0x10,0x10,0x18,0x2F,0xE7,0x80,0x00,0x10,0x1F,0x1F,0x10,0x10,0x10,0x10,0x10,0x18,0x0F,0x07,0x00},/*"B",34*/
-{0x00,0x00,0x80,0xC0,0x40,0x20,0x20,0x20,0x20,0x60,0xE0,0x00,0x00,0xFC,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x01,0x07,0x0E,0x18,0x10,0x10,0x10,0x08,0x04,0x03,0x00},/*"C",35*/
-{0x20,0xE0,0xE0,0x20,0x20,0x20,0x20,0x40,0xC0,0x80,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x01,0xFF,0xFE,0x00,0x10,0x1F,0x1F,0x10,0x10,0x10,0x18,0x08,0x0E,0x07,0x01,0x00},/*"D",36*/
-{0x20,0xE0,0xE0,0x20,0x20,0x20,0x20,0x20,0x20,0x60,0x80,0x00,0x00,0xFF,0xFF,0x10,0x10,0x10,0x10,0x7C,0x00,0x00,0x00,0x00,0x10,0x1F,0x1F,0x10,0x10,0x10,0x10,0x10,0x10,0x18,0x06,0x00},/*"E",37*/
-{0x20,0xE0,0xE0,0x20,0x20,0x20,0x20,0x20,0x60,0x60,0x80,0x00,0x00,0xFF,0xFF,0x10,0x10,0x10,0x10,0x7C,0x00,0x00,0x01,0x00,0x10,0x1F,0x1F,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"F",38*/
-{0x00,0x00,0x80,0xC0,0x60,0x20,0x20,0x20,0x40,0xE0,0x00,0x00,0x00,0xFC,0xFF,0x01,0x00,0x00,0x40,0x40,0xC0,0xC1,0x40,0x40,0x00,0x01,0x07,0x0E,0x18,0x10,0x10,0x10,0x0F,0x0F,0x00,0x00},/*"G",39*/
-{0x20,0xE0,0xE0,0x20,0x00,0x00,0x00,0x00,0x20,0xE0,0xE0,0x20,0x00,0xFF,0xFF,0x10,0x10,0x10,0x10,0x10,0x10,0xFF,0xFF,0x00,0x10,0x1F,0x1F,0x10,0x00,0x00,0x00,0x00,0x10,0x1F,0x1F,0x10},/*"H",40*/
-{0x00,0x00,0x20,0x20,0x20,0xE0,0xE0,0x20,0x20,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x1F,0x1F,0x10,0x10,0x10,0x00,0x00},/*"I",41*/
-{0x00,0x00,0x00,0x00,0x20,0x20,0x20,0xE0,0xE0,0x20,0x20,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x60,0xE0,0x80,0x80,0x80,0xC0,0x7F,0x3F,0x00,0x00,0x00},/*"J",42*/
-{0x20,0xE0,0xE0,0x20,0x00,0x00,0x20,0xA0,0x60,0x20,0x20,0x00,0x00,0xFF,0xFF,0x30,0x18,0x7C,0xE3,0xC0,0x00,0x00,0x00,0x00,0x10,0x1F,0x1F,0x10,0x00,0x00,0x01,0x13,0x1F,0x1C,0x18,0x10},/*"K",43*/
-{0x20,0xE0,0xE0,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x1F,0x1F,0x10,0x10,0x10,0x10,0x10,0x10,0x18,0x06,0x00},/*"L",44*/
-{0x20,0xE0,0xE0,0xE0,0x00,0x00,0x00,0x00,0xE0,0xE0,0xE0,0x20,0x00,0xFF,0x01,0x3F,0xFE,0xC0,0xE0,0x1E,0x01,0xFF,0xFF,0x00,0x10,0x1F,0x10,0x00,0x03,0x1F,0x03,0x00,0x10,0x1F,0x1F,0x10},/*"M",45*/
-{0x20,0xE0,0xE0,0xC0,0x00,0x00,0x00,0x00,0x00,0x20,0xE0,0x20,0x00,0xFF,0x00,0x03,0x07,0x1C,0x78,0xE0,0x80,0x00,0xFF,0x00,0x10,0x1F,0x10,0x00,0x00,0x00,0x00,0x00,0x03,0x0F,0x1F,0x00},/*"N",46*/
-{0x00,0x00,0x80,0xC0,0x60,0x20,0x20,0x60,0xC0,0x80,0x00,0x00,0x00,0xFE,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0xFF,0xFE,0x00,0x00,0x01,0x07,0x0E,0x18,0x10,0x10,0x18,0x0C,0x07,0x01,0x00},/*"O",47*/
-{0x20,0xE0,0xE0,0x20,0x20,0x20,0x20,0x20,0x60,0xC0,0x80,0x00,0x00,0xFF,0xFF,0x20,0x20,0x20,0x20,0x20,0x30,0x1F,0x0F,0x00,0x10,0x1F,0x1F,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"P",48*/
-{0x00,0x00,0x80,0xC0,0x60,0x20,0x20,0x60,0xC0,0x80,0x00,0x00,0x00,0xFE,0xFF,0x01,0x00,0x00,0x00,0x00,0x00,0xFF,0xFE,0x00,0x00,0x01,0x07,0x0E,0x11,0x11,0x13,0x3C,0x7C,0x67,0x21,0x00},/*"Q",49*/
-{0x20,0xE0,0xE0,0x20,0x20,0x20,0x20,0x20,0x60,0xC0,0x80,0x00,0x00,0xFF,0xFF,0x10,0x10,0x30,0xF0,0xD0,0x08,0x0F,0x07,0x00,0x10,0x1F,0x1F,0x10,0x00,0x00,0x00,0x03,0x0F,0x1C,0x10,0x10},/*"R",50*/
-{0x00,0x80,0xC0,0x60,0x20,0x20,0x20,0x20,0x40,0x40,0xE0,0x00,0x00,0x07,0x0F,0x0C,0x18,0x18,0x30,0x30,0x60,0xE0,0x81,0x00,0x00,0x1F,0x0C,0x08,0x10,0x10,0x10,0x10,0x18,0x0F,0x07,0x00},/*"S",51*/
-{0x80,0x60,0x20,0x20,0x20,0xE0,0xE0,0x20,0x20,0x20,0x60,0x80,0x01,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x10,0x1F,0x1F,0x10,0x00,0x00,0x00,0x00},/*"T",52*/
-{0x20,0xE0,0xE0,0x20,0x00,0x00,0x00,0x00,0x00,0x20,0xE0,0x20,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x07,0x0F,0x18,0x10,0x10,0x10,0x10,0x10,0x08,0x07,0x00},/*"U",53*/
-{0x20,0x60,0xE0,0xE0,0x20,0x00,0x00,0x00,0x20,0xE0,0x60,0x20,0x00,0x00,0x07,0x7F,0xF8,0x80,0x00,0x80,0x7C,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x1F,0x1C,0x07,0x00,0x00,0x00,0x00},/*"V",54*/
-{0x20,0xE0,0xE0,0x20,0x00,0xE0,0xE0,0x20,0x00,0x20,0xE0,0x20,0x00,0x07,0xFF,0xF8,0xE0,0x1F,0xFF,0xFC,0xE0,0x1F,0x00,0x00,0x00,0x00,0x03,0x1F,0x03,0x00,0x01,0x1F,0x03,0x00,0x00,0x00},/*"W",55*/
-{0x00,0x20,0x60,0xE0,0xA0,0x00,0x00,0x20,0xE0,0x60,0x20,0x00,0x00,0x00,0x00,0x03,0x8F,0x7C,0xF8,0xC6,0x01,0x00,0x00,0x00,0x00,0x10,0x18,0x1E,0x13,0x00,0x01,0x17,0x1F,0x18,0x10,0x00},/*"X",56*/
-{0x20,0x60,0xE0,0xE0,0x20,0x00,0x00,0x00,0x20,0xE0,0x60,0x20,0x00,0x00,0x01,0x07,0x3E,0xF8,0xE0,0x18,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x1F,0x1F,0x10,0x10,0x00,0x00,0x00},/*"Y",57*/
-{0x00,0x80,0x60,0x20,0x20,0x20,0x20,0xA0,0xE0,0xE0,0x20,0x00,0x00,0x00,0x00,0x00,0xC0,0xF0,0x3E,0x0F,0x03,0x00,0x00,0x00,0x00,0x10,0x1C,0x1F,0x17,0x10,0x10,0x10,0x10,0x18,0x06,0x00},/*"Z",58*/
-{0x00,0x00,0x00,0x00,0x00,0xFC,0x04,0x04,0x04,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x40,0x40,0x40,0x40,0x40,0x00},/*"[",59*/
-{0x00,0x00,0x10,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x1C,0x60,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x0C,0x70,0x80,0x00},/*"\",60*/
-{0x00,0x00,0x04,0x04,0x04,0x04,0x04,0xFC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x7F,0x00,0x00,0x00,0x00},/*"]",61*/
-{0x00,0x00,0x00,0x10,0x08,0x0C,0x04,0x0C,0x08,0x10,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},/*"^",62*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80},/*"_",63*/
-{0x00,0x00,0x00,0x04,0x04,0x08,0x08,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},/*"`",64*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x98,0xD8,0x44,0x64,0x24,0x24,0xFC,0xF8,0x00,0x00,0x00,0x0F,0x1F,0x18,0x10,0x10,0x10,0x08,0x1F,0x1F,0x10,0x18},/*"a",65*/
-{0x00,0x20,0xE0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x18,0x08,0x04,0x04,0x0C,0xF8,0xF0,0x00,0x00,0x00,0x1F,0x0F,0x18,0x10,0x10,0x10,0x18,0x0F,0x03,0x00},/*"b",66*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xF8,0x18,0x04,0x04,0x04,0x3C,0x38,0x00,0x00,0x00,0x00,0x03,0x0F,0x0C,0x10,0x10,0x10,0x10,0x08,0x06,0x00,0x00},/*"c",67*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0xE0,0xF0,0x00,0x00,0x00,0xE0,0xF8,0x1C,0x04,0x04,0x04,0x08,0xFF,0xFF,0x00,0x00,0x00,0x03,0x0F,0x18,0x10,0x10,0x10,0x08,0x1F,0x0F,0x08,0x00},/*"d",68*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xF8,0x48,0x44,0x44,0x44,0x4C,0x78,0x70,0x00,0x00,0x00,0x03,0x0F,0x0C,0x18,0x10,0x10,0x10,0x08,0x04,0x00},/*"e",69*/
-{0x00,0x00,0x00,0x00,0x80,0xC0,0x60,0x20,0x20,0xE0,0xC0,0x00,0x00,0x04,0x04,0x04,0xFF,0xFF,0x04,0x04,0x04,0x04,0x00,0x00,0x00,0x00,0x10,0x10,0x1F,0x1F,0x10,0x10,0x10,0x00,0x00,0x00},/*"f",70*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0xF8,0x8C,0x04,0x04,0x8C,0xF8,0x74,0x04,0x0C,0x00,0x70,0x76,0xCF,0x8D,0x8D,0x8D,0x89,0xC8,0x78,0x70,0x00},/*"g",71*/
-{0x00,0x20,0xE0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x08,0x04,0x04,0x04,0xFC,0xF8,0x00,0x00,0x00,0x10,0x1F,0x1F,0x10,0x00,0x00,0x10,0x1F,0x1F,0x10,0x00},/*"h",72*/
-{0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x04,0xFC,0xFC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x1F,0x1F,0x10,0x10,0x10,0x00,0x00},/*"i",73*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x04,0xFC,0xFC,0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0x80,0x80,0xC0,0x7F,0x3F,0x00,0x00,0x00},/*"j",74*/
-{0x00,0x20,0xE0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x80,0xC0,0xF4,0x1C,0x04,0x04,0x00,0x00,0x00,0x10,0x1F,0x1F,0x11,0x00,0x03,0x1F,0x1C,0x10,0x10,0x00},/*"k",75*/
-{0x00,0x00,0x20,0x20,0x20,0xE0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x10,0x10,0x1F,0x1F,0x10,0x10,0x10,0x00,0x00},/*"l",76*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0xFC,0xFC,0x08,0x04,0xFC,0xFC,0x08,0x04,0xFC,0xFC,0x00,0x10,0x1F,0x1F,0x10,0x00,0x1F,0x1F,0x10,0x00,0x1F,0x1F,0x10},/*"m",77*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0xFC,0xFC,0x08,0x08,0x04,0x04,0xFC,0xF8,0x00,0x00,0x00,0x10,0x1F,0x1F,0x10,0x00,0x00,0x10,0x1F,0x1F,0x10,0x00},/*"n",78*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xF0,0x18,0x0C,0x04,0x04,0x0C,0x18,0xF0,0xE0,0x00,0x00,0x03,0x0F,0x0C,0x10,0x10,0x10,0x10,0x0C,0x0F,0x03,0x00},/*"o",79*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0xFC,0xFC,0x08,0x04,0x04,0x04,0x0C,0xF8,0xF0,0x00,0x00,0x80,0xFF,0xFF,0x88,0x90,0x10,0x10,0x1C,0x0F,0x03,0x00},/*"p",80*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xF8,0x1C,0x04,0x04,0x04,0x08,0xF8,0xFC,0x00,0x00,0x00,0x03,0x0F,0x18,0x10,0x10,0x90,0x88,0xFF,0xFF,0x80,0x00},/*"q",81*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x04,0xFC,0xFC,0x10,0x08,0x04,0x04,0x0C,0x0C,0x00,0x10,0x10,0x10,0x1F,0x1F,0x10,0x10,0x10,0x00,0x00,0x00,0x00},/*"r",82*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x78,0xCC,0xC4,0x84,0x84,0x84,0x0C,0x1C,0x00,0x00,0x00,0x1E,0x18,0x10,0x10,0x10,0x11,0x19,0x0F,0x06,0x00},/*"s",83*/
-{0x00,0x00,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x04,0xFF,0xFF,0x04,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x1F,0x10,0x10,0x10,0x0C,0x00,0x00},/*"t",84*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0xFC,0xFE,0x00,0x00,0x00,0x04,0xFC,0xFE,0x00,0x00,0x00,0x00,0x0F,0x1F,0x18,0x10,0x10,0x08,0x1F,0x0F,0x08,0x00},/*"u",85*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x0C,0x3C,0xFC,0xC4,0x00,0x00,0xC4,0x3C,0x0C,0x04,0x00,0x00,0x00,0x00,0x01,0x0F,0x1E,0x0E,0x01,0x00,0x00,0x00},/*"v",86*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x3C,0xFC,0xC4,0x00,0xE4,0x7C,0xFC,0x84,0x80,0x7C,0x04,0x00,0x00,0x07,0x1F,0x07,0x00,0x00,0x07,0x1F,0x07,0x00,0x00},/*"w",87*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x1C,0x7C,0xE4,0xC0,0x34,0x1C,0x04,0x04,0x00,0x00,0x10,0x10,0x1C,0x16,0x01,0x13,0x1F,0x1C,0x18,0x10,0x00},/*"x",88*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x0C,0x3C,0xFC,0xC4,0x00,0xC4,0x3C,0x04,0x04,0x00,0x00,0x00,0xC0,0x80,0xC1,0x37,0x0E,0x01,0x00,0x00,0x00,0x00},/*"y",89*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x04,0x04,0xC4,0xF4,0x7C,0x1C,0x04,0x00,0x00,0x00,0x00,0x10,0x1C,0x1F,0x17,0x11,0x10,0x10,0x18,0x0E,0x00},/*"z",90*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x0C,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x28,0xEF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x60,0x40,0x00,0x00},/*"{",91*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x00},/*"|",92*/
-{0x00,0x00,0x04,0x0C,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xEF,0x28,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x60,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"}",93*/
-{0x00,0x18,0x06,0x02,0x02,0x04,0x08,0x10,0x20,0x20,0x30,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"~",94*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x77,0x1C,0xF0,0x0F,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"!",1*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x60,0x00,0x00,0x30,0x00,0x00,0x1C,0x00,0x00,0x8C,0x00,0x00,0x60,0x00,0x00,0x30,0x00,0x00,0x1C,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00},/*""",2*/
+{0x00,0x00,0x00,0x00,0x83,0x01,0x00,0x83,0x1F,0x00,0xFF,0x01,0xF0,0x83,0x01,0x00,0x83,0x01,0x00,0x83,0x01,0x00,0x83,0x01,0x00,0xFB,0x1F,0xF0,0x87,0x01,0x00,0x83,0x01,0x00,0x00,0x00},/*"#",3*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x07,0xC0,0x07,0x0F,0x60,0x0C,0x12,0x20,0x18,0x10,0xF8,0xFF,0x7F,0x20,0x71,0x10,0xE0,0xE1,0x0F,0xC0,0x81,0x07,0x00,0x00,0x00,0x00,0x00,0x00},/*"$",4*/
+{0xC0,0x07,0x00,0x30,0x18,0x00,0x10,0x10,0x18,0x30,0x18,0x07,0xC0,0xCF,0x00,0x00,0x38,0x00,0x00,0xC6,0x07,0xC0,0x31,0x18,0x30,0x10,0x10,0x00,0x30,0x18,0x00,0xC0,0x07,0x00,0x00,0x00},/*"%",5*/
+{0x00,0xC0,0x07,0x00,0xE0,0x0F,0xE0,0x17,0x18,0xF0,0x3F,0x10,0x10,0xF8,0x10,0xF0,0xC7,0x13,0xE0,0x03,0x0F,0x00,0x08,0x0E,0x00,0xF8,0x19,0x00,0x08,0x10,0x00,0x08,0x10,0x00,0x00,0x0C},/*"&",6*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x8C,0x00,0x00,0x4C,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"'",7*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x80,0x01,0x03,0x60,0x00,0x0C,0x10,0x00,0x10,0x08,0x00,0x20,0x04,0x00,0x40,0x00,0x00,0x00},/*"(",8*/
+{0x00,0x00,0x00,0x04,0x00,0x40,0x08,0x00,0x20,0x10,0x00,0x10,0x60,0x00,0x0C,0x80,0x01,0x03,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*")",9*/
+{0x00,0x00,0x00,0x00,0x66,0x00,0x00,0x66,0x00,0x00,0x24,0x00,0x00,0x38,0x00,0x00,0x10,0x00,0xC0,0xFF,0x03,0x80,0x18,0x00,0x00,0x3C,0x00,0x00,0x24,0x00,0x00,0x66,0x00,0x00,0x66,0x00},/*"*",10*/
+{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x80,0xFF,0x03,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00},/*"+",11*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8C,0x00,0x00,0x4C,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*",",12*/
+{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00,0x00},/*"-",13*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x00,0x00,0x1C,0x00,0x00,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*".",14*/
+{0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x38,0x00,0x00,0x0E,0x00,0x80,0x01,0x00,0x70,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xE0,0x00,0x00,0x38,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00},/*"/",15*/
+{0x00,0x00,0x00,0x00,0xFE,0x01,0x80,0xFF,0x07,0xC0,0x01,0x0E,0x60,0x00,0x18,0x20,0x00,0x10,0x20,0x00,0x10,0x60,0x00,0x18,0xC0,0x01,0x0E,0x80,0xFF,0x07,0x00,0xFE,0x01,0x00,0x00,0x00},/*"0",16*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x10,0x40,0x00,0x10,0xC0,0xFF,0x1F,0xE0,0xFF,0x1F,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00},/*"1",17*/
+{0x00,0x00,0x00,0x80,0x03,0x18,0x40,0x03,0x1C,0x20,0x00,0x12,0x20,0x00,0x11,0x20,0xC0,0x10,0x20,0x60,0x10,0x60,0x30,0x10,0xC0,0x1F,0x10,0x80,0x07,0x1E,0x00,0x00,0x00,0x00,0x00,0x00},/*"2",18*/
+{0x00,0x00,0x00,0xC0,0x01,0x0E,0xC0,0x01,0x0E,0x20,0x00,0x10,0x20,0x10,0x10,0x20,0x10,0x10,0x60,0x18,0x10,0xC0,0x2F,0x18,0x80,0xE7,0x0F,0x00,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00},/*"3",19*/
+{0x00,0x00,0x00,0x00,0xC0,0x00,0x00,0xA0,0x00,0x00,0x98,0x00,0x00,0x84,0x00,0x00,0x83,0x10,0x80,0x80,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x00,0x80,0x10,0x00,0x80,0x10,0x00,0x80,0x00},/*"4",20*/
+{0x00,0x00,0x00,0x00,0x00,0x07,0xE0,0x3F,0x0B,0x20,0x10,0x10,0x20,0x08,0x10,0x20,0x08,0x10,0x20,0x08,0x10,0x20,0x18,0x1C,0x20,0xF0,0x0F,0x20,0xE0,0x03,0x00,0x00,0x00,0x00,0x00,0x00},/*"5",21*/
+{0x00,0x00,0x00,0x00,0xFC,0x01,0x80,0xFF,0x07,0xC0,0x21,0x0C,0x40,0x10,0x18,0x20,0x08,0x10,0x20,0x08,0x10,0x20,0x08,0x10,0xE0,0x18,0x08,0xC0,0xF0,0x0F,0x00,0xE0,0x03,0x00,0x00,0x00},/*"6",22*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x01,0x00,0x60,0x00,0x00,0x20,0x00,0x00,0x20,0x00,0x1F,0x20,0xE0,0x1F,0x20,0x18,0x00,0x20,0x07,0x00,0xE0,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00},/*"7",23*/
+{0x00,0x00,0x00,0x80,0x83,0x07,0xC0,0xCF,0x0F,0x60,0x6C,0x08,0x20,0x18,0x10,0x20,0x10,0x10,0x20,0x30,0x10,0x20,0x30,0x10,0x60,0x68,0x18,0xC0,0xCF,0x0F,0x80,0x83,0x07,0x00,0x00,0x00},/*"8",24*/
+{0x00,0x00,0x00,0x00,0x1F,0x00,0xC0,0x3F,0x0C,0xC0,0x60,0x1C,0x20,0x40,0x10,0x20,0x40,0x10,0x20,0x40,0x10,0x20,0x20,0x08,0xC0,0x10,0x0F,0x80,0xFF,0x03,0x00,0xFE,0x00,0x00,0x00,0x00},/*"9",25*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x00,0x1C,0x1C,0x00,0x1C,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*":",26*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0xD8,0x00,0x0C,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*";",27*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x28,0x00,0x00,0x44,0x00,0x00,0x82,0x00,0x00,0x01,0x01,0x80,0x00,0x02,0x40,0x00,0x04,0x20,0x00,0x08,0x10,0x00,0x10,0x00,0x00,0x00},/*"<",28*/
+{0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0x00,0x00,0x44,0x00,0x00,0x44,0x00,0x00,0x44,0x00,0x00,0x44,0x00,0x00,0x44,0x00,0x00,0x44,0x00,0x00,0x44,0x00,0x00,0x44,0x00,0x00,0x00,0x00},/*"=",29*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x04,0x80,0x00,0x02,0x00,0x01,0x01,0x00,0x82,0x00,0x00,0x44,0x00,0x00,0x28,0x00,0x00,0x10,0x00,0x00,0x00,0x00},/*">",30*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x40,0x06,0x00,0x40,0x00,0x00,0x20,0x00,0x1C,0x20,0xE0,0x1C,0x20,0x10,0x1C,0x20,0x18,0x00,0x60,0x08,0x00,0xC0,0x0F,0x00,0x80,0x07,0x00},/*"?",31*/
+{0x00,0x00,0x00,0x00,0xFE,0x00,0xC0,0xFF,0x07,0xE0,0x00,0x0E,0x20,0xF8,0x18,0x10,0xFF,0x11,0x90,0x03,0x11,0x90,0xFC,0x11,0xA0,0x07,0x09,0x60,0x80,0x0C,0x80,0x7F,0x02,0x00,0x00,0x00},/*"@",32*/
+{0x00,0x00,0x10,0x00,0x00,0x1C,0x00,0x80,0x13,0x00,0x78,0x10,0x80,0x47,0x00,0x60,0x40,0x00,0xE0,0x41,0x00,0x00,0x5F,0x00,0x00,0xF0,0x11,0x00,0x80,0x1F,0x00,0x00,0x18,0x00,0x00,0x10},/*"A",33*/
+{0x00,0x00,0x00,0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x10,0x10,0x20,0x10,0x10,0x20,0x10,0x10,0x60,0x18,0x10,0xC0,0x2F,0x18,0xC0,0xE7,0x0F,0x00,0x80,0x07,0x00,0x00,0x00},/*"B",34*/
+{0x00,0x00,0x00,0x00,0xFC,0x01,0x80,0xFF,0x07,0xC0,0x01,0x0E,0x40,0x00,0x18,0x20,0x00,0x10,0x20,0x00,0x10,0x20,0x00,0x10,0x60,0x00,0x08,0xE0,0x00,0x0C,0x80,0x03,0x03,0x00,0x00,0x00},/*"C",35*/
+{0x20,0x00,0x10,0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x00,0x10,0x20,0x00,0x10,0x20,0x00,0x10,0x40,0x00,0x08,0xC0,0x01,0x0E,0x80,0xFF,0x07,0x00,0xFE,0x01,0x00,0x00,0x00},/*"D",36*/
+{0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x10,0x10,0x20,0x10,0x10,0x20,0x10,0x10,0x20,0x10,0x10,0x20,0xFC,0x10,0x60,0x00,0x10,0x60,0x00,0x18,0x80,0x01,0x06,0x00,0x00,0x00},/*"E",37*/
+{0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x10,0x10,0x20,0x10,0x10,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0xFC,0x00,0x60,0x00,0x00,0x60,0x00,0x00,0x80,0x01,0x00,0x00,0x00,0x00},/*"F",38*/
+{0x00,0x00,0x00,0x00,0xFC,0x01,0x80,0xFF,0x07,0xC0,0x01,0x0E,0x60,0x00,0x18,0x20,0x00,0x10,0x20,0x40,0x10,0x20,0x40,0x10,0x40,0xC0,0x0F,0x80,0xC3,0x0F,0x00,0x40,0x00,0x00,0x40,0x00},/*"G",39*/
+{0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x10,0x10,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x20,0x10,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x00,0x10},/*"H",40*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x10,0x20,0x00,0x10,0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x00,0x10,0x20,0x00,0x10,0x20,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00},/*"I",41*/
+{0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0xE0,0x20,0x00,0x80,0x20,0x00,0x80,0x20,0x00,0xC0,0xE0,0xFF,0x7F,0xE0,0xFF,0x3F,0x20,0x00,0x00,0x20,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00},/*"J",42*/
+{0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x30,0x10,0x00,0x0C,0x00,0x00,0x3A,0x00,0xA0,0xE1,0x00,0xE0,0x80,0x13,0x60,0x00,0x1E,0x20,0x00,0x18,0x00,0x00,0x10,0x00,0x00,0x00},/*"K",43*/
+{0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x00,0x10,0x20,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x18,0x00,0x00,0x06,0x00,0x00,0x00},/*"L",44*/
+{0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0x0F,0x10,0x00,0xFF,0x00,0x00,0xE0,0x0F,0x00,0x80,0x07,0x00,0x7C,0x00,0xC0,0x03,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x00,0x10,0x00,0x00,0x00},/*"M",45*/
+{0x00,0x00,0x10,0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0x01,0x10,0x80,0x07,0x10,0x00,0x1E,0x00,0x00,0x78,0x00,0x20,0xC0,0x03,0x20,0x00,0x0F,0xE0,0xFF,0x1F,0x20,0x00,0x00,0x20,0x00,0x00},/*"N",46*/
+{0x00,0x00,0x00,0x00,0xFE,0x01,0x80,0xFF,0x07,0xC0,0x01,0x0E,0x60,0x00,0x18,0x20,0x00,0x10,0x20,0x00,0x10,0x60,0x00,0x18,0xC0,0x00,0x0C,0x80,0xFF,0x07,0x00,0xFE,0x01,0x00,0x00,0x00},/*"O",47*/
+{0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x20,0x10,0x20,0x20,0x10,0x20,0x20,0x00,0x20,0x20,0x00,0x20,0x30,0x00,0x40,0x10,0x00,0xC0,0x1F,0x00,0x80,0x0F,0x00,0x00,0x00,0x00},/*"P",48*/
+{0x00,0x00,0x00,0x00,0xFE,0x01,0x80,0xFF,0x07,0xC0,0x01,0x0E,0x60,0x00,0x19,0x20,0x00,0x11,0x20,0x00,0x17,0x60,0x00,0x3C,0xC0,0x00,0x6C,0x80,0xFF,0x67,0x00,0xFE,0x21,0x00,0x00,0x00},/*"Q",49*/
+{0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x10,0x10,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x70,0x00,0x20,0xD0,0x01,0x60,0x08,0x07,0xC0,0x0F,0x1E,0x80,0x07,0x18,0x00,0x00,0x10},/*"R",50*/
+{0x00,0x00,0x00,0x80,0x07,0x07,0xC0,0x0F,0x0C,0x60,0x1C,0x08,0x20,0x18,0x10,0x20,0x38,0x10,0x20,0x30,0x10,0x20,0x70,0x10,0x40,0xE0,0x18,0xE0,0xE1,0x0F,0x00,0x80,0x07,0x00,0x00,0x00},/*"S",51*/
+{0x80,0x01,0x00,0x60,0x00,0x00,0x20,0x00,0x00,0x20,0x00,0x10,0x20,0x00,0x10,0xE0,0xFF,0x1F,0xE0,0xFF,0x1F,0x20,0x00,0x10,0x20,0x00,0x10,0x20,0x00,0x00,0x60,0x00,0x00,0x80,0x01,0x00},/*"T",52*/
+{0x00,0x00,0x00,0x20,0x00,0x00,0xE0,0xFF,0x07,0xE0,0xFF,0x0F,0x20,0x00,0x18,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x20,0x00,0x08,0xE0,0xFF,0x07,0x20,0x00,0x00,0x00,0x00,0x00},/*"U",53*/
+{0x20,0x00,0x00,0x60,0x00,0x00,0xE0,0x07,0x00,0x20,0x7E,0x00,0x00,0xE0,0x07,0x00,0x00,0x1E,0x00,0x80,0x03,0x00,0x78,0x00,0xA0,0x07,0x00,0x60,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00},/*"V",54*/
+{0x20,0x00,0x00,0xE0,0x03,0x00,0x20,0xFF,0x00,0x00,0xC0,0x1F,0x20,0xC0,0x03,0x60,0x3C,0x00,0xE0,0x3F,0x00,0x20,0xF0,0x1F,0x00,0x80,0x07,0x20,0x7C,0x00,0xE0,0x03,0x00,0x20,0x00,0x00},/*"W",55*/
+{0x00,0x00,0x00,0x20,0x00,0x10,0x60,0x00,0x18,0xE0,0x01,0x16,0x20,0x87,0x01,0x00,0x7C,0x00,0x00,0xE8,0x00,0x20,0x86,0x13,0xE0,0x01,0x1E,0x20,0x00,0x18,0x20,0x00,0x10,0x00,0x00,0x00},/*"X",56*/
+{0x20,0x00,0x00,0x60,0x00,0x00,0xE0,0x01,0x00,0x20,0x0F,0x10,0x00,0x3C,0x10,0x00,0xF8,0x1F,0x00,0xE0,0x1F,0x00,0x18,0x10,0x20,0x06,0x10,0xA0,0x01,0x00,0x60,0x00,0x00,0x20,0x00,0x00},/*"Y",57*/
+{0x00,0x00,0x00,0x80,0x01,0x10,0xE0,0x00,0x1C,0x60,0x00,0x17,0x20,0x80,0x11,0x20,0x60,0x10,0x20,0x18,0x10,0x20,0x06,0x10,0xA0,0x03,0x10,0xE0,0x00,0x18,0x20,0x00,0x06,0x00,0x00,0x00},/*"Z",58*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,0xFF,0x7F,0x04,0x00,0x40,0x04,0x00,0x40,0x04,0x00,0x40,0x04,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00},/*"[",59*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x07,0x00,0x00,0x18,0x00,0x00,0xE0,0x00,0x00,0x80,0x03,0x00,0x00,0x0C,0x00,0x00,0x70,0x00,0x00,0x80,0x00,0x00,0x00},/*"\",60*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x40,0x04,0x00,0x40,0x04,0x00,0x40,0x04,0x00,0x40,0xFC,0xFF,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"]",61*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x04,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"^",62*/
+{0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80},/*"_",63*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"`",64*/
+{0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x98,0x1F,0x00,0x98,0x19,0x00,0x84,0x10,0x00,0x44,0x10,0x00,0x44,0x10,0x00,0x44,0x08,0x00,0xFC,0x0F,0x00,0xF8,0x1F,0x00,0x00,0x10,0x00,0x00,0x18},/*"a",65*/
+{0x00,0x00,0x00,0x20,0x00,0x00,0xE0,0xFF,0x1F,0xF0,0xFF,0x0F,0x00,0x18,0x08,0x00,0x08,0x10,0x00,0x04,0x10,0x00,0x04,0x10,0x00,0x0C,0x18,0x00,0xF8,0x0F,0x00,0xF0,0x03,0x00,0x00,0x00},/*"b",66*/
+{0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0xF8,0x0F,0x00,0x18,0x0C,0x00,0x04,0x10,0x00,0x04,0x10,0x00,0x04,0x10,0x00,0x3C,0x10,0x00,0x38,0x08,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00},/*"c",67*/
+{0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0xF8,0x0F,0x00,0x1C,0x18,0x00,0x04,0x10,0x00,0x04,0x10,0x20,0x04,0x10,0x20,0x08,0x08,0xE0,0xFF,0x1F,0xF0,0xFF,0x0F,0x00,0x00,0x08,0x00,0x00,0x00},/*"d",68*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0xF8,0x0F,0x00,0x88,0x0C,0x00,0x84,0x10,0x00,0x84,0x10,0x00,0x84,0x10,0x00,0x8C,0x10,0x00,0xF8,0x08,0x00,0xE0,0x04,0x00,0x00,0x00},/*"e",69*/
+{0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x10,0x00,0x04,0x10,0x80,0xFF,0x1F,0xC0,0xFF,0x1F,0x60,0x04,0x10,0x20,0x04,0x10,0x20,0x04,0x10,0xE0,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0x00},/*"f",70*/
+{0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x70,0x7E,0x00,0xF8,0xCF,0x00,0x8C,0x85,0x00,0x04,0x85,0x00,0x0C,0x8D,0x00,0xFC,0xCD,0x00,0xF4,0x78,0x00,0x0C,0x78,0x00,0x0C,0x00,0x00,0x00,0x00},/*"g",71*/
+{0x00,0x00,0x00,0x20,0x00,0x10,0xE0,0xFF,0x1F,0xF0,0xFF,0x1F,0x00,0x08,0x10,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x10,0x00,0xFC,0x1F,0x00,0xF8,0x1F,0x00,0x00,0x10,0x00,0x00,0x00},/*"h",72*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x10,0x00,0x04,0x10,0x00,0x04,0x10,0x60,0xFC,0x1F,0x60,0xFE,0x1F,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00},/*"i",73*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x00,0x00,0xC0,0x00,0x04,0x80,0x00,0x04,0x80,0x60,0x04,0xC0,0x60,0xFC,0x7F,0x60,0xFE,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"j",74*/
+{0x00,0x00,0x00,0x20,0x00,0x10,0xE0,0xFF,0x1F,0xF0,0xFF,0x1F,0x00,0x80,0x10,0x00,0x40,0x00,0x00,0xE0,0x00,0x00,0x1C,0x13,0x00,0x04,0x1E,0x00,0x04,0x18,0x00,0x00,0x10,0x00,0x00,0x00},/*"k",75*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x10,0x20,0x00,0x10,0x20,0x00,0x10,0xE0,0xFF,0x1F,0xF0,0xFF,0x1F,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00},/*"l",76*/
+{0x00,0x04,0x10,0x00,0xFC,0x1F,0x00,0xFC,0x1F,0x00,0x08,0x10,0x00,0x04,0x10,0x00,0xFC,0x1F,0x00,0xF8,0x1F,0x00,0x08,0x10,0x00,0x04,0x10,0x00,0xFC,0x1F,0x00,0xFC,0x1F,0x00,0x00,0x10},/*"m",77*/
+{0x00,0x00,0x00,0x00,0x04,0x10,0x00,0xFC,0x1F,0x00,0xFC,0x1F,0x00,0x08,0x10,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x10,0x00,0xFC,0x1F,0x00,0xF8,0x1F,0x00,0x00,0x10,0x00,0x00,0x00},/*"n",78*/
+{0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0xF0,0x0F,0x00,0x18,0x0C,0x00,0x0C,0x10,0x00,0x04,0x10,0x00,0x04,0x10,0x00,0x0C,0x10,0x00,0x18,0x0C,0x00,0xF0,0x0F,0x00,0xE0,0x03,0x00,0x00,0x00},/*"o",79*/
+{0x00,0x00,0x00,0x00,0x04,0x80,0x00,0xFC,0xFF,0x00,0xFC,0xFF,0x00,0x08,0x88,0x00,0x04,0x90,0x00,0x04,0x10,0x00,0x04,0x10,0x00,0x0C,0x1C,0x00,0xF8,0x0F,0x00,0xF0,0x03,0x00,0x00,0x00},/*"p",80*/
+{0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0xF8,0x0F,0x00,0x1C,0x18,0x00,0x04,0x10,0x00,0x04,0x10,0x00,0x04,0x90,0x00,0x08,0x88,0x00,0xF8,0xFF,0x00,0xFC,0xFF,0x00,0x00,0x80,0x00,0x00,0x00},/*"q",81*/
+{0x00,0x04,0x10,0x00,0x04,0x10,0x00,0x04,0x10,0x00,0xFC,0x1F,0x00,0xFC,0x1F,0x00,0x10,0x10,0x00,0x08,0x10,0x00,0x04,0x10,0x00,0x04,0x00,0x00,0x1C,0x00,0x00,0x18,0x00,0x00,0x00,0x00},/*"r",82*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x1E,0x00,0x78,0x18,0x00,0xCC,0x10,0x00,0xC4,0x10,0x00,0x84,0x11,0x00,0x84,0x19,0x00,0x0C,0x1F,0x00,0x3C,0x0F,0x00,0x00,0x00,0x00,0x00,0x00},/*"s",83*/
+{0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0xFF,0x0F,0xC0,0xFF,0x1F,0x00,0x04,0x10,0x00,0x04,0x10,0x00,0x04,0x10,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00},/*"t",84*/
+{0x00,0x00,0x00,0x00,0x04,0x00,0x00,0xFC,0x0F,0x00,0xFE,0x1F,0x00,0x00,0x18,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x04,0x08,0x00,0xFC,0x1F,0x00,0xFE,0x0F,0x00,0x00,0x08,0x00,0x00,0x00},/*"u",85*/
+{0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x0C,0x00,0x00,0x7C,0x00,0x00,0xC4,0x03,0x00,0x00,0x1F,0x00,0x00,0x0C,0x00,0x80,0x03,0x00,0x74,0x00,0x00,0x0C,0x00,0x00,0x04,0x00,0x00,0x00,0x00},/*"v",86*/
+{0x00,0x04,0x00,0x00,0x1C,0x00,0x00,0xF4,0x01,0x00,0x80,0x1F,0x00,0x04,0x0F,0x00,0xEC,0x00,0x00,0xFC,0x00,0x00,0x84,0x0F,0x00,0x00,0x0F,0x00,0xE4,0x00,0x00,0x1C,0x00,0x00,0x04,0x00},/*"w",87*/
+{0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x04,0x10,0x00,0x0C,0x1C,0x00,0x3C,0x12,0x00,0xE4,0x01,0x00,0xC0,0x01,0x00,0x24,0x13,0x00,0x1C,0x1C,0x00,0x04,0x18,0x00,0x04,0x10,0x00,0x00,0x00},/*"x",88*/
+{0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x04,0xC0,0x00,0x3C,0x80,0x00,0xC4,0x81,0x00,0x00,0x7F,0x00,0x00,0x0E,0x00,0xC4,0x01,0x00,0x3C,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x00,0x00},/*"y",89*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x18,0x00,0x04,0x1E,0x00,0x04,0x13,0x00,0xC4,0x11,0x00,0x74,0x10,0x00,0x1C,0x10,0x00,0x0C,0x18,0x00,0x00,0x0E,0x00,0x00,0x00,0x00,0x00,0x00},/*"z",90*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x28,0x00,0xF8,0xC7,0x3F,0x04,0x00,0x40,0x04,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00},/*"{",91*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"|",92*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x40,0x04,0x00,0x40,0xF8,0xC7,0x3F,0x00,0x28,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"}",93*/
+{0x00,0x00,0x00,0x0C,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x04,0x00,0x00,0x08,0x00,0x00,0x18,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00},/*"~",94*/
 };
 };
 
 
 //新宋体▶→
 //新宋体▶→

+ 84 - 74
pro/ui/menu.c

@@ -65,7 +65,7 @@ typedef struct {
     int         ph_in;
     int         ph_in;
     int         ph_out;
     int         ph_out;
     int         ch_out;
     int         ch_out;
-    int         ch_max;
+    int         ch_out_max;
     menu_data_t menu;
     menu_data_t menu;
     
     
     uint64_t    ms;
     uint64_t    ms;
@@ -87,17 +87,21 @@ static uint64_t get_ms(void)
     gettimeofday(&tv, NULL);
     gettimeofday(&tv, NULL);
     return (uint64_t)(tv.tv_sec)*1000 + (uint64_t)(tv.tv_usec)/1000;
     return (uint64_t)(tv.tv_sec)*1000 + (uint64_t)(tv.tv_usec)/1000;
 }
 }
-static int get_ch_max(void)
+static int get_ch_out_max(void)
 {
 {
     int ch=0;
     int ch=0;
     GlobalPowerManger *tmp;
     GlobalPowerManger *tmp;
     GlobalDeviceManager *dm=get_dm();
     GlobalDeviceManager *dm=get_dm();
     
     
-    if(!thread_is_running(THREAD_ID_POWER) || list_empty(&dm->_globalPowerManger.list)) {
+    if(!thread_is_running(THREAD_ID_POWER)) {
+        printf("777\n");
         return 0;
         return 0;
     }
     }
-    list_for_each_entry(tmp, &dm->_globalPowerManger.list, list)
-    {
+    if(list_empty(&dm->_globalPowerManger.list)) {
+        printf("8888\n");
+        return 0;
+    }
+    list_for_each_entry(tmp, &dm->_globalPowerManger.list, list) {
         ch++;
         ch++;
     }
     }
     return ch;
     return ch;
@@ -120,7 +124,7 @@ static int is_ph3_out(GlobalDeviceManager *dm)
 }
 }
 static int get_input(GlobalDeviceManager *dm, int ph, PowerInfo *info)
 static int get_input(GlobalDeviceManager *dm, int ph, PowerInfo *info)
 {
 {
-    int i=0;
+    int i=-1;
     GlobalTreeACManager *tmp3=NULL;
     GlobalTreeACManager *tmp3=NULL;
 
 
     if (is_ph3_in(dm)) {
     if (is_ph3_in(dm)) {
@@ -144,7 +148,7 @@ static int get_input(GlobalDeviceManager *dm, int ph, PowerInfo *info)
 }
 }
 static int get_output(GlobalDeviceManager *dm, int ch, int ph, PowerInfo *info)
 static int get_output(GlobalDeviceManager *dm, int ch, int ph, PowerInfo *info)
 {
 {
-    int i=0,j=0;
+    int i=-1,j=-1;
     GlobalPowerManger *tmp;
     GlobalPowerManger *tmp;
     GlobalTreeACManager *tmp3 = NULL;
     GlobalTreeACManager *tmp3 = NULL;
     
     
@@ -219,48 +223,56 @@ static void menu_input_paint(menu_handle_t *h, int font1, int font2, int item_h)
 {
 {
     int r;
     int r;
     char tmp[100];
     char tmp[100];
-    PowerInfo *pwr,info;
+    
+    PowerInfo *pwr,info={0};
     GlobalDeviceManager *dm=get_dm();
     GlobalDeviceManager *dm=get_dm();
+    int ph3_in=is_ph3_in(dm);
+
+    pwr = &info;
+    sprintf(tmp, "%s", lang_get_str(h->lang, STR_ID_INPUT));
 
 
     r = get_input(dm, h->ph_in, &info);
     r = get_input(dm, h->ph_in, &info);
     if(r==0) {
     if(r==0) {
-        pwr = &info;
-        if(is_ph3_in(dm)) {
-            h->ph_in = (h->ph_in+1)%3;
+        if(ph3_in) {
+            h->ph_in++;
+            sprintf(tmp, "%s L%d", lang_get_str(h->lang, STR_ID_INPUT), h->ph_in);
         }
         }
+    }
 
 
-        lcd_fill(0);
-        sprintf(tmp, "%s", lang_get_str(h->lang, STR_ID_INPUT));
-        lcd_draw_string(0, 0, LCD_WIDTH, item_h, tmp, font1, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_CENTER, VERTICAL_CENTER);
+    lcd_fill(0);
+    lcd_draw_string(0, 0, LCD_WIDTH, item_h, tmp, font1, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_CENTER, VERTICAL_CENTER);
 
 
-    #ifdef TEXT_ALIGN
-        sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_VOLTAGE), pwr->voltage);
-        lcd_draw_string(0, item_h, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
-        sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_CURRENT), pwr->current);
-        lcd_draw_string(LCD_WIDTH/2, item_h, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+#ifdef TEXT_ALIGN
+    sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_VOLTAGE), pwr->voltage);
+    lcd_draw_string(0, item_h, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+    sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_CURRENT), pwr->current);
+    lcd_draw_string(LCD_WIDTH/2, item_h, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
 
 
-        sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_POWER), pwr->power);
-        lcd_draw_string(0, item_h*2, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
-        sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_FACTOR), pwr->factor);
-        lcd_draw_string(LCD_WIDTH/2, item_h*2, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
-    #else
-        sprintf(tmp, "%s:%0.2f%s:%0.2f", lang_get_str(h->lang, STR_ID_VOLTAGE), pwr->voltage, lang_get_str(h->lang, STR_ID_CURRENT), pwr->current);
-        lcd_draw_string(0, item_h, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+    sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_POWER), pwr->power);
+    lcd_draw_string(0, item_h*2, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+    sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_FACTOR), pwr->factor);
+    lcd_draw_string(LCD_WIDTH/2, item_h*2, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+#else
+    sprintf(tmp, "%s:%0.2f%s:%0.2f", lang_get_str(h->lang, STR_ID_VOLTAGE), pwr->voltage, lang_get_str(h->lang, STR_ID_CURRENT), pwr->current);
+    lcd_draw_string(0, item_h, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
 
 
-        sprintf(tmp, "%s:%0.2f%s:%0.2f", lang_get_str(h->lang, STR_ID_POWER), pwr->power, lang_get_str(h->lang, STR_ID_FACTOR), pwr->factor);
-        lcd_draw_string(0, item_h*2, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
-    #endif
-        sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_CONSUMP), pwr->consumption);
-        lcd_draw_string(0, item_h*3, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+    sprintf(tmp, "%s:%0.2f%s:%0.2f", lang_get_str(h->lang, STR_ID_POWER), pwr->power, lang_get_str(h->lang, STR_ID_FACTOR), pwr->factor);
+    lcd_draw_string(0, item_h*2, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+#endif
+    sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_CONSUMP), pwr->consumption);
+    lcd_draw_string(0, item_h*3, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
 
 
-        lcd_refresh();
-    }
-    else {
-        h->ph_in = 0;
-        if(h->menu.menu_lv==0 && h->uflag&UFLAG_FLIP) {
+    lcd_refresh();
+
+    if(ph3_in) {
+        if(h->ph_in==3) {
+            h->ph_in = 0;
             h->menu.menu_id++;
             h->menu.menu_id++;
         }
         }
     }
     }
+    else {
+        h->menu.menu_id++;
+    }
 }
 }
 static void menu_output_paint(menu_handle_t *h, int font1, int font2, int item_h)
 static void menu_output_paint(menu_handle_t *h, int font1, int font2, int item_h)
 {
 {
@@ -270,28 +282,19 @@ static void menu_output_paint(menu_handle_t *h, int font1, int font2, int item_h
     GlobalDeviceManager *dm=get_dm();
     GlobalDeviceManager *dm=get_dm();
 
 
     pwr = &info;
     pwr = &info;
+    h->ch_out_max = get_ch_out_max();
+    sprintf(tmp, "%s", lang_get_str(h->lang, STR_ID_OUTPUT));
+
     r = get_output(dm, h->ch_out, h->ph_out, &info);
     r = get_output(dm, h->ch_out, h->ph_out, &info);
     if(r==0) {
     if(r==0) {
-        h->ch_out = (h->ch_out+1)%h->ch_max;
-        if(is_ph3_out(dm)) {
-            h->ph_out = (h->ph_out+1)%3;
-        }
-    }
-    else {
-        h->ch_out = 0;
-        if(h->menu.menu_lv==0 && h->uflag&UFLAG_FLIP) {
-            h->menu.menu_id++;
+        h->ch_out++;
+        if(h->ch_out_max>0) {
+            sprintf(tmp, "%s CH%d", lang_get_str(h->lang, STR_ID_OUTPUT), h->ch_out+1);
         }
         }
     }
     }
 
 
     lcd_fill(0);
     lcd_fill(0);
-    if(h->ch_max>0) {
-        sprintf(tmp, "%s CH%d", lang_get_str(h->lang, STR_ID_OUTPUT), h->ch_out+1);
-    }
-    else {
-        sprintf(tmp, "%s", lang_get_str(h->lang, STR_ID_OUTPUT));
-    }
-        lcd_draw_string(0, 0, LCD_WIDTH, item_h, tmp, font1, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_CENTER, VERTICAL_CENTER);
+    lcd_draw_string(0, 0, LCD_WIDTH, item_h, tmp, font1, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_CENTER, VERTICAL_CENTER);
 
 
     char *pon=((pwr->status)?lang_get_str(h->lang, STR_ID_ON):lang_get_str(h->lang, STR_ID_OFF));
     char *pon=((pwr->status)?lang_get_str(h->lang, STR_ID_ON):lang_get_str(h->lang, STR_ID_OFF));
 #ifdef TEXT_ALIGN
 #ifdef TEXT_ALIGN
@@ -305,7 +308,7 @@ static void menu_output_paint(menu_handle_t *h, int font1, int font2, int item_h
     sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_FACTOR), pwr->factor);
     sprintf(tmp, "%s:%0.2f", lang_get_str(h->lang, STR_ID_FACTOR), pwr->factor);
     lcd_draw_string(LCD_WIDTH/2, item_h*2, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
     lcd_draw_string(LCD_WIDTH/2, item_h*2, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
 #else
 #else
-    sprintf(tmp, "%s:%s %s:%0.2f", lang_get_str(h->lang, STR_ID_SWITCH), pon, lang_get_str(h->lang, STR_ID_CURRENT), pwr->current);
+    sprintf(tmp, "%s:%s  %s:%0.2f", lang_get_str(h->lang, STR_ID_SWITCH), pon, lang_get_str(h->lang, STR_ID_CURRENT), pwr->current);
     lcd_draw_string(0, item_h, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
     lcd_draw_string(0, item_h, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
 
 
     sprintf(tmp, "%s:%0.2f%s:%0.2f", lang_get_str(h->lang, STR_ID_POWER), pwr->power, lang_get_str(h->lang, STR_ID_FACTOR), pwr->factor);
     sprintf(tmp, "%s:%0.2f%s:%0.2f", lang_get_str(h->lang, STR_ID_POWER), pwr->power, lang_get_str(h->lang, STR_ID_FACTOR), pwr->factor);
@@ -315,6 +318,11 @@ static void menu_output_paint(menu_handle_t *h, int font1, int font2, int item_h
     lcd_draw_string(0, item_h*3, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
     lcd_draw_string(0, item_h*3, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
 
 
     lcd_refresh();
     lcd_refresh();
+
+    if(h->ch_out==h->ch_out_max) {
+        h->ch_out = 0;
+        h->menu.menu_id++;
+    }
 }
 }
 static void menu_sensor_paint(menu_handle_t *h, int font1, int font2, int item_h)
 static void menu_sensor_paint(menu_handle_t *h, int font1, int font2, int item_h)
 {
 {
@@ -364,7 +372,7 @@ static int menu_modbus_handle(menu_handle_t *h, ModbusInfo_t *pmb, key_val_t *kv
                     h->menu.page[h->menu.menu_id].item_id = MODBUS_ITEM_QUIT;
                     h->menu.page[h->menu.menu_id].item_id = MODBUS_ITEM_QUIT;
                 }
                 }
             }
             }
-            else {
+            else if(h->menu.menu_lv==2) {
                 if(h->menu.page[h->menu.menu_id].item_id==MODBUS_ITEM_ADDR) {         //addr
                 if(h->menu.page[h->menu.menu_id].item_id==MODBUS_ITEM_ADDR) {         //addr
                     if(pmb->addr<CASCADE_MAX) {
                     if(pmb->addr<CASCADE_MAX) {
                         pmb->addr++;
                         pmb->addr++;
@@ -390,7 +398,7 @@ static int menu_modbus_handle(menu_handle_t *h, ModbusInfo_t *pmb, key_val_t *kv
                     h->menu.page[h->menu.menu_id].item_id = 0;
                     h->menu.page[h->menu.menu_id].item_id = 0;
                 }
                 }
             }
             }
-            else {
+            else if(h->menu.menu_lv==2) {
                 if(h->menu.page[h->menu.menu_id].item_id==MODBUS_ITEM_ADDR) {         //addr
                 if(h->menu.page[h->menu.menu_id].item_id==MODBUS_ITEM_ADDR) {         //addr
                     if(pmb->addr) {
                     if(pmb->addr) {
                         pmb->addr--;
                         pmb->addr--;
@@ -416,6 +424,7 @@ static int menu_modbus_handle(menu_handle_t *h, ModbusInfo_t *pmb, key_val_t *kv
                             r = paras_save();
                             r = paras_save();
                         }
                         }
                     }
                     }
+                    h->menu.page[h->menu.menu_id].item_id = 0;
                     h->menu.menu_lv = 0;
                     h->menu.menu_lv = 0;
                     tmr_stop(h);
                     tmr_stop(h);
                 }
                 }
@@ -545,7 +554,7 @@ int menu_init(void)
     h->ph_in = 0;
     h->ph_in = 0;
     h->ph_out = 0;
     h->ph_out = 0;
     h->ch_out = 0;
     h->ch_out = 0;
-    h->ch_max = 0;
+    h->ch_out_max = 0;
     h->menu.menu_id = 0;
     h->menu.menu_id = 0;
     h->menu.menu_lv = 0;
     h->menu.menu_lv = 0;
     for(i=0; i<MENU_MAX; i++) {
     for(i=0; i<MENU_MAX; i++) {
@@ -558,7 +567,6 @@ int menu_init(void)
     beep_init();
     beep_init();
     lcd_init(LCD_WIDTH,LCD_HEIGHT,LCD_COLOR);
     lcd_init(LCD_WIDTH,LCD_HEIGHT,LCD_COLOR);
     lcd_rotate(misc->rotate);
     lcd_rotate(misc->rotate);
-    printf("_________________misc.rotate: %d\n", misc->rotate);
     
     
     return 0;
     return 0;
 }
 }
@@ -577,23 +585,36 @@ int menu_deinit(void)
     return 0;
     return 0;
 }
 }
 
 
+
+static void key_remap(key_val_t *kv, int rotate)
+{
+    key_print(kv);
+    if(rotate==180) {
+        if(kv->key==KEY_UP) {
+            kv->key = KEY_DOWN;
+        }
+        else if(kv->key==KEY_DOWN) {
+            kv->key = KEY_UP;
+        }
+    }
+}
 int menu_handle(void)
 int menu_handle(void)
 {
 {
     int r;
     int r;
     key_val_t kv;
     key_val_t kv;
+    int rotate=lcd_get_rotate();
     int item_h=LCD_HEIGHT/4;
     int item_h=LCD_HEIGHT/4;
     int font1=FONT_12,font2=FONT_12;
     int font1=FONT_12,font2=FONT_12;
     menu_handle_t *h=&mnHandle;
     menu_handle_t *h=&mnHandle;
     
     
-    r = key_get(&kv);
-    key_print(&kv);
+    r = key_get(&kv); key_remap(&kv, rotate);
     switch(kv.key) {
     switch(kv.key) {
         case KEY_OK:
         case KEY_OK:
         {
         {
             if(kv.type==TYPE_SHORT) {
             if(kv.type==TYPE_SHORT) {
                 if(h->menu.menu_lv==0) {
                 if(h->menu.menu_lv==0) {
             #if 0
             #if 0
-                    if(lcd_get_rotate()==0) {
+                    if(rotate==0) {
                         lcd_rotate(180);
                         lcd_rotate(180);
                     }
                     }
                     else {
                     else {
@@ -602,14 +623,13 @@ int menu_handle(void)
             #endif
             #endif
                 }
                 }
             }
             }
-            h->uflag = UFLAG_KEY;
+            h->uflag |= UFLAG_KEY;
         }
         }
         break;
         break;
 
 
         case KEY_UP:
         case KEY_UP:
         {
         {
             led_reset(); beep_reset();
             led_reset(); beep_reset();
-
             if(h->menu.menu_lv==0 && kv.type==TYPE_SHORT) {
             if(h->menu.menu_lv==0 && kv.type==TYPE_SHORT) {
                 if(h->menu.menu_id>0) {
                 if(h->menu.menu_id>0) {
                     h->menu.menu_id--;
                     h->menu.menu_id--;
@@ -618,7 +638,7 @@ int menu_handle(void)
                     h->menu.menu_id = MENU_MAX-1;
                     h->menu.menu_id = MENU_MAX-1;
                 }
                 }
             }
             }
-            h->uflag = UFLAG_KEY;
+            h->uflag |= UFLAG_KEY;
         }
         }
         break;
         break;
 
 
@@ -633,7 +653,7 @@ int menu_handle(void)
                     h->menu.menu_id = 0;
                     h->menu.menu_id = 0;
                 }
                 }
             }
             }
-            h->uflag = UFLAG_KEY;
+            h->uflag |= UFLAG_KEY;
         }
         }
         break;
         break;
 
 
@@ -643,12 +663,6 @@ int menu_handle(void)
             if(h->fliptime>0) {
             if(h->fliptime>0) {
                 if(h->menu.menu_lv==0) {
                 if(h->menu.menu_lv==0) {
                     if((get_ms()-h->ms)>=h->fliptime) {
                     if((get_ms()-h->ms)>=h->fliptime) {
-                        if(h->menu.menu_id<MENU_MAX-1) {
-                            h->menu.menu_id++;
-                        }
-                        else {
-                            h->menu.menu_id = MENU_SYSTEM;
-                        }
                         h->uflag = UFLAG_FLIP;
                         h->uflag = UFLAG_FLIP;
                         h->ms = get_ms();
                         h->ms = get_ms();
                     }
                     }
@@ -663,10 +677,6 @@ int menu_handle(void)
     if(h->uflag==0) {
     if(h->uflag==0) {
         return -1;
         return -1;
     }
     }
-    
-    if(h->ch_max==0) {
-        h->ch_max = get_ch_max();
-    }
 
 
     switch(h->menu.menu_id) {
     switch(h->menu.menu_id) {
         case MENU_SYSTEM:
         case MENU_SYSTEM:

+ 3 - 3
pro/ui/timer.c

@@ -81,7 +81,7 @@ int timer_deinit(int h)
     int r;
     int r;
     timer_handle_t *th=(timer_handle_t*)h;
     timer_handle_t *th=(timer_handle_t*)h;
 
 
-    if(!th || !th->inited) {
+    if(h==-1 || !th->inited) {
         return -1;
         return -1;
     }
     }
     r = timer_delete(th->tid);
     r = timer_delete(th->tid);
@@ -97,7 +97,7 @@ int timer_start(int h, int t, int times, timer_fn_t fn, void *arg)
     int r;
     int r;
     timer_handle_t *th=(timer_handle_t*)h;
     timer_handle_t *th=(timer_handle_t*)h;
     
     
-    if(!th || !th->inited) {
+    if(h==-1 || !th->inited) {
         return -1;
         return -1;
     }
     }
     set_time(th, 0, 0);
     set_time(th, 0, 0);
@@ -116,7 +116,7 @@ int timer_stop(int h)
     int r;
     int r;
     timer_handle_t *th=(timer_handle_t*)h;
     timer_handle_t *th=(timer_handle_t*)h;
     
     
-    if(!th || !th->inited) {
+    if(h==-1 || !th->inited) {
         return -1;
         return -1;
     }
     }
     
     

+ 1 - 1
pro/ui/ui.c

@@ -52,7 +52,7 @@ int ui_init(void)
     ui_handle_t *h=&uiHandle;
     ui_handle_t *h=&uiHandle;
 
 
 #ifdef USE_UI
 #ifdef USE_UI
-    rm_qt();
+    //rm_qt();
     thread_start(THREAD_ID_UI, ui_thread, h);
     thread_start(THREAD_ID_UI, ui_thread, h);
 #endif
 #endif