继续调整ui接口

pro/ui/beep.c

@@ -2,6 +2,9 @@
 #include "timer.h"
 #include "elog.h"
 #include "beep.h"
+#include <stdio.h>
+#include <sys/time.h>
+
 
 #if 1
     #define LOGD  log_d
@@ -26,8 +29,15 @@ typedef struct {
     int             tmr;
     uint32_t        cnt;
     beep_para_t     para;
+    int             stop_level;
 }beep_handle_t;
 static beep_handle_t bpHandle={0};
+static uint64_t get_ms(void)
+{
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (uint64_t)(tv.tv_sec)*1000 + (uint64_t)(tv.tv_usec)/1000;
+}
 
 static void tmr_handler(void *arg, int last)
 {
@@ -36,19 +46,21 @@ static void tmr_handler(void *arg, int last)
     h->cnt++;
     if(h->cnt%2) {
         if(h->para.off_ms) {
-            gpio_set(h->io, BEEP_ON_LEVEL);
-            timer_setup(h->tmr, h->para.off_ms, 0);
+            //gpio_set(h->io, BEEP_ON_LEVEL);
+            //timer_setup(h->tmr, h->para.off_ms, 0);
         }
     }
     else {
         if(h->para.on_ms) {
-            gpio_set(h->io, BEEP_OFF_LEVEL);
-            timer_setup(h->tmr, h->para.on_ms, 0);
+            //gpio_set(h->io, BEEP_OFF_LEVEL);
+            //timer_setup(h->tmr, h->para.off_ms, 0);
         }
     }
+    printf("___cnt: %d, %lld\n", h->cnt, get_ms());
     
     if(last) {
         timer_stop(h->tmr);
+        gpio_set(h->io, h->stop_level);
     }
 }
 /////////////////////////////////////////////
@@ -62,7 +74,7 @@ int beep_init(void)
     gpio_set(h->io, BEEP_OFF_LEVEL);
     h->tmr = -1;
 
-    //beep_para_t para={300, 300, 10};
+    //beep_para_t para={1000, 1000, 10};
     //beep_set_ex(&para);
 
     return 0;
@@ -91,10 +103,10 @@ int beep_set(int mode)
     }
     h->cnt = 0;
     h->para = beep_para[mode];
-    if(h->para.on_ms>0 && h->para.off_ms>0) {
+    if(h->para.on_ms>0) {
         h->para.times *=2;
+        h->tmr = timer_start(h->para.on_ms, h->para.off_ms, h->para.times, tmr_handler, h);
     }
-    h->tmr = timer_start(h->para.on_ms, 0, h->para.times, tmr_handler, h);
     
     return 0;
 }
@@ -111,12 +123,21 @@ int beep_set_ex(beep_para_t *para)
     if(h->tmr!=-1) {
         timer_stop(h->tmr);
     }
+    
     h->cnt = 0;
     h->para = *para;
-    if(h->para.on_ms>0 && h->para.off_ms>0) {
-        h->para.times *=2;
+    if(h->para.on_ms>0) {
+        h->stop_level = BEEP_OFF_LEVEL;
+        if(h->para.off_ms>0) {
+            h->para.times *= 2;
+            h->tmr = timer_start(h->para.on_ms, h->para.off_ms, h->para.times, tmr_handler, h);
+        }
+        else {
+            h->para.times = 1;
+            gpio_set(h->io, BEEP_ON_LEVEL);
+            h->tmr = timer_start(h->para.on_ms*para->times, 0, 1, tmr_handler, h);
+        }
     }
-    h->tmr = timer_start(h->para.on_ms, 0, h->para.times, tmr_handler, h);
     
     return 0;
 }

pro/ui/font.c

@@ -396,148 +396,151 @@ static const uint8_t font_en_2412[95][36] =
 {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*/
 };
 
-//新宋体
-static const char *font_cn_str="输出入通道状态率耗电压流量功率因素温湿度数据版本日期时间地址模式保存退出取消设置开关主从";
+//新宋体▶→
+static const char *font_cn_str="→输出入通道状态率耗电压流量功率因素温湿度数据版本日期时间地址模式保存退出取消设置开关主从";
 static const uint8_t font_cn_1212[][24] =
 {
-{0x34,0x01,0x2C,0x01,0xF7,0x0F,0xA4,0x00,0xE8,0x0F,0xA4,0x02,0xEA,0x0F,0x09,0x00,0xCA,0x03,0x04,0x08,0xE8,0x0F,0x00,0x00},/*"输",0*/
-{0x80,0x07,0x1E,0x04,0x10,0x04,0x10,0x04,0x10,0x04,0xFF,0x07,0x10,0x04,0x10,0x04,0x10,0x04,0x1E,0x04,0x80,0x0F,0x00,0x00},/*"出",1*/
-{0x00,0x08,0x00,0x04,0x01,0x02,0x81,0x01,0x72,0x00,0x0C,0x00,0x70,0x00,0x80,0x01,0x00,0x02,0x00,0x04,0x00,0x08,0x00,0x00},/*"入",2*/
-{0x11,0x08,0xF2,0x07,0x00,0x08,0xF9,0x0B,0xA9,0x08,0xAB,0x08,0xFD,0x0B,0xAD,0x08,0xAB,0x0A,0xF8,0x0B,0x00,0x08,0x00,0x00},/*"通",3*/
-{0x10,0x08,0x11,0x04,0xF2,0x03,0x00,0x04,0xFA,0x0B,0xAB,0x0A,0xAE,0x0A,0xAA,0x0A,0xAA,0x0A,0xAB,0x0A,0xFA,0x0B,0x00,0x00},/*"道",4*/
-{0x04,0x01,0x88,0x00,0xFF,0x0F,0x00,0x00,0x10,0x08,0x10,0x06,0xD0,0x01,0x3F,0x00,0xD0,0x01,0x12,0x06,0x14,0x08,0x00,0x00},/*"状",5*/
-{0x44,0x04,0x44,0x03,0x24,0x00,0x14,0x07,0x0C,0x08,0xA7,0x08,0x4C,0x0B,0x14,0x08,0x24,0x0C,0x44,0x01,0x44,0x06,0x00,0x00},/*"态",6*/
-{0x02,0x02,0x8A,0x02,0x52,0x02,0x9A,0x02,0xD6,0x02,0xB3,0x0F,0xD2,0x02,0x8A,0x02,0x52,0x02,0x8A,0x02,0x02,0x02,0x00,0x00},/*"率",7*/
-{0x44,0x02,0x54,0x01,0xFF,0x0F,0x54,0x01,0x44,0x02,0x92,0x00,0x92,0x00,0xFE,0x07,0x49,0x08,0x49,0x08,0x40,0x0E,0x00,0x00},/*"耗",8*/
-{0xFC,0x03,0x24,0x01,0x24,0x01,0x24,0x01,0xFF,0x07,0x24,0x09,0x24,0x09,0x24,0x09,0xFC,0x09,0x00,0x08,0x00,0x0E,0x00,0x00},/*"电",9*/
-{0x00,0x08,0xFE,0x07,0x02,0x08,0x42,0x08,0x42,0x08,0x42,0x08,0xFA,0x0F,0x42,0x08,0x42,0x09,0x42,0x0A,0x02,0x08,0x00,0x00},/*"压",10*/
-{0x22,0x04,0x44,0x02,0x00,0x08,0x24,0x04,0xB4,0x03,0x2C,0x00,0xA5,0x0F,0x26,0x00,0xA4,0x07,0x34,0x08,0x64,0x0E,0x00,0x00},/*"流",11*/
-{0x08,0x08,0xFF,0x0A,0xA9,0x0A,0xA9,0x0A,0xA9,0x0A,0xFB,0x0F,0xAD,0x0A,0xA9,0x0A,0xA9,0x0A,0xFF,0x0A,0x08,0x08,0x00,0x00},/*"量",12*/
-{0x04,0x02,0x04,0x02,0xFC,0x01,0x04,0x09,0x04,0x05,0x08,0x03,0xFF,0x00,0x08,0x00,0x08,0x08,0x08,0x08,0xF8,0x07,0x00,0x00},/*"功",13*/
-{0x02,0x02,0x8A,0x02,0x52,0x02,0x9A,0x02,0xD6,0x02,0xB3,0x0F,0xD2,0x02,0x8A,0x02,0x52,0x02,0x8A,0x02,0x02,0x02,0x00,0x00},/*"率",14*/
-{0xFF,0x0F,0x01,0x04,0x11,0x05,0x91,0x04,0x51,0x04,0x3D,0x04,0x51,0x04,0x91,0x04,0x11,0x05,0x01,0x04,0xFF,0x0F,0x00,0x00},/*"因",15*/
-{0x22,0x00,0x2A,0x0A,0xAA,0x06,0xEA,0x02,0xAA,0x0B,0xBF,0x0E,0xAA,0x02,0x6A,0x02,0x2A,0x07,0x2A,0x0A,0x22,0x00,0x00,0x00},/*"素",16*/
-{0x22,0x04,0x44,0x02,0x00,0x09,0xC0,0x0F,0x5F,0x08,0xD5,0x0F,0x55,0x08,0xD5,0x0F,0x5F,0x08,0xC0,0x0F,0x00,0x08,0x00,0x00},/*"温",17*/
-{0x11,0x04,0x22,0x02,0x80,0x08,0x3E,0x09,0x2A,0x08,0xEA,0x0F,0x2A,0x08,0xEA,0x0F,0x2A,0x08,0x3E,0x09,0x80,0x08,0x00,0x00},/*"湿",18*/
-{0x00,0x08,0xFE,0x07,0x0A,0x00,0x8A,0x08,0xBE,0x09,0xAA,0x0A,0xAB,0x04,0xAA,0x04,0xBE,0x0A,0x8A,0x09,0x0A,0x08,0x00,0x00},/*"度",19*/
-{0x48,0x09,0x2A,0x0B,0x98,0x05,0x7F,0x05,0x28,0x0B,0x4A,0x00,0x10,0x08,0xEF,0x05,0x08,0x02,0xF8,0x05,0x08,0x08,0x00,0x00},/*"数",20*/
-{0x88,0x00,0x88,0x08,0xFF,0x0F,0x48,0x08,0x00,0x06,0xFE,0x01,0xAA,0x0F,0xAA,0x04,0xFA,0x04,0xAA,0x04,0xAE,0x0F,0x00,0x00},/*"据",21*/
-{0x00,0x08,0xFE,0x07,0x90,0x00,0x9F,0x0F,0x10,0x04,0xFE,0x03,0x12,0x08,0xF2,0x05,0x12,0x02,0x91,0x05,0x71,0x08,0x00,0x00},/*"版",22*/
-{0x04,0x02,0x04,0x01,0x84,0x02,0x64,0x02,0x14,0x02,0xFF,0x0F,0x14,0x02,0x64,0x02,0x84,0x02,0x04,0x01,0x04,0x02,0x00,0x00},/*"本",23*/
-{0x00,0x00,0xFE,0x0F,0x22,0x04,0x22,0x04,0x22,0x04,0x22,0x04,0x22,0x04,0x22,0x04,0x22,0x04,0xFE,0x0F,0x00,0x00,0x00,0x00},/*"日",24*/
-{0x04,0x09,0xFF,0x05,0x54,0x01,0x54,0x01,0xFF,0x05,0x04,0x09,0x00,0x08,0xFE,0x07,0x92,0x00,0x92,0x08,0xFE,0x0F,0x00,0x00},/*"期",25*/
-{0xFE,0x07,0x22,0x02,0x22,0x02,0xFE,0x07,0x00,0x00,0x08,0x00,0x48,0x00,0x88,0x09,0x08,0x08,0xFF,0x0F,0x08,0x00,0x00,0x00},/*"时",26*/
-{0x00,0x00,0xF9,0x0F,0x02,0x00,0xF8,0x03,0x49,0x02,0x49,0x02,0x49,0x02,0x49,0x02,0xF9,0x0B,0x01,0x08,0xFF,0x0F,0x00,0x00},/*"间",27*/
-{0x10,0x04,0x10,0x04,0xFF,0x03,0x10,0x02,0x20,0x00,0xFC,0x07,0x10,0x08,0xFF,0x09,0x08,0x08,0x84,0x08,0xFC,0x0E,0x00,0x00},/*"地",28*/
-{0x10,0x04,0x10,0x04,0xFF,0x03,0x10,0x02,0x00,0x08,0xF8,0x0F,0x00,0x08,0x00,0x08,0xFF,0x0F,0x10,0x08,0x10,0x08,0x00,0x00},/*"址",29*/
-{0x88,0x00,0x68,0x00,0xFF,0x0F,0x48,0x00,0x02,0x0A,0xFA,0x0A,0xAF,0x06,0xAA,0x03,0xAF,0x06,0xFA,0x0A,0x02,0x0A,0x00,0x00},/*"模",30*/
-{0x08,0x08,0x48,0x08,0x48,0x08,0xC8,0x07,0x48,0x04,0x48,0x04,0x08,0x04,0xFF,0x00,0x08,0x03,0x09,0x04,0x0A,0x0E,0x00,0x00},/*"式",31*/
-{0x20,0x00,0x10,0x00,0xFC,0x0F,0x03,0x00,0x40,0x04,0x5E,0x02,0x52,0x01,0xF2,0x0F,0x52,0x01,0x5E,0x02,0x40,0x04,0x00,0x00},/*"保",32*/
-{0x84,0x00,0x44,0x00,0xF4,0x0F,0x0C,0x00,0x87,0x00,0x94,0x00,0x94,0x08,0xD4,0x0F,0xB4,0x00,0x94,0x00,0x84,0x00,0x00,0x00},/*"存",33*/
-{0x10,0x08,0x11,0x04,0xF2,0x03,0x00,0x04,0xFF,0x0B,0x15,0x09,0xB5,0x08,0x55,0x08,0x95,0x08,0x5F,0x0B,0x20,0x08,0x00,0x00},/*"退",34*/
-{0x80,0x07,0x1E,0x04,0x10,0x04,0x10,0x04,0x10,0x04,0xFF,0x07,0x10,0x04,0x10,0x04,0x10,0x04,0x1E,0x04,0x80,0x0F,0x00,0x00},/*"出",35*/
-{0x02,0x02,0xFE,0x03,0x52,0x02,0x52,0x02,0xFE,0x0F,0x02,0x01,0x04,0x08,0xFC,0x04,0x04,0x03,0xFC,0x04,0x00,0x08,0x00,0x00},/*"取",36*/
-{0x10,0x04,0x22,0x02,0x04,0x01,0x00,0x00,0xF2,0x0F,0x54,0x01,0x50,0x01,0x5F,0x01,0x50,0x01,0x54,0x09,0xF2,0x0F,0x00,0x00},/*"消",37*/
-{0x10,0x00,0x11,0x00,0xF2,0x07,0x00,0x02,0x50,0x08,0xCF,0x08,0x41,0x05,0x41,0x02,0x4F,0x05,0xD0,0x08,0x10,0x08,0x00,0x00},/*"设",38*/
-{0x10,0x08,0x17,0x08,0xD5,0x0F,0x55,0x08,0x57,0x08,0x7D,0x0E,0x57,0x08,0x55,0x08,0xD5,0x0F,0x17,0x08,0x10,0x08,0x00,0x00},/*"置",39*/
-{0x40,0x00,0x42,0x08,0x42,0x06,0xFE,0x01,0x42,0x00,0x42,0x00,0x42,0x00,0xFE,0x0F,0x42,0x00,0x42,0x00,0x40,0x00,0x00,0x00},/*"开",40*/
-{0x40,0x08,0x48,0x08,0x49,0x04,0x4A,0x02,0x48,0x01,0xF8,0x00,0x48,0x01,0x4A,0x02,0x49,0x04,0x48,0x08,0x40,0x08,0x00,0x00},/*"关",41*/
-{0x00,0x08,0x88,0x08,0x88,0x08,0x88,0x08,0x89,0x08,0xFA,0x0F,0x88,0x08,0x88,0x08,0x88,0x08,0x88,0x08,0x00,0x08,0x00,0x00},/*"主",42*/
-{0x00,0x08,0x00,0x06,0xE0,0x01,0x1F,0x00,0xE0,0x09,0x00,0x06,0xC0,0x01,0x3F,0x00,0xC0,0x01,0x00,0x06,0x00,0x08,0x00,0x00},/*"从",43*/
+{0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0xA8,0x00,0x70,0x00,0x70,0x00,0x20,0x00,0x20,0x00,0x00,0x00},/*"→",0*/
+{0x34,0x01,0x2C,0x01,0xF7,0x0F,0xA4,0x00,0xE8,0x0F,0xA4,0x02,0xEA,0x0F,0x09,0x00,0xCA,0x03,0x04,0x08,0xE8,0x0F,0x00,0x00},/*"输",1*/
+{0x80,0x07,0x1E,0x04,0x10,0x04,0x10,0x04,0x10,0x04,0xFF,0x07,0x10,0x04,0x10,0x04,0x10,0x04,0x1E,0x04,0x80,0x0F,0x00,0x00},/*"出",2*/
+{0x00,0x08,0x00,0x04,0x01,0x02,0x81,0x01,0x72,0x00,0x0C,0x00,0x70,0x00,0x80,0x01,0x00,0x02,0x00,0x04,0x00,0x08,0x00,0x00},/*"入",3*/
+{0x11,0x08,0xF2,0x07,0x00,0x08,0xF9,0x0B,0xA9,0x08,0xAB,0x08,0xFD,0x0B,0xAD,0x08,0xAB,0x0A,0xF8,0x0B,0x00,0x08,0x00,0x00},/*"通",4*/
+{0x10,0x08,0x11,0x04,0xF2,0x03,0x00,0x04,0xFA,0x0B,0xAB,0x0A,0xAE,0x0A,0xAA,0x0A,0xAA,0x0A,0xAB,0x0A,0xFA,0x0B,0x00,0x00},/*"道",5*/
+{0x04,0x01,0x88,0x00,0xFF,0x0F,0x00,0x00,0x10,0x08,0x10,0x06,0xD0,0x01,0x3F,0x00,0xD0,0x01,0x12,0x06,0x14,0x08,0x00,0x00},/*"状",6*/
+{0x44,0x04,0x44,0x03,0x24,0x00,0x14,0x07,0x0C,0x08,0xA7,0x08,0x4C,0x0B,0x14,0x08,0x24,0x0C,0x44,0x01,0x44,0x06,0x00,0x00},/*"态",7*/
+{0x02,0x02,0x8A,0x02,0x52,0x02,0x9A,0x02,0xD6,0x02,0xB3,0x0F,0xD2,0x02,0x8A,0x02,0x52,0x02,0x8A,0x02,0x02,0x02,0x00,0x00},/*"率",8*/
+{0x44,0x02,0x54,0x01,0xFF,0x0F,0x54,0x01,0x44,0x02,0x92,0x00,0x92,0x00,0xFE,0x07,0x49,0x08,0x49,0x08,0x40,0x0E,0x00,0x00},/*"耗",9*/
+{0xFC,0x03,0x24,0x01,0x24,0x01,0x24,0x01,0xFF,0x07,0x24,0x09,0x24,0x09,0x24,0x09,0xFC,0x09,0x00,0x08,0x00,0x0E,0x00,0x00},/*"电",10*/
+{0x00,0x08,0xFE,0x07,0x02,0x08,0x42,0x08,0x42,0x08,0x42,0x08,0xFA,0x0F,0x42,0x08,0x42,0x09,0x42,0x0A,0x02,0x08,0x00,0x00},/*"压",11*/
+{0x22,0x04,0x44,0x02,0x00,0x08,0x24,0x04,0xB4,0x03,0x2C,0x00,0xA5,0x0F,0x26,0x00,0xA4,0x07,0x34,0x08,0x64,0x0E,0x00,0x00},/*"流",12*/
+{0x08,0x08,0xFF,0x0A,0xA9,0x0A,0xA9,0x0A,0xA9,0x0A,0xFB,0x0F,0xAD,0x0A,0xA9,0x0A,0xA9,0x0A,0xFF,0x0A,0x08,0x08,0x00,0x00},/*"量",13*/
+{0x04,0x02,0x04,0x02,0xFC,0x01,0x04,0x09,0x04,0x05,0x08,0x03,0xFF,0x00,0x08,0x00,0x08,0x08,0x08,0x08,0xF8,0x07,0x00,0x00},/*"功",14*/
+{0x02,0x02,0x8A,0x02,0x52,0x02,0x9A,0x02,0xD6,0x02,0xB3,0x0F,0xD2,0x02,0x8A,0x02,0x52,0x02,0x8A,0x02,0x02,0x02,0x00,0x00},/*"率",15*/
+{0xFF,0x0F,0x01,0x04,0x11,0x05,0x91,0x04,0x51,0x04,0x3D,0x04,0x51,0x04,0x91,0x04,0x11,0x05,0x01,0x04,0xFF,0x0F,0x00,0x00},/*"因",16*/
+{0x22,0x00,0x2A,0x0A,0xAA,0x06,0xEA,0x02,0xAA,0x0B,0xBF,0x0E,0xAA,0x02,0x6A,0x02,0x2A,0x07,0x2A,0x0A,0x22,0x00,0x00,0x00},/*"素",17*/
+{0x22,0x04,0x44,0x02,0x00,0x09,0xC0,0x0F,0x5F,0x08,0xD5,0x0F,0x55,0x08,0xD5,0x0F,0x5F,0x08,0xC0,0x0F,0x00,0x08,0x00,0x00},/*"温",18*/
+{0x11,0x04,0x22,0x02,0x80,0x08,0x3E,0x09,0x2A,0x08,0xEA,0x0F,0x2A,0x08,0xEA,0x0F,0x2A,0x08,0x3E,0x09,0x80,0x08,0x00,0x00},/*"湿",19*/
+{0x00,0x08,0xFE,0x07,0x0A,0x00,0x8A,0x08,0xBE,0x09,0xAA,0x0A,0xAB,0x04,0xAA,0x04,0xBE,0x0A,0x8A,0x09,0x0A,0x08,0x00,0x00},/*"度",20*/
+{0x48,0x09,0x2A,0x0B,0x98,0x05,0x7F,0x05,0x28,0x0B,0x4A,0x00,0x10,0x08,0xEF,0x05,0x08,0x02,0xF8,0x05,0x08,0x08,0x00,0x00},/*"数",21*/
+{0x88,0x00,0x88,0x08,0xFF,0x0F,0x48,0x08,0x00,0x06,0xFE,0x01,0xAA,0x0F,0xAA,0x04,0xFA,0x04,0xAA,0x04,0xAE,0x0F,0x00,0x00},/*"据",22*/
+{0x00,0x08,0xFE,0x07,0x90,0x00,0x9F,0x0F,0x10,0x04,0xFE,0x03,0x12,0x08,0xF2,0x05,0x12,0x02,0x91,0x05,0x71,0x08,0x00,0x00},/*"版",23*/
+{0x04,0x02,0x04,0x01,0x84,0x02,0x64,0x02,0x14,0x02,0xFF,0x0F,0x14,0x02,0x64,0x02,0x84,0x02,0x04,0x01,0x04,0x02,0x00,0x00},/*"本",24*/
+{0x00,0x00,0xFE,0x0F,0x22,0x04,0x22,0x04,0x22,0x04,0x22,0x04,0x22,0x04,0x22,0x04,0x22,0x04,0xFE,0x0F,0x00,0x00,0x00,0x00},/*"日",25*/
+{0x04,0x09,0xFF,0x05,0x54,0x01,0x54,0x01,0xFF,0x05,0x04,0x09,0x00,0x08,0xFE,0x07,0x92,0x00,0x92,0x08,0xFE,0x0F,0x00,0x00},/*"期",26*/
+{0xFE,0x07,0x22,0x02,0x22,0x02,0xFE,0x07,0x00,0x00,0x08,0x00,0x48,0x00,0x88,0x09,0x08,0x08,0xFF,0x0F,0x08,0x00,0x00,0x00},/*"时",27*/
+{0x00,0x00,0xF9,0x0F,0x02,0x00,0xF8,0x03,0x49,0x02,0x49,0x02,0x49,0x02,0x49,0x02,0xF9,0x0B,0x01,0x08,0xFF,0x0F,0x00,0x00},/*"间",28*/
+{0x10,0x04,0x10,0x04,0xFF,0x03,0x10,0x02,0x20,0x00,0xFC,0x07,0x10,0x08,0xFF,0x09,0x08,0x08,0x84,0x08,0xFC,0x0E,0x00,0x00},/*"地",29*/
+{0x10,0x04,0x10,0x04,0xFF,0x03,0x10,0x02,0x00,0x08,0xF8,0x0F,0x00,0x08,0x00,0x08,0xFF,0x0F,0x10,0x08,0x10,0x08,0x00,0x00},/*"址",30*/
+{0x88,0x00,0x68,0x00,0xFF,0x0F,0x48,0x00,0x02,0x0A,0xFA,0x0A,0xAF,0x06,0xAA,0x03,0xAF,0x06,0xFA,0x0A,0x02,0x0A,0x00,0x00},/*"模",31*/
+{0x08,0x08,0x48,0x08,0x48,0x08,0xC8,0x07,0x48,0x04,0x48,0x04,0x08,0x04,0xFF,0x00,0x08,0x03,0x09,0x04,0x0A,0x0E,0x00,0x00},/*"式",32*/
+{0x20,0x00,0x10,0x00,0xFC,0x0F,0x03,0x00,0x40,0x04,0x5E,0x02,0x52,0x01,0xF2,0x0F,0x52,0x01,0x5E,0x02,0x40,0x04,0x00,0x00},/*"保",33*/
+{0x84,0x00,0x44,0x00,0xF4,0x0F,0x0C,0x00,0x87,0x00,0x94,0x00,0x94,0x08,0xD4,0x0F,0xB4,0x00,0x94,0x00,0x84,0x00,0x00,0x00},/*"存",34*/
+{0x10,0x08,0x11,0x04,0xF2,0x03,0x00,0x04,0xFF,0x0B,0x15,0x09,0xB5,0x08,0x55,0x08,0x95,0x08,0x5F,0x0B,0x20,0x08,0x00,0x00},/*"退",35*/
+{0x80,0x07,0x1E,0x04,0x10,0x04,0x10,0x04,0x10,0x04,0xFF,0x07,0x10,0x04,0x10,0x04,0x10,0x04,0x1E,0x04,0x80,0x0F,0x00,0x00},/*"出",36*/
+{0x02,0x02,0xFE,0x03,0x52,0x02,0x52,0x02,0xFE,0x0F,0x02,0x01,0x04,0x08,0xFC,0x04,0x04,0x03,0xFC,0x04,0x00,0x08,0x00,0x00},/*"取",37*/
+{0x10,0x04,0x22,0x02,0x04,0x01,0x00,0x00,0xF2,0x0F,0x54,0x01,0x50,0x01,0x5F,0x01,0x50,0x01,0x54,0x09,0xF2,0x0F,0x00,0x00},/*"消",38*/
+{0x10,0x00,0x11,0x00,0xF2,0x07,0x00,0x02,0x50,0x08,0xCF,0x08,0x41,0x05,0x41,0x02,0x4F,0x05,0xD0,0x08,0x10,0x08,0x00,0x00},/*"设",39*/
+{0x10,0x08,0x17,0x08,0xD5,0x0F,0x55,0x08,0x57,0x08,0x7D,0x0E,0x57,0x08,0x55,0x08,0xD5,0x0F,0x17,0x08,0x10,0x08,0x00,0x00},/*"置",40*/
+{0x40,0x00,0x42,0x08,0x42,0x06,0xFE,0x01,0x42,0x00,0x42,0x00,0x42,0x00,0xFE,0x0F,0x42,0x00,0x42,0x00,0x40,0x00,0x00,0x00},/*"开",41*/
+{0x40,0x08,0x48,0x08,0x49,0x04,0x4A,0x02,0x48,0x01,0xF8,0x00,0x48,0x01,0x4A,0x02,0x49,0x04,0x48,0x08,0x40,0x08,0x00,0x00},/*"关",42*/
+{0x00,0x08,0x88,0x08,0x88,0x08,0x88,0x08,0x89,0x08,0xFA,0x0F,0x88,0x08,0x88,0x08,0x88,0x08,0x88,0x08,0x00,0x08,0x00,0x00},/*"主",43*/
+{0x00,0x08,0x00,0x06,0xE0,0x01,0x1F,0x00,0xE0,0x09,0x00,0x06,0xC0,0x01,0x3F,0x00,0xC0,0x01,0x00,0x06,0x00,0x08,0x00,0x00},/*"从",44*/
 };
 static const uint8_t font_cn_1616[][32] =
 {
-{0x88,0x09,0x68,0x19,0x1F,0x09,0xC8,0xFF,0x08,0x05,0x10,0x00,0xC8,0xFF,0x54,0x12,0x52,0x92,0xD1,0xFF,0x12,0x00,0x94,0x5F,0x08,0x80,0xD0,0x7F,0x10,0x00,0x00,0x00},/*"输",0*/
-{0x00,0x00,0x00,0x7C,0x7C,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xFF,0x7F,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xFC,0x40,0x00,0xFC,0x00,0x00,0x00,0x00},/*"出",1*/
-{0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x10,0x00,0x0C,0x01,0x03,0xE2,0x00,0x1C,0x00,0xE0,0x00,0x00,0x03,0x00,0x0C,0x00,0x30,0x00,0x40,0x00,0x80,0x00,0x80,0x00,0x00},/*"入",2*/
-{0x40,0x80,0x42,0x40,0xCC,0x3F,0x00,0x40,0x00,0x80,0xE2,0xFF,0x22,0x89,0x2A,0x89,0x2A,0x89,0xF2,0xBF,0x2A,0x89,0x26,0xA9,0x22,0xC9,0xE0,0xBF,0x00,0x80,0x00,0x00},/*"通",3*/
-{0x40,0x00,0x40,0x40,0x42,0x20,0xCC,0x1F,0x00,0x20,0x08,0x40,0xE9,0x5F,0xAA,0x4A,0xB8,0x4A,0xA8,0x4A,0xA8,0x4A,0xAA,0x4A,0xE9,0x5F,0x08,0x40,0x00,0x40,0x00,0x00},/*"道",4*/
-{0x00,0x04,0x08,0x04,0x30,0x02,0x00,0x01,0xFF,0xFF,0x20,0x80,0x20,0x40,0x20,0x30,0x20,0x0E,0xFF,0x01,0x20,0x06,0x20,0x18,0x22,0x20,0x2C,0x40,0x20,0x80,0x00,0x00},/*"状",5*/
-{0x00,0x41,0x04,0x39,0x84,0x00,0x84,0x00,0x44,0x3C,0x24,0x40,0x54,0x40,0x8F,0x42,0x14,0x4C,0x24,0x40,0x44,0x40,0x84,0x70,0x84,0x04,0x04,0x09,0x00,0x31,0x00,0x00},/*"态",6*/
-{0x00,0x08,0x14,0x09,0xA4,0x08,0x44,0x08,0x24,0x09,0x34,0x09,0xAD,0x09,0x66,0xFD,0x24,0x09,0x94,0x09,0x04,0x0B,0x44,0x08,0xA4,0x08,0x14,0x09,0x00,0x08,0x00,0x00},/*"率",7*/
-{0x88,0x20,0xA8,0x18,0xA8,0x06,0xFF,0xFF,0xA8,0x02,0xA8,0x0C,0x88,0x00,0x00,0x04,0x44,0x04,0x44,0x04,0xFC,0x7F,0x22,0x82,0x23,0x82,0x22,0x82,0x00,0xF2,0x00,0x00},/*"耗",8*/
-{0x00,0x00,0x00,0x00,0xF8,0x1F,0x88,0x08,0x88,0x08,0x88,0x08,0x88,0x08,0xFF,0x7F,0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88,0xF8,0x9F,0x00,0x80,0x00,0xF0,0x00,0x00},/*"电",9*/
-{0x00,0x80,0x00,0x60,0xFE,0x1F,0x02,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0xFA,0x7F,0x82,0x40,0x82,0x40,0x82,0x44,0x82,0x58,0x82,0x40,0x02,0x40,0x00,0x00},/*"压",10*/
-{0x10,0x04,0x60,0x04,0x02,0x7E,0x8C,0x01,0x00,0x80,0x44,0x40,0x64,0x3E,0x54,0x00,0x4D,0x00,0x46,0xFE,0x44,0x00,0x54,0x00,0x64,0x7E,0xC4,0x80,0x04,0xE0,0x00,0x00},/*"流",11*/
-{0x20,0x00,0x20,0x80,0x20,0x80,0xBE,0xAF,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xFF,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xBE,0xAF,0x20,0x80,0x20,0x80,0x20,0x00,0x00,0x00},/*"量",12*/
-{0x08,0x10,0x08,0x30,0x08,0x10,0xF8,0x1F,0x08,0x08,0x08,0x88,0x08,0x48,0x10,0x30,0x10,0x0E,0xFF,0x01,0x10,0x40,0x10,0x80,0x10,0x40,0xF0,0x3F,0x00,0x00,0x00,0x00},/*"功",13*/
-{0x00,0x08,0x14,0x09,0xA4,0x08,0x44,0x08,0x24,0x09,0x34,0x09,0xAD,0x09,0x66,0xFD,0x24,0x09,0x94,0x09,0x04,0x0B,0x44,0x08,0xA4,0x08,0x14,0x09,0x00,0x08,0x00,0x00},/*"率",14*/
-{0x00,0x00,0xFE,0xFF,0x02,0x40,0x42,0x50,0x42,0x48,0x42,0x44,0x42,0x43,0xFA,0x40,0x42,0x41,0x42,0x42,0x42,0x44,0x42,0x58,0x02,0x40,0xFE,0xFF,0x00,0x00,0x00,0x00},/*"因",15*/
-{0x20,0x00,0x20,0x80,0x22,0x48,0x2A,0x29,0x2A,0x09,0xAA,0x4D,0x6A,0x8D,0x3F,0x7B,0x2A,0x0B,0x2A,0x09,0xAA,0x28,0x2A,0x4C,0x22,0x98,0x20,0x00,0x20,0x00,0x00,0x00},/*"素",16*/
-{0x10,0x04,0x60,0x04,0x02,0x7E,0x8C,0x01,0x00,0x40,0x00,0x7E,0xFE,0x42,0x92,0x42,0x92,0x7E,0x92,0x42,0x92,0x7E,0x92,0x42,0xFE,0x42,0x00,0x7E,0x00,0x40,0x00,0x00},/*"温",17*/
-{0x10,0x04,0x60,0x04,0x02,0x7E,0x8C,0x01,0x00,0x44,0xFE,0x48,0x92,0x50,0x92,0x7F,0x92,0x40,0x92,0x40,0x92,0x7F,0x92,0x50,0xFE,0x48,0x00,0x44,0x00,0x40,0x00,0x00},/*"湿",18*/
-{0x00,0x40,0x00,0x30,0xFC,0x8F,0x24,0x80,0x24,0x84,0x24,0x4C,0xFC,0x55,0x25,0x25,0x26,0x25,0x24,0x25,0xFC,0x55,0x24,0x4C,0x24,0x80,0x24,0x80,0x04,0x80,0x00,0x00},/*"度",19*/
-{0x90,0x82,0x52,0x9A,0x34,0x56,0x10,0x63,0xFF,0x22,0x10,0x52,0x34,0x8E,0x52,0x00,0x80,0x80,0x70,0x40,0x8F,0x33,0x08,0x0C,0x08,0x33,0xF8,0x40,0x08,0x80,0x00,0x00},/*"数",20*/
-{0x10,0x42,0x10,0x82,0xFF,0x7F,0x10,0x01,0x90,0x80,0x00,0x60,0xFE,0x1F,0x92,0x00,0x92,0xFC,0x92,0x44,0xF2,0x47,0x92,0x44,0x92,0x44,0x9E,0xFC,0x80,0x00,0x00,0x00},/*"据",21*/
-{0x00,0x80,0xFE,0x7F,0x20,0x01,0x20,0x01,0x3F,0xFF,0x20,0x80,0x00,0x60,0xFC,0x1F,0x24,0x80,0xE4,0x41,0x24,0x26,0x22,0x18,0x23,0x26,0xE2,0x41,0x00,0x80,0x00,0x00},/*"版",22*/
-{0x00,0x10,0x10,0x08,0x10,0x04,0x10,0x02,0x10,0x09,0xD0,0x08,0x30,0x08,0xFF,0xFF,0x30,0x08,0xD0,0x08,0x10,0x09,0x10,0x02,0x10,0x04,0x10,0x08,0x00,0x10,0x00,0x00},/*"本",23*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x82,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0xFE,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"日",24*/
-{0x00,0x88,0x04,0x48,0xFF,0x2F,0x24,0x09,0x24,0x09,0x24,0x19,0xFF,0xAF,0x04,0x48,0x00,0x30,0xFE,0x0F,0x22,0x02,0x22,0x42,0x22,0x82,0xFE,0x7F,0x00,0x00,0x00,0x00},/*"期",25*/
-{0x00,0x00,0xFC,0x3F,0x84,0x10,0x84,0x10,0x84,0x10,0xFC,0x3F,0x00,0x00,0x10,0x00,0x10,0x01,0x10,0x06,0x10,0x40,0x10,0x80,0xFF,0x7F,0x10,0x00,0x10,0x00,0x00,0x00},/*"时",26*/
-{0x00,0x00,0xF8,0xFF,0x01,0x00,0x06,0x00,0x00,0x00,0xF0,0x1F,0x12,0x11,0x12,0x11,0x12,0x11,0xF2,0x1F,0x02,0x00,0x02,0x40,0x02,0x80,0xFE,0x7F,0x00,0x00,0x00,0x00},/*"间",27*/
-{0x20,0x10,0x20,0x30,0x20,0x10,0xFF,0x0F,0x20,0x08,0x20,0x08,0x80,0x00,0xF8,0x3F,0x80,0x40,0x40,0x40,0xFF,0x5F,0x20,0x42,0x10,0x44,0xF0,0x43,0x00,0x78,0x00,0x00},/*"地",28*/
-{0x20,0x10,0x20,0x30,0x20,0x10,0xFF,0x0F,0x20,0x08,0x20,0x48,0x00,0x40,0xF8,0x7F,0x00,0x40,0x00,0x40,0xFF,0x7F,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x40,0x00,0x00},/*"址",29*/
-{0x10,0x04,0x10,0x03,0xD0,0x00,0xFF,0xFF,0x90,0x00,0x14,0x89,0xE4,0x4B,0xAF,0x2A,0xA4,0x1A,0xA4,0x0E,0xA4,0x1A,0xAF,0x2A,0xE4,0x4B,0x04,0x88,0x00,0x80,0x00,0x00},/*"模",30*/
-{0x10,0x00,0x10,0x20,0x90,0x60,0x90,0x20,0x90,0x3F,0x90,0x10,0x90,0x10,0x10,0x10,0x10,0x00,0xFF,0x03,0x10,0x0C,0x10,0x10,0x11,0x20,0x16,0x40,0x10,0xF8,0x00,0x00},/*"式",31*/
-{0x00,0x01,0x80,0x00,0x60,0x00,0xF8,0xFF,0x07,0x20,0x00,0x11,0x3E,0x09,0x22,0x05,0x22,0x03,0xE2,0xFF,0x22,0x03,0x22,0x05,0x3E,0x09,0x00,0x11,0x00,0x20,0x00,0x00},/*"保",32*/
-{0x04,0x02,0x04,0x01,0x84,0x00,0xE4,0xFF,0x1C,0x00,0x07,0x02,0x24,0x02,0x24,0x42,0x24,0x82,0x24,0x7F,0xA4,0x02,0x64,0x02,0x24,0x02,0x04,0x02,0x04,0x02,0x00,0x00},/*"存",33*/
-{0x40,0x00,0x40,0x40,0x42,0x20,0xCC,0x1F,0x00,0x20,0x00,0x40,0xFF,0x5F,0x49,0x48,0x49,0x44,0xC9,0x40,0x49,0x41,0x49,0x42,0x7F,0x45,0x80,0x58,0x00,0x40,0x00,0x00},/*"退",34*/
-{0x00,0x00,0x00,0x7C,0x7C,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xFF,0x7F,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xFC,0x40,0x00,0xFC,0x00,0x00,0x00,0x00},/*"出",35*/
-{0x02,0x08,0x02,0x18,0xFE,0x0F,0x92,0x08,0x92,0x08,0x92,0x04,0xFE,0xFF,0x02,0x04,0x06,0x84,0xFC,0x40,0x04,0x27,0x04,0x18,0x04,0x27,0xFC,0x40,0x00,0x80,0x00,0x00},/*"取",36*/
-{0x10,0x04,0x60,0x04,0x02,0x7C,0x0C,0x03,0xC0,0x00,0x00,0x00,0xE2,0xFF,0x2C,0x09,0x20,0x09,0x3F,0x09,0x20,0x49,0x28,0x89,0xE6,0x7F,0x00,0x00,0x00,0x00,0x00,0x00},/*"消",37*/
-{0x40,0x00,0x40,0x00,0x42,0x00,0xCC,0x3F,0x00,0x90,0x40,0x88,0xA0,0x40,0x9E,0x43,0x82,0x2C,0x82,0x10,0x82,0x28,0x9E,0x46,0xA0,0x41,0x20,0x80,0x20,0x80,0x00,0x00},/*"设",38*/
-{0x00,0x40,0x17,0x40,0x15,0x40,0xD5,0x7F,0x55,0x55,0x57,0x55,0x55,0x55,0x7D,0x55,0x55,0x55,0x57,0x55,0x55,0x55,0xD5,0x7F,0x15,0x40,0x17,0x40,0x00,0x40,0x00,0x00},/*"置",39*/
-{0x80,0x00,0x82,0x80,0x82,0x40,0x82,0x30,0xFE,0x0F,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0xFE,0xFF,0x82,0x00,0x82,0x00,0x82,0x00,0x80,0x00,0x00,0x00},/*"开",40*/
-{0x00,0x81,0x00,0x81,0x10,0x41,0x11,0x41,0x16,0x21,0x10,0x11,0x10,0x0D,0xF0,0x03,0x10,0x0D,0x10,0x11,0x14,0x21,0x13,0x41,0x10,0x41,0x00,0x81,0x00,0x81,0x00,0x00},/*"关",41*/
-{0x00,0x40,0x08,0x40,0x08,0x41,0x08,0x41,0x08,0x41,0x08,0x41,0x09,0x41,0xFA,0x7F,0x08,0x41,0x08,0x41,0x08,0x41,0x08,0x41,0x08,0x41,0x08,0x40,0x00,0x40,0x00,0x00},/*"主",42*/
-{0x00,0x80,0x00,0x40,0x00,0x30,0x00,0x0E,0xFF,0x01,0x00,0x82,0x00,0x4C,0x00,0x20,0x00,0x18,0x00,0x07,0xFF,0x00,0x00,0x07,0x00,0x18,0x00,0x60,0x00,0x80,0x00,0x00},/*"从",43*/
+{0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x90,0x04,0xA0,0x02,0xE0,0x03,0xC0,0x01,0xC0,0x01,0x80,0x00,0x80,0x00,0x00,0x00},/*"→",0*/
+{0x88,0x09,0x68,0x19,0x1F,0x09,0xC8,0xFF,0x08,0x05,0x10,0x00,0xC8,0xFF,0x54,0x12,0x52,0x92,0xD1,0xFF,0x12,0x00,0x94,0x5F,0x08,0x80,0xD0,0x7F,0x10,0x00,0x00,0x00},/*"输",1*/
+{0x00,0x00,0x00,0x7C,0x7C,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xFF,0x7F,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xFC,0x40,0x00,0xFC,0x00,0x00,0x00,0x00},/*"出",2*/
+{0x00,0x80,0x00,0x40,0x00,0x20,0x00,0x10,0x00,0x0C,0x01,0x03,0xE2,0x00,0x1C,0x00,0xE0,0x00,0x00,0x03,0x00,0x0C,0x00,0x30,0x00,0x40,0x00,0x80,0x00,0x80,0x00,0x00},/*"入",3*/
+{0x40,0x80,0x42,0x40,0xCC,0x3F,0x00,0x40,0x00,0x80,0xE2,0xFF,0x22,0x89,0x2A,0x89,0x2A,0x89,0xF2,0xBF,0x2A,0x89,0x26,0xA9,0x22,0xC9,0xE0,0xBF,0x00,0x80,0x00,0x00},/*"通",4*/
+{0x40,0x00,0x40,0x40,0x42,0x20,0xCC,0x1F,0x00,0x20,0x08,0x40,0xE9,0x5F,0xAA,0x4A,0xB8,0x4A,0xA8,0x4A,0xA8,0x4A,0xAA,0x4A,0xE9,0x5F,0x08,0x40,0x00,0x40,0x00,0x00},/*"道",5*/
+{0x00,0x04,0x08,0x04,0x30,0x02,0x00,0x01,0xFF,0xFF,0x20,0x80,0x20,0x40,0x20,0x30,0x20,0x0E,0xFF,0x01,0x20,0x06,0x20,0x18,0x22,0x20,0x2C,0x40,0x20,0x80,0x00,0x00},/*"状",6*/
+{0x00,0x41,0x04,0x39,0x84,0x00,0x84,0x00,0x44,0x3C,0x24,0x40,0x54,0x40,0x8F,0x42,0x14,0x4C,0x24,0x40,0x44,0x40,0x84,0x70,0x84,0x04,0x04,0x09,0x00,0x31,0x00,0x00},/*"态",7*/
+{0x00,0x08,0x14,0x09,0xA4,0x08,0x44,0x08,0x24,0x09,0x34,0x09,0xAD,0x09,0x66,0xFD,0x24,0x09,0x94,0x09,0x04,0x0B,0x44,0x08,0xA4,0x08,0x14,0x09,0x00,0x08,0x00,0x00},/*"率",8*/
+{0x88,0x20,0xA8,0x18,0xA8,0x06,0xFF,0xFF,0xA8,0x02,0xA8,0x0C,0x88,0x00,0x00,0x04,0x44,0x04,0x44,0x04,0xFC,0x7F,0x22,0x82,0x23,0x82,0x22,0x82,0x00,0xF2,0x00,0x00},/*"耗",9*/
+{0x00,0x00,0x00,0x00,0xF8,0x1F,0x88,0x08,0x88,0x08,0x88,0x08,0x88,0x08,0xFF,0x7F,0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x88,0xF8,0x9F,0x00,0x80,0x00,0xF0,0x00,0x00},/*"电",10*/
+{0x00,0x80,0x00,0x60,0xFE,0x1F,0x02,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0xFA,0x7F,0x82,0x40,0x82,0x40,0x82,0x44,0x82,0x58,0x82,0x40,0x02,0x40,0x00,0x00},/*"压",11*/
+{0x10,0x04,0x60,0x04,0x02,0x7E,0x8C,0x01,0x00,0x80,0x44,0x40,0x64,0x3E,0x54,0x00,0x4D,0x00,0x46,0xFE,0x44,0x00,0x54,0x00,0x64,0x7E,0xC4,0x80,0x04,0xE0,0x00,0x00},/*"流",12*/
+{0x20,0x00,0x20,0x80,0x20,0x80,0xBE,0xAF,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xFF,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xBE,0xAF,0x20,0x80,0x20,0x80,0x20,0x00,0x00,0x00},/*"量",13*/
+{0x08,0x10,0x08,0x30,0x08,0x10,0xF8,0x1F,0x08,0x08,0x08,0x88,0x08,0x48,0x10,0x30,0x10,0x0E,0xFF,0x01,0x10,0x40,0x10,0x80,0x10,0x40,0xF0,0x3F,0x00,0x00,0x00,0x00},/*"功",14*/
+{0x00,0x08,0x14,0x09,0xA4,0x08,0x44,0x08,0x24,0x09,0x34,0x09,0xAD,0x09,0x66,0xFD,0x24,0x09,0x94,0x09,0x04,0x0B,0x44,0x08,0xA4,0x08,0x14,0x09,0x00,0x08,0x00,0x00},/*"率",15*/
+{0x00,0x00,0xFE,0xFF,0x02,0x40,0x42,0x50,0x42,0x48,0x42,0x44,0x42,0x43,0xFA,0x40,0x42,0x41,0x42,0x42,0x42,0x44,0x42,0x58,0x02,0x40,0xFE,0xFF,0x00,0x00,0x00,0x00},/*"因",16*/
+{0x20,0x00,0x20,0x80,0x22,0x48,0x2A,0x29,0x2A,0x09,0xAA,0x4D,0x6A,0x8D,0x3F,0x7B,0x2A,0x0B,0x2A,0x09,0xAA,0x28,0x2A,0x4C,0x22,0x98,0x20,0x00,0x20,0x00,0x00,0x00},/*"素",17*/
+{0x10,0x04,0x60,0x04,0x02,0x7E,0x8C,0x01,0x00,0x40,0x00,0x7E,0xFE,0x42,0x92,0x42,0x92,0x7E,0x92,0x42,0x92,0x7E,0x92,0x42,0xFE,0x42,0x00,0x7E,0x00,0x40,0x00,0x00},/*"温",18*/
+{0x10,0x04,0x60,0x04,0x02,0x7E,0x8C,0x01,0x00,0x44,0xFE,0x48,0x92,0x50,0x92,0x7F,0x92,0x40,0x92,0x40,0x92,0x7F,0x92,0x50,0xFE,0x48,0x00,0x44,0x00,0x40,0x00,0x00},/*"湿",19*/
+{0x00,0x40,0x00,0x30,0xFC,0x8F,0x24,0x80,0x24,0x84,0x24,0x4C,0xFC,0x55,0x25,0x25,0x26,0x25,0x24,0x25,0xFC,0x55,0x24,0x4C,0x24,0x80,0x24,0x80,0x04,0x80,0x00,0x00},/*"度",20*/
+{0x90,0x82,0x52,0x9A,0x34,0x56,0x10,0x63,0xFF,0x22,0x10,0x52,0x34,0x8E,0x52,0x00,0x80,0x80,0x70,0x40,0x8F,0x33,0x08,0x0C,0x08,0x33,0xF8,0x40,0x08,0x80,0x00,0x00},/*"数",21*/
+{0x10,0x42,0x10,0x82,0xFF,0x7F,0x10,0x01,0x90,0x80,0x00,0x60,0xFE,0x1F,0x92,0x00,0x92,0xFC,0x92,0x44,0xF2,0x47,0x92,0x44,0x92,0x44,0x9E,0xFC,0x80,0x00,0x00,0x00},/*"据",22*/
+{0x00,0x80,0xFE,0x7F,0x20,0x01,0x20,0x01,0x3F,0xFF,0x20,0x80,0x00,0x60,0xFC,0x1F,0x24,0x80,0xE4,0x41,0x24,0x26,0x22,0x18,0x23,0x26,0xE2,0x41,0x00,0x80,0x00,0x00},/*"版",23*/
+{0x00,0x10,0x10,0x08,0x10,0x04,0x10,0x02,0x10,0x09,0xD0,0x08,0x30,0x08,0xFF,0xFF,0x30,0x08,0xD0,0x08,0x10,0x09,0x10,0x02,0x10,0x04,0x10,0x08,0x00,0x10,0x00,0x00},/*"本",24*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x82,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0x82,0x40,0xFE,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"日",25*/
+{0x00,0x88,0x04,0x48,0xFF,0x2F,0x24,0x09,0x24,0x09,0x24,0x19,0xFF,0xAF,0x04,0x48,0x00,0x30,0xFE,0x0F,0x22,0x02,0x22,0x42,0x22,0x82,0xFE,0x7F,0x00,0x00,0x00,0x00},/*"期",26*/
+{0x00,0x00,0xFC,0x3F,0x84,0x10,0x84,0x10,0x84,0x10,0xFC,0x3F,0x00,0x00,0x10,0x00,0x10,0x01,0x10,0x06,0x10,0x40,0x10,0x80,0xFF,0x7F,0x10,0x00,0x10,0x00,0x00,0x00},/*"时",27*/
+{0x00,0x00,0xF8,0xFF,0x01,0x00,0x06,0x00,0x00,0x00,0xF0,0x1F,0x12,0x11,0x12,0x11,0x12,0x11,0xF2,0x1F,0x02,0x00,0x02,0x40,0x02,0x80,0xFE,0x7F,0x00,0x00,0x00,0x00},/*"间",28*/
+{0x20,0x10,0x20,0x30,0x20,0x10,0xFF,0x0F,0x20,0x08,0x20,0x08,0x80,0x00,0xF8,0x3F,0x80,0x40,0x40,0x40,0xFF,0x5F,0x20,0x42,0x10,0x44,0xF0,0x43,0x00,0x78,0x00,0x00},/*"地",29*/
+{0x20,0x10,0x20,0x30,0x20,0x10,0xFF,0x0F,0x20,0x08,0x20,0x48,0x00,0x40,0xF8,0x7F,0x00,0x40,0x00,0x40,0xFF,0x7F,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x40,0x00,0x00},/*"址",30*/
+{0x10,0x04,0x10,0x03,0xD0,0x00,0xFF,0xFF,0x90,0x00,0x14,0x89,0xE4,0x4B,0xAF,0x2A,0xA4,0x1A,0xA4,0x0E,0xA4,0x1A,0xAF,0x2A,0xE4,0x4B,0x04,0x88,0x00,0x80,0x00,0x00},/*"模",31*/
+{0x10,0x00,0x10,0x20,0x90,0x60,0x90,0x20,0x90,0x3F,0x90,0x10,0x90,0x10,0x10,0x10,0x10,0x00,0xFF,0x03,0x10,0x0C,0x10,0x10,0x11,0x20,0x16,0x40,0x10,0xF8,0x00,0x00},/*"式",32*/
+{0x00,0x01,0x80,0x00,0x60,0x00,0xF8,0xFF,0x07,0x20,0x00,0x11,0x3E,0x09,0x22,0x05,0x22,0x03,0xE2,0xFF,0x22,0x03,0x22,0x05,0x3E,0x09,0x00,0x11,0x00,0x20,0x00,0x00},/*"保",33*/
+{0x04,0x02,0x04,0x01,0x84,0x00,0xE4,0xFF,0x1C,0x00,0x07,0x02,0x24,0x02,0x24,0x42,0x24,0x82,0x24,0x7F,0xA4,0x02,0x64,0x02,0x24,0x02,0x04,0x02,0x04,0x02,0x00,0x00},/*"存",34*/
+{0x40,0x00,0x40,0x40,0x42,0x20,0xCC,0x1F,0x00,0x20,0x00,0x40,0xFF,0x5F,0x49,0x48,0x49,0x44,0xC9,0x40,0x49,0x41,0x49,0x42,0x7F,0x45,0x80,0x58,0x00,0x40,0x00,0x00},/*"退",35*/
+{0x00,0x00,0x00,0x7C,0x7C,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xFF,0x7F,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xFC,0x40,0x00,0xFC,0x00,0x00,0x00,0x00},/*"出",36*/
+{0x02,0x08,0x02,0x18,0xFE,0x0F,0x92,0x08,0x92,0x08,0x92,0x04,0xFE,0xFF,0x02,0x04,0x06,0x84,0xFC,0x40,0x04,0x27,0x04,0x18,0x04,0x27,0xFC,0x40,0x00,0x80,0x00,0x00},/*"取",37*/
+{0x10,0x04,0x60,0x04,0x02,0x7C,0x0C,0x03,0xC0,0x00,0x00,0x00,0xE2,0xFF,0x2C,0x09,0x20,0x09,0x3F,0x09,0x20,0x49,0x28,0x89,0xE6,0x7F,0x00,0x00,0x00,0x00,0x00,0x00},/*"消",38*/
+{0x40,0x00,0x40,0x00,0x42,0x00,0xCC,0x3F,0x00,0x90,0x40,0x88,0xA0,0x40,0x9E,0x43,0x82,0x2C,0x82,0x10,0x82,0x28,0x9E,0x46,0xA0,0x41,0x20,0x80,0x20,0x80,0x00,0x00},/*"设",39*/
+{0x00,0x40,0x17,0x40,0x15,0x40,0xD5,0x7F,0x55,0x55,0x57,0x55,0x55,0x55,0x7D,0x55,0x55,0x55,0x57,0x55,0x55,0x55,0xD5,0x7F,0x15,0x40,0x17,0x40,0x00,0x40,0x00,0x00},/*"置",40*/
+{0x80,0x00,0x82,0x80,0x82,0x40,0x82,0x30,0xFE,0x0F,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0x82,0x00,0xFE,0xFF,0x82,0x00,0x82,0x00,0x82,0x00,0x80,0x00,0x00,0x00},/*"开",41*/
+{0x00,0x81,0x00,0x81,0x10,0x41,0x11,0x41,0x16,0x21,0x10,0x11,0x10,0x0D,0xF0,0x03,0x10,0x0D,0x10,0x11,0x14,0x21,0x13,0x41,0x10,0x41,0x00,0x81,0x00,0x81,0x00,0x00},/*"关",42*/
+{0x00,0x40,0x08,0x40,0x08,0x41,0x08,0x41,0x08,0x41,0x08,0x41,0x09,0x41,0xFA,0x7F,0x08,0x41,0x08,0x41,0x08,0x41,0x08,0x41,0x08,0x41,0x08,0x40,0x00,0x40,0x00,0x00},/*"主",43*/
+{0x00,0x80,0x00,0x40,0x00,0x30,0x00,0x0E,0xFF,0x01,0x00,0x82,0x00,0x4C,0x00,0x20,0x00,0x18,0x00,0x07,0xFF,0x00,0x00,0x07,0x00,0x18,0x00,0x60,0x00,0x80,0x00,0x00},/*"从",44*/
 };
 static const uint8_t font_cn_2424[][72] =
 {
-{0x00,0x00,0x00,0x20,0x08,0x02,0x20,0x0E,0x02,0xE0,0x0B,0x01,0x7C,0x08,0x01,0x2C,0x09,0x71,0x20,0xFF,0x7F,0x20,0x88,0x00,0x20,0x8A,0x00,0x20,0x01,0x00,0x00,0xFD,0x7F,0x80,0x24,0x01,0x60,0x25,0x21,0x38,0x25,0x61,0x0E,0xFD,0x3F,0x0C,0x01,0x00,0x10,0x01,0x00,0xA0,0xF8,0x07,0x40,0x01,0x20,0x80,0x00,0x60,0x80,0xFD,0x3F,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"输",0*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0xE0,0x8F,0x3F,0xE0,0x8F,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0xFC,0xFF,0x3F,0xF8,0xFF,0x3F,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0xE0,0x1F,0x20,0x20,0x90,0x7F,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"出",1*/
-{0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x0C,0x00,0x00,0x06,0x04,0x80,0x01,0x04,0xC0,0x00,0x08,0x30,0x00,0x18,0x1E,0x00,0xF0,0x03,0x00,0xC0,0x01,0x00,0x00,0x0E,0x00,0x00,0x70,0x00,0x00,0xC0,0x00,0x00,0x80,0x03,0x00,0x00,0x06,0x00,0x00,0x0C,0x00,0x00,0x18,0x00,0x00,0x38,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00},/*"入",2*/
-{0x00,0x00,0x00,0x00,0x04,0x20,0x00,0x04,0x30,0x08,0x04,0x18,0x70,0x04,0x08,0x60,0xFC,0x07,0x00,0x00,0x08,0x00,0x00,0x10,0x00,0x00,0x30,0x84,0xFF,0x2F,0x84,0x44,0x20,0x84,0x44,0x60,0x94,0x44,0x60,0xA4,0x44,0x60,0xE4,0xFF,0x6F,0xE4,0x44,0x60,0x94,0x44,0x60,0x94,0x44,0x60,0x8C,0x44,0x68,0x88,0x44,0x7C,0x80,0xFF,0x6F,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00},/*"通",3*/
-{0x00,0x00,0x00,0x00,0x02,0x10,0x00,0x02,0x18,0x04,0x02,0x08,0x0C,0x02,0x04,0x18,0xFF,0x07,0x00,0x02,0x08,0x20,0x00,0x10,0x20,0x00,0x10,0x20,0x00,0x20,0x22,0xFF,0x27,0x24,0x49,0x22,0x38,0x49,0x62,0xA0,0x49,0x62,0x60,0x49,0x42,0x20,0x49,0x42,0x30,0x49,0x42,0x2C,0x49,0x42,0x24,0xFF,0x47,0x20,0xFF,0x67,0x20,0x00,0x60,0x20,0x00,0x20,0x00,0x00,0x20,0x00,0x00,0x00},/*"道",4*/
-{0x00,0x00,0x00,0x00,0x00,0x01,0x40,0x80,0x01,0x80,0x81,0x00,0x00,0x43,0x00,0x00,0x20,0x00,0x04,0x10,0x40,0xFC,0xFF,0x3F,0x00,0x02,0x40,0x00,0x02,0x20,0x00,0x02,0x10,0x00,0x02,0x0C,0x00,0x02,0x07,0x00,0xF2,0x01,0xFC,0x3F,0x00,0x00,0x06,0x00,0x00,0x7A,0x00,0x08,0x82,0x03,0x10,0x02,0x0E,0x70,0x02,0x1C,0xE0,0x03,0x38,0x00,0x02,0x30,0x00,0x00,0x00,0x00,0x00,0x00},/*"状",5*/
-{0x00,0x00,0x00,0x00,0x40,0x00,0x20,0x40,0x18,0x20,0x20,0x1C,0x20,0x20,0x0F,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x08,0x3F,0x20,0x04,0x61,0x20,0x07,0x40,0xF0,0x89,0x40,0x3E,0x98,0x41,0x60,0x30,0x47,0xA0,0x01,0x40,0x20,0x02,0x40,0x20,0x04,0x40,0x20,0x0C,0x7C,0x20,0x18,0x00,0x20,0x18,0x01,0x20,0x30,0x06,0x30,0x30,0x1E,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"态",6*/
-{0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x20,0x01,0x10,0x20,0x01,0x90,0x20,0x01,0x90,0x11,0x01,0x10,0x08,0x01,0x10,0x08,0x01,0x10,0x23,0x01,0x90,0x32,0x01,0x52,0x2A,0x01,0x3C,0xE6,0x7F,0x1C,0x62,0x61,0x10,0x29,0x01,0xD0,0x11,0x01,0x90,0x70,0x01,0x10,0x0A,0x01,0x10,0x09,0x01,0x90,0x10,0x01,0x90,0x30,0x01,0x10,0x20,0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"率",7*/
-{0x00,0x00,0x00,0x00,0x04,0x08,0x90,0x04,0x04,0x90,0x04,0x03,0x90,0xC4,0x00,0x90,0x7C,0x00,0xFE,0xFF,0x7F,0x90,0x24,0x00,0x90,0xC4,0x00,0x90,0x84,0x01,0x10,0x04,0x00,0x00,0x84,0x00,0x20,0x84,0x00,0x20,0x84,0x00,0x10,0x44,0x00,0xF0,0xFF,0x3F,0x10,0x42,0x20,0x08,0x42,0x20,0x08,0x42,0x20,0x0C,0x21,0x20,0x04,0x21,0x20,0x00,0x30,0x3E,0x00,0x20,0x10,0x00,0x00,0x00},/*"耗",8*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xFF,0x03,0x40,0x84,0x00,0x40,0x84,0x00,0x40,0x84,0x00,0x40,0x84,0x00,0x40,0x84,0x00,0x40,0x84,0x00,0xFE,0xFF,0x7F,0x40,0x84,0x40,0x40,0x84,0x40,0x40,0x84,0x40,0x40,0x84,0x40,0x40,0x84,0x40,0x40,0x84,0x40,0xC0,0xFF,0x41,0x40,0x00,0x40,0x00,0x00,0x60,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00},/*"电",9*/
-{0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x0C,0xF8,0xFF,0x17,0xF8,0x7F,0x10,0x08,0x00,0x10,0x08,0x08,0x10,0x08,0x08,0x10,0x08,0x08,0x10,0x08,0x08,0x10,0x08,0x08,0x10,0xE8,0xFF,0x1F,0xE8,0xFF,0x1F,0x08,0x08,0x10,0x08,0x08,0x10,0x08,0x48,0x10,0x08,0x88,0x11,0x08,0x08,0x17,0x08,0x08,0x12,0x0C,0x00,0x10,0x08,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00},/*"压",10*/
-{0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x03,0x01,0x04,0x0E,0x3F,0x08,0x80,0x3F,0x38,0x60,0x40,0x30,0x1C,0x40,0x80,0x03,0x20,0x50,0x00,0x18,0x10,0xF4,0x0F,0x10,0xF6,0x01,0x10,0x05,0x00,0xD2,0x04,0x00,0x74,0xF4,0x7F,0x3C,0x14,0x00,0x10,0x02,0x00,0x10,0x02,0x00,0x90,0xF2,0x3F,0x10,0x13,0x20,0x10,0x0E,0x20,0x18,0x00,0x20,0x10,0x00,0x3C,0x00,0x00,0x10,0x00,0x00,0x00},/*"流",11*/
-{0x00,0x00,0x00,0x00,0x02,0x20,0x00,0x02,0x20,0x00,0x02,0x24,0x00,0x02,0x24,0xFC,0xFB,0x27,0xFC,0x2B,0x25,0x94,0x2A,0x25,0x94,0x2A,0x25,0x94,0x2A,0x25,0x94,0x2A,0x25,0x94,0xFA,0x3F,0x94,0xFA,0x3F,0x94,0x2A,0x25,0x94,0x2A,0x25,0x94,0x2A,0x25,0x94,0x2A,0x25,0xFC,0xFB,0x27,0x00,0xFA,0x27,0x00,0x02,0x24,0x00,0x02,0x20,0x00,0x03,0x30,0x00,0x02,0x00,0x00,0x00,0x00},/*"量",12*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x06,0x20,0x00,0x06,0x20,0x00,0x02,0x20,0x00,0x02,0xE0,0xFF,0x01,0x20,0x00,0x41,0x20,0x00,0x21,0x20,0x80,0x20,0x30,0x80,0x10,0xA0,0x00,0x08,0x80,0x00,0x06,0x80,0x00,0x03,0x80,0xF0,0x00,0xFE,0x1F,0x10,0x84,0x00,0x10,0x80,0x00,0x20,0x80,0x00,0x60,0x80,0x00,0x30,0x80,0xFF,0x1F,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"功",13*/
-{0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x20,0x01,0x10,0x20,0x01,0x90,0x20,0x01,0x90,0x11,0x01,0x10,0x08,0x01,0x10,0x08,0x01,0x10,0x23,0x01,0x90,0x32,0x01,0x52,0x2A,0x01,0x3C,0xE6,0x7F,0x1C,0x62,0x61,0x10,0x29,0x01,0xD0,0x11,0x01,0x90,0x70,0x01,0x10,0x0A,0x01,0x10,0x09,0x01,0x90,0x10,0x01,0x90,0x30,0x01,0x10,0x20,0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"率",14*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,0xFF,0x7F,0x04,0x00,0x10,0x04,0x02,0x18,0x04,0x02,0x14,0x04,0x02,0x14,0x04,0x02,0x12,0x04,0x02,0x11,0x04,0xE2,0x10,0xE4,0x3F,0x10,0x24,0x12,0x10,0x04,0x22,0x10,0x04,0x42,0x10,0x04,0x82,0x11,0x04,0x82,0x17,0x04,0x02,0x10,0x04,0x00,0x10,0x04,0x00,0x10,0xFC,0xFF,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"因",15*/
-{0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x01,0x40,0x08,0x01,0x20,0x08,0x01,0x10,0x48,0x81,0x19,0x48,0x99,0x0D,0x48,0x95,0x07,0x48,0x55,0x05,0x48,0xD3,0x20,0x48,0xAB,0x60,0xFE,0xA9,0x7F,0xFE,0x91,0x3F,0x48,0x89,0x00,0x48,0x8D,0x00,0x48,0x85,0x02,0x48,0xE1,0x04,0x48,0xC1,0x0C,0x48,0x81,0x19,0x0C,0x01,0x38,0x08,0x01,0x30,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"素",16*/
-{0x00,0x00,0x00,0x80,0x00,0x01,0x00,0x01,0x01,0x04,0x07,0x3F,0x08,0x80,0x3F,0x18,0x78,0x20,0x00,0x07,0x20,0xC0,0x00,0x20,0x00,0xE0,0x3F,0xF8,0x2F,0x20,0x48,0x24,0x20,0x48,0x24,0x20,0x48,0xE4,0x3F,0x48,0x24,0x20,0x48,0x24,0x20,0x48,0xE4,0x3F,0x48,0x24,0x20,0x48,0x24,0x20,0xFC,0x2F,0x20,0x00,0xE0,0x3F,0x00,0x20,0x20,0x00,0x00,0x30,0x00,0x00,0x20,0x00,0x00,0x00},/*"温",17*/
-{0x00,0x00,0x00,0x80,0x80,0x00,0x00,0x01,0x11,0x04,0x87,0x3F,0x18,0xC2,0x01,0x38,0x38,0x00,0x00,0x07,0x20,0xC0,0x00,0x20,0x00,0xC0,0x20,0xF8,0x8F,0x27,0xF8,0x0F,0x22,0x48,0x04,0x20,0x48,0xFC,0x3F,0x48,0x04,0x20,0x48,0x04,0x20,0x48,0x04,0x20,0x48,0xFC,0x3F,0x48,0x04,0x24,0x48,0x04,0x23,0xFC,0x8F,0x21,0x08,0xE0,0x20,0x00,0x60,0x30,0x00,0x00,0x20,0x00,0x00,0x00},/*"湿",18*/
-{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x18,0x00,0xC0,0x07,0xF0,0xFF,0x00,0x10,0x01,0x40,0x10,0x01,0x40,0x10,0x41,0x40,0x10,0x41,0x20,0x30,0x41,0x20,0xD0,0xDF,0x11,0x12,0x49,0x12,0x1C,0x49,0x0C,0x1C,0x49,0x08,0x10,0x49,0x0C,0x10,0x49,0x12,0xF0,0x5F,0x11,0x50,0xC1,0x30,0x10,0x41,0x20,0x10,0x01,0x20,0x98,0x01,0x60,0x10,0x01,0x20,0x00,0x00,0x20,0x00,0x00,0x00},/*"度",19*/
-{0x00,0x00,0x00,0x00,0x50,0x40,0x40,0x48,0x40,0x44,0x48,0x20,0x78,0x44,0x22,0x50,0xC3,0x13,0xC0,0xE1,0x12,0xFE,0x7F,0x0C,0x40,0x41,0x0C,0x60,0x41,0x06,0x50,0xC6,0x4D,0x4C,0x44,0x38,0x40,0x0C,0x20,0x80,0x03,0x10,0xF0,0x0F,0x18,0x5E,0xF0,0x0C,0x44,0x80,0x07,0x40,0x80,0x07,0x40,0xFC,0x0C,0xC0,0x1F,0x18,0x40,0x00,0x30,0x40,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00},/*"数",20*/
-{0x00,0x00,0x00,0x80,0x40,0x00,0x80,0xC0,0x20,0x80,0x40,0x20,0x80,0x20,0x60,0xFC,0xFF,0x7F,0x88,0x10,0x20,0x80,0x08,0x10,0xC0,0x08,0x0C,0x80,0x84,0x03,0xF8,0xFF,0x00,0xF8,0x09,0x00,0x88,0x88,0x7F,0x88,0x88,0x10,0x88,0x88,0x10,0x88,0x88,0x10,0x88,0xFF,0x10,0x88,0x88,0x10,0x88,0x88,0x10,0xF8,0x89,0x7F,0xF8,0x89,0x3F,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"据",21*/
-{0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1E,0xF8,0xFF,0x03,0x00,0x11,0x00,0x00,0x11,0x00,0xFE,0x11,0x00,0xFC,0xF1,0x1F,0x00,0xF1,0x4F,0x00,0x01,0x30,0x00,0x01,0x4E,0xF0,0xFF,0x21,0x10,0x01,0x20,0x10,0x03,0x10,0x10,0x3D,0x08,0x08,0xC1,0x04,0x08,0x01,0x03,0x08,0x81,0x07,0x08,0x71,0x0C,0x0C,0x1F,0x18,0x0C,0x03,0x30,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00},/*"版",22*/
-{0x00,0x00,0x00,0x00,0x00,0x08,0x40,0x00,0x04,0x40,0x00,0x04,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0xC0,0x02,0x40,0x60,0x02,0x40,0x38,0x02,0x40,0x0E,0x02,0xC0,0x03,0x02,0xFE,0xFF,0xFF,0xFC,0xFF,0xFF,0xC0,0x01,0x02,0x40,0x06,0x02,0x40,0x18,0x02,0x40,0x30,0x03,0x40,0xC0,0x02,0x40,0x80,0x01,0x40,0x00,0x03,0x60,0x00,0x07,0x40,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x00},/*"本",23*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,0xFF,0x7F,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0xFC,0xFF,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"日",24*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x80,0x20,0x20,0x80,0x10,0x20,0x80,0x08,0xFC,0xFF,0x07,0x20,0x89,0x02,0x20,0x89,0x00,0x20,0x89,0x00,0x20,0x89,0x02,0xFC,0xFF,0x44,0x20,0x80,0x2C,0x20,0x80,0x10,0x00,0x80,0x0C,0x18,0xF0,0x07,0xF8,0xFF,0x00,0x08,0x21,0x00,0x08,0x21,0x10,0x08,0x21,0x20,0x08,0x21,0x20,0xF8,0xFF,0x3F,0xF8,0xFF,0x1F,0x00,0x00,0x00,0x00,0x00,0x00},/*"期",25*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xFF,0x0F,0x10,0x04,0x02,0x10,0x04,0x02,0x10,0x04,0x02,0x10,0x04,0x02,0xF0,0xFF,0x0F,0xF0,0xFF,0x07,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x08,0x00,0x80,0x30,0x00,0x80,0x70,0x10,0x80,0x00,0x20,0x80,0x00,0x20,0x80,0x00,0x60,0xFE,0xFF,0x3F,0x84,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"时",26*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xFF,0x7F,0x20,0x00,0x00,0x06,0x00,0x00,0x1C,0x00,0x00,0x18,0x00,0x00,0x80,0xFF,0x03,0x88,0x10,0x01,0x88,0x10,0x01,0x88,0x10,0x01,0x88,0x10,0x01,0x88,0x10,0x01,0x88,0xFF,0x03,0x88,0x80,0x03,0x08,0x00,0x10,0x08,0x00,0x20,0x08,0x00,0x60,0x08,0x00,0x70,0xF8,0xFF,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"间",27*/
-{0x00,0x00,0x00,0x00,0x02,0x08,0x00,0x02,0x18,0x00,0x02,0x08,0xFC,0xFF,0x0F,0xFC,0xFF,0x07,0x00,0x02,0x04,0x00,0x0A,0x02,0x00,0x0A,0x02,0x00,0x04,0x02,0xF0,0xFF,0x1F,0xE0,0xFF,0x3F,0x00,0x02,0x20,0x00,0x02,0x20,0x02,0x82,0x23,0xFE,0xFF,0x23,0x00,0x81,0x20,0x80,0x80,0x20,0x80,0x80,0x21,0xC0,0xFF,0x21,0x80,0x00,0x20,0x00,0x00,0x3F,0x00,0x00,0x10,0x00,0x00,0x00},/*"地",28*/
-{0x00,0x00,0x00,0x00,0x01,0x04,0x00,0x01,0x0C,0x00,0x01,0x04,0x00,0x01,0x04,0xFE,0xFF,0x03,0x00,0x01,0x02,0x00,0x01,0x21,0x80,0x01,0x21,0x00,0x01,0x20,0x00,0x00,0x20,0x00,0xFF,0x3F,0x00,0x01,0x20,0x00,0x00,0x20,0x00,0x00,0x20,0xFE,0xFF,0x3F,0xFC,0xFF,0x3F,0x00,0x04,0x20,0x00,0x04,0x20,0x00,0x04,0x20,0x00,0x06,0x30,0x00,0x04,0x20,0x00,0x00,0x00,0x00,0x00,0x00},/*"址",29*/
-{0x00,0x00,0x00,0x40,0x00,0x01,0x40,0xC0,0x00,0x40,0x38,0x00,0x40,0x0F,0x00,0xFE,0xFF,0x7F,0x40,0x02,0x00,0x40,0x0C,0x00,0x70,0x18,0x41,0x10,0x00,0x41,0x10,0x00,0x21,0x90,0x7F,0x21,0xFE,0x24,0x11,0xFC,0x24,0x0D,0x90,0xE4,0x07,0x90,0x64,0x01,0x90,0x24,0x07,0xFE,0x24,0x09,0x90,0x24,0x11,0x90,0x7F,0x31,0x90,0x00,0x21,0x10,0x00,0x21,0x00,0x00,0x20,0x00,0x00,0x00},/*"模",30*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x08,0x30,0x40,0x08,0x30,0x40,0x08,0x10,0x40,0x08,0x10,0x40,0x08,0x08,0x40,0xF8,0x0F,0x40,0x08,0x08,0x40,0x08,0x04,0x40,0x08,0x04,0x40,0x08,0x04,0x40,0x00,0x04,0xFE,0x01,0x00,0xFC,0x7F,0x00,0x40,0xE0,0x01,0x40,0x00,0x07,0x44,0x00,0x0C,0x58,0x00,0x18,0x78,0x00,0x30,0x60,0x00,0x30,0x40,0x00,0x7E,0x00,0x00,0x40,0x00,0x00,0x00},/*"式",31*/
-{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x06,0x00,0x80,0x01,0x00,0xE0,0xFF,0x7F,0x3C,0x00,0x00,0x06,0x10,0x20,0x00,0x10,0x10,0x00,0x10,0x08,0xF8,0x13,0x04,0x08,0x11,0x03,0x08,0xD1,0x01,0x08,0x71,0x00,0x08,0xFF,0x7F,0x08,0x11,0x30,0x08,0x71,0x00,0x08,0x91,0x00,0x08,0x11,0x03,0xF8,0x13,0x04,0x08,0x10,0x18,0x00,0x18,0x18,0x00,0x10,0x00,0x00,0x00,0x00},/*"保",32*/
-{0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x80,0x00,0x10,0x40,0x00,0x10,0x20,0x00,0x10,0x18,0x00,0x10,0xFE,0x7F,0x10,0x03,0x00,0x90,0x41,0x00,0x70,0x40,0x00,0xBE,0x40,0x00,0x94,0x40,0x00,0x90,0x40,0x20,0x90,0x40,0x20,0x90,0x40,0x60,0x90,0xF8,0x3F,0x90,0x4C,0x00,0x90,0x42,0x00,0x90,0x41,0x00,0x90,0x41,0x00,0x18,0x40,0x00,0x10,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"存",33*/
-{0x00,0x00,0x00,0x00,0x02,0x08,0x00,0x02,0x18,0x04,0x02,0x04,0x18,0x02,0x04,0x30,0xFE,0x03,0x00,0x02,0x04,0x00,0x00,0x08,0x00,0x00,0x18,0x00,0x00,0x10,0xF8,0xFF,0x1F,0x48,0x04,0x36,0x48,0x04,0x32,0x48,0x04,0x31,0x48,0x24,0x31,0x48,0x44,0x30,0x48,0x44,0x30,0x48,0xA4,0x30,0xF8,0xA7,0x31,0x08,0x18,0x33,0x00,0x18,0x36,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00},/*"退",34*/
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0xE0,0x8F,0x3F,0xE0,0x8F,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0xFC,0xFF,0x3F,0xF8,0xFF,0x3F,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0xE0,0x1F,0x20,0x20,0x90,0x7F,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"出",35*/
-{0x00,0x00,0x00,0x08,0x00,0x02,0x08,0x00,0x06,0x08,0x00,0x06,0xF8,0xFF,0x03,0x88,0x10,0x02,0x88,0x10,0x02,0x88,0x10,0x01,0x88,0x10,0x01,0xF8,0xFF,0x7F,0x08,0x00,0x41,0x2C,0x80,0x20,0x20,0x80,0x10,0xE0,0x01,0x18,0x20,0x1E,0x0C,0x20,0xE0,0x02,0x20,0x80,0x01,0x20,0x70,0x06,0x20,0x1E,0x0C,0xE0,0x03,0x18,0x20,0x00,0x38,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00},/*"取",36*/
-{0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x01,0x01,0x00,0x07,0x01,0x0C,0x06,0x3F,0x38,0x80,0x7F,0x30,0x70,0x00,0x00,0x0E,0x00,0xC0,0x01,0x00,0x04,0x00,0x00,0x08,0xFF,0x7F,0x70,0x89,0x00,0x60,0x89,0x00,0x00,0x89,0x00,0x00,0x89,0x00,0xFE,0x89,0x00,0x00,0x89,0x20,0xC0,0x89,0x20,0x20,0x89,0x60,0x18,0xFF,0x3F,0x08,0x01,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"消",37*/
-{0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x04,0x02,0x00,0x38,0xFE,0x1F,0x30,0x02,0x18,0x00,0x08,0x44,0x00,0x04,0x42,0x00,0x02,0x21,0x00,0x0B,0x20,0xFC,0x18,0x10,0x3C,0x68,0x10,0x04,0x88,0x09,0x04,0x08,0x0E,0x04,0x08,0x06,0x04,0x08,0x0B,0xFC,0xEB,0x18,0x08,0x7E,0x10,0x00,0x0A,0x30,0x00,0x02,0x20,0x00,0x02,0x20,0x00,0x02,0x00,0x00,0x00,0x00},/*"设",38*/
-{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x00,0x02,0x20,0xFC,0x02,0x20,0x44,0x02,0x20,0x44,0xFA,0x3F,0x44,0x4A,0x25,0x44,0x4A,0x25,0x7C,0x4A,0x25,0x44,0x4A,0x25,0xC4,0x4F,0x25,0x44,0x4A,0x25,0x44,0x4A,0x25,0x7C,0x4A,0x25,0x44,0x4A,0x25,0x44,0x4A,0x25,0x44,0xFE,0x3F,0x44,0x0A,0x20,0xFC,0x03,0x20,0x00,0x02,0x20,0x00,0x00,0x30,0x00,0x00,0x20,0x00,0x00,0x00},/*"置",39*/
-{0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x08,0x40,0x08,0x08,0x20,0x08,0x08,0x10,0x08,0x08,0x18,0x08,0x08,0x0C,0x08,0x88,0x03,0xF8,0xFF,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0xF8,0xFF,0x7F,0x08,0x08,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0x0C,0x08,0x00,0x08,0x0C,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"开",40*/
-{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x10,0x40,0x40,0x10,0x20,0x40,0x10,0x20,0x40,0x10,0x10,0x40,0x10,0x10,0x44,0x10,0x08,0x4C,0x10,0x04,0x78,0x10,0x03,0x40,0xD0,0x01,0xC0,0x7F,0x00,0xC0,0x13,0x00,0x40,0x70,0x00,0x70,0x90,0x01,0x4E,0x10,0x03,0x44,0x10,0x04,0x40,0x10,0x08,0x40,0x10,0x18,0x40,0x10,0x30,0x40,0x18,0x70,0x00,0x10,0x20,0x00,0x00,0x20,0x00,0x00,0x00},/*"关",41*/
-{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x80,0x00,0x20,0x80,0x00,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x84,0x40,0x20,0x88,0x40,0x20,0xB8,0xFF,0x3F,0xF0,0xFF,0x3F,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x60,0x20,0xC0,0x40,0x20,0x80,0x00,0x30,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00},/*"主",42*/
-{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x06,0x00,0xC0,0x01,0x00,0x7F,0x00,0xFC,0x0F,0x40,0x08,0x10,0x20,0x00,0x60,0x10,0x00,0xC0,0x19,0x00,0x00,0x0C,0x00,0x00,0x03,0x00,0xE0,0x01,0xFC,0x7F,0x00,0xF8,0x03,0x00,0x00,0x3C,0x00,0x00,0xC0,0x01,0x00,0x00,0x07,0x00,0x00,0x0C,0x00,0x00,0x38,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00},/*"从",43*/
+{0x00,0x00,0x00,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,0x10,0x00,0x00,0x10,0x00,0x00,0x52,0x00,0x00,0x7C,0x00,0x00,0x3C,0x00,0x00,0x38,0x00,0x00,0x38,0x00,0x00,0x18,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"→",0*/
+{0x00,0x00,0x00,0x20,0x08,0x02,0x20,0x0E,0x02,0xE0,0x0B,0x01,0x7C,0x08,0x01,0x2C,0x09,0x71,0x20,0xFF,0x7F,0x20,0x88,0x00,0x20,0x8A,0x00,0x20,0x01,0x00,0x00,0xFD,0x7F,0x80,0x24,0x01,0x60,0x25,0x21,0x38,0x25,0x61,0x0E,0xFD,0x3F,0x0C,0x01,0x00,0x10,0x01,0x00,0xA0,0xF8,0x07,0x40,0x01,0x20,0x80,0x00,0x60,0x80,0xFD,0x3F,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"输",1*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0xE0,0x8F,0x3F,0xE0,0x8F,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0xFC,0xFF,0x3F,0xF8,0xFF,0x3F,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0xE0,0x1F,0x20,0x20,0x90,0x7F,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"出",2*/
+{0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x0C,0x00,0x00,0x06,0x04,0x80,0x01,0x04,0xC0,0x00,0x08,0x30,0x00,0x18,0x1E,0x00,0xF0,0x03,0x00,0xC0,0x01,0x00,0x00,0x0E,0x00,0x00,0x70,0x00,0x00,0xC0,0x00,0x00,0x80,0x03,0x00,0x00,0x06,0x00,0x00,0x0C,0x00,0x00,0x18,0x00,0x00,0x38,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00},/*"入",3*/
+{0x00,0x00,0x00,0x00,0x04,0x20,0x00,0x04,0x30,0x08,0x04,0x18,0x70,0x04,0x08,0x60,0xFC,0x07,0x00,0x00,0x08,0x00,0x00,0x10,0x00,0x00,0x30,0x84,0xFF,0x2F,0x84,0x44,0x20,0x84,0x44,0x60,0x94,0x44,0x60,0xA4,0x44,0x60,0xE4,0xFF,0x6F,0xE4,0x44,0x60,0x94,0x44,0x60,0x94,0x44,0x60,0x8C,0x44,0x68,0x88,0x44,0x7C,0x80,0xFF,0x6F,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00},/*"通",4*/
+{0x00,0x00,0x00,0x00,0x02,0x10,0x00,0x02,0x18,0x04,0x02,0x08,0x0C,0x02,0x04,0x18,0xFF,0x07,0x00,0x02,0x08,0x20,0x00,0x10,0x20,0x00,0x10,0x20,0x00,0x20,0x22,0xFF,0x27,0x24,0x49,0x22,0x38,0x49,0x62,0xA0,0x49,0x62,0x60,0x49,0x42,0x20,0x49,0x42,0x30,0x49,0x42,0x2C,0x49,0x42,0x24,0xFF,0x47,0x20,0xFF,0x67,0x20,0x00,0x60,0x20,0x00,0x20,0x00,0x00,0x20,0x00,0x00,0x00},/*"道",5*/
+{0x00,0x00,0x00,0x00,0x00,0x01,0x40,0x80,0x01,0x80,0x81,0x00,0x00,0x43,0x00,0x00,0x20,0x00,0x04,0x10,0x40,0xFC,0xFF,0x3F,0x00,0x02,0x40,0x00,0x02,0x20,0x00,0x02,0x10,0x00,0x02,0x0C,0x00,0x02,0x07,0x00,0xF2,0x01,0xFC,0x3F,0x00,0x00,0x06,0x00,0x00,0x7A,0x00,0x08,0x82,0x03,0x10,0x02,0x0E,0x70,0x02,0x1C,0xE0,0x03,0x38,0x00,0x02,0x30,0x00,0x00,0x00,0x00,0x00,0x00},/*"状",6*/
+{0x00,0x00,0x00,0x00,0x40,0x00,0x20,0x40,0x18,0x20,0x20,0x1C,0x20,0x20,0x0F,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x08,0x3F,0x20,0x04,0x61,0x20,0x07,0x40,0xF0,0x89,0x40,0x3E,0x98,0x41,0x60,0x30,0x47,0xA0,0x01,0x40,0x20,0x02,0x40,0x20,0x04,0x40,0x20,0x0C,0x7C,0x20,0x18,0x00,0x20,0x18,0x01,0x20,0x30,0x06,0x30,0x30,0x1E,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"态",7*/
+{0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x20,0x01,0x10,0x20,0x01,0x90,0x20,0x01,0x90,0x11,0x01,0x10,0x08,0x01,0x10,0x08,0x01,0x10,0x23,0x01,0x90,0x32,0x01,0x52,0x2A,0x01,0x3C,0xE6,0x7F,0x1C,0x62,0x61,0x10,0x29,0x01,0xD0,0x11,0x01,0x90,0x70,0x01,0x10,0x0A,0x01,0x10,0x09,0x01,0x90,0x10,0x01,0x90,0x30,0x01,0x10,0x20,0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"率",8*/
+{0x00,0x00,0x00,0x00,0x04,0x08,0x90,0x04,0x04,0x90,0x04,0x03,0x90,0xC4,0x00,0x90,0x7C,0x00,0xFE,0xFF,0x7F,0x90,0x24,0x00,0x90,0xC4,0x00,0x90,0x84,0x01,0x10,0x04,0x00,0x00,0x84,0x00,0x20,0x84,0x00,0x20,0x84,0x00,0x10,0x44,0x00,0xF0,0xFF,0x3F,0x10,0x42,0x20,0x08,0x42,0x20,0x08,0x42,0x20,0x0C,0x21,0x20,0x04,0x21,0x20,0x00,0x30,0x3E,0x00,0x20,0x10,0x00,0x00,0x00},/*"耗",9*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xFF,0x03,0x40,0x84,0x00,0x40,0x84,0x00,0x40,0x84,0x00,0x40,0x84,0x00,0x40,0x84,0x00,0x40,0x84,0x00,0xFE,0xFF,0x7F,0x40,0x84,0x40,0x40,0x84,0x40,0x40,0x84,0x40,0x40,0x84,0x40,0x40,0x84,0x40,0x40,0x84,0x40,0xC0,0xFF,0x41,0x40,0x00,0x40,0x00,0x00,0x60,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x00,0x00},/*"电",10*/
+{0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x0C,0xF8,0xFF,0x17,0xF8,0x7F,0x10,0x08,0x00,0x10,0x08,0x08,0x10,0x08,0x08,0x10,0x08,0x08,0x10,0x08,0x08,0x10,0x08,0x08,0x10,0xE8,0xFF,0x1F,0xE8,0xFF,0x1F,0x08,0x08,0x10,0x08,0x08,0x10,0x08,0x48,0x10,0x08,0x88,0x11,0x08,0x08,0x17,0x08,0x08,0x12,0x0C,0x00,0x10,0x08,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00},/*"压",11*/
+{0x00,0x00,0x00,0x00,0x01,0x01,0x00,0x03,0x01,0x04,0x0E,0x3F,0x08,0x80,0x3F,0x38,0x60,0x40,0x30,0x1C,0x40,0x80,0x03,0x20,0x50,0x00,0x18,0x10,0xF4,0x0F,0x10,0xF6,0x01,0x10,0x05,0x00,0xD2,0x04,0x00,0x74,0xF4,0x7F,0x3C,0x14,0x00,0x10,0x02,0x00,0x10,0x02,0x00,0x90,0xF2,0x3F,0x10,0x13,0x20,0x10,0x0E,0x20,0x18,0x00,0x20,0x10,0x00,0x3C,0x00,0x00,0x10,0x00,0x00,0x00},/*"流",12*/
+{0x00,0x00,0x00,0x00,0x02,0x20,0x00,0x02,0x20,0x00,0x02,0x24,0x00,0x02,0x24,0xFC,0xFB,0x27,0xFC,0x2B,0x25,0x94,0x2A,0x25,0x94,0x2A,0x25,0x94,0x2A,0x25,0x94,0x2A,0x25,0x94,0xFA,0x3F,0x94,0xFA,0x3F,0x94,0x2A,0x25,0x94,0x2A,0x25,0x94,0x2A,0x25,0x94,0x2A,0x25,0xFC,0xFB,0x27,0x00,0xFA,0x27,0x00,0x02,0x24,0x00,0x02,0x20,0x00,0x03,0x30,0x00,0x02,0x00,0x00,0x00,0x00},/*"量",13*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x06,0x20,0x00,0x06,0x20,0x00,0x02,0x20,0x00,0x02,0xE0,0xFF,0x01,0x20,0x00,0x41,0x20,0x00,0x21,0x20,0x80,0x20,0x30,0x80,0x10,0xA0,0x00,0x08,0x80,0x00,0x06,0x80,0x00,0x03,0x80,0xF0,0x00,0xFE,0x1F,0x10,0x84,0x00,0x10,0x80,0x00,0x20,0x80,0x00,0x60,0x80,0x00,0x30,0x80,0xFF,0x1F,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"功",14*/
+{0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x20,0x01,0x10,0x20,0x01,0x90,0x20,0x01,0x90,0x11,0x01,0x10,0x08,0x01,0x10,0x08,0x01,0x10,0x23,0x01,0x90,0x32,0x01,0x52,0x2A,0x01,0x3C,0xE6,0x7F,0x1C,0x62,0x61,0x10,0x29,0x01,0xD0,0x11,0x01,0x90,0x70,0x01,0x10,0x0A,0x01,0x10,0x09,0x01,0x90,0x10,0x01,0x90,0x30,0x01,0x10,0x20,0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00},/*"率",15*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,0xFF,0x7F,0x04,0x00,0x10,0x04,0x02,0x18,0x04,0x02,0x14,0x04,0x02,0x14,0x04,0x02,0x12,0x04,0x02,0x11,0x04,0xE2,0x10,0xE4,0x3F,0x10,0x24,0x12,0x10,0x04,0x22,0x10,0x04,0x42,0x10,0x04,0x82,0x11,0x04,0x82,0x17,0x04,0x02,0x10,0x04,0x00,0x10,0x04,0x00,0x10,0xFC,0xFF,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"因",16*/
+{0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x01,0x40,0x08,0x01,0x20,0x08,0x01,0x10,0x48,0x81,0x19,0x48,0x99,0x0D,0x48,0x95,0x07,0x48,0x55,0x05,0x48,0xD3,0x20,0x48,0xAB,0x60,0xFE,0xA9,0x7F,0xFE,0x91,0x3F,0x48,0x89,0x00,0x48,0x8D,0x00,0x48,0x85,0x02,0x48,0xE1,0x04,0x48,0xC1,0x0C,0x48,0x81,0x19,0x0C,0x01,0x38,0x08,0x01,0x30,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"素",17*/
+{0x00,0x00,0x00,0x80,0x00,0x01,0x00,0x01,0x01,0x04,0x07,0x3F,0x08,0x80,0x3F,0x18,0x78,0x20,0x00,0x07,0x20,0xC0,0x00,0x20,0x00,0xE0,0x3F,0xF8,0x2F,0x20,0x48,0x24,0x20,0x48,0x24,0x20,0x48,0xE4,0x3F,0x48,0x24,0x20,0x48,0x24,0x20,0x48,0xE4,0x3F,0x48,0x24,0x20,0x48,0x24,0x20,0xFC,0x2F,0x20,0x00,0xE0,0x3F,0x00,0x20,0x20,0x00,0x00,0x30,0x00,0x00,0x20,0x00,0x00,0x00},/*"温",18*/
+{0x00,0x00,0x00,0x80,0x80,0x00,0x00,0x01,0x11,0x04,0x87,0x3F,0x18,0xC2,0x01,0x38,0x38,0x00,0x00,0x07,0x20,0xC0,0x00,0x20,0x00,0xC0,0x20,0xF8,0x8F,0x27,0xF8,0x0F,0x22,0x48,0x04,0x20,0x48,0xFC,0x3F,0x48,0x04,0x20,0x48,0x04,0x20,0x48,0x04,0x20,0x48,0xFC,0x3F,0x48,0x04,0x24,0x48,0x04,0x23,0xFC,0x8F,0x21,0x08,0xE0,0x20,0x00,0x60,0x30,0x00,0x00,0x20,0x00,0x00,0x00},/*"湿",19*/
+{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x18,0x00,0xC0,0x07,0xF0,0xFF,0x00,0x10,0x01,0x40,0x10,0x01,0x40,0x10,0x41,0x40,0x10,0x41,0x20,0x30,0x41,0x20,0xD0,0xDF,0x11,0x12,0x49,0x12,0x1C,0x49,0x0C,0x1C,0x49,0x08,0x10,0x49,0x0C,0x10,0x49,0x12,0xF0,0x5F,0x11,0x50,0xC1,0x30,0x10,0x41,0x20,0x10,0x01,0x20,0x98,0x01,0x60,0x10,0x01,0x20,0x00,0x00,0x20,0x00,0x00,0x00},/*"度",20*/
+{0x00,0x00,0x00,0x00,0x50,0x40,0x40,0x48,0x40,0x44,0x48,0x20,0x78,0x44,0x22,0x50,0xC3,0x13,0xC0,0xE1,0x12,0xFE,0x7F,0x0C,0x40,0x41,0x0C,0x60,0x41,0x06,0x50,0xC6,0x4D,0x4C,0x44,0x38,0x40,0x0C,0x20,0x80,0x03,0x10,0xF0,0x0F,0x18,0x5E,0xF0,0x0C,0x44,0x80,0x07,0x40,0x80,0x07,0x40,0xFC,0x0C,0xC0,0x1F,0x18,0x40,0x00,0x30,0x40,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00},/*"数",21*/
+{0x00,0x00,0x00,0x80,0x40,0x00,0x80,0xC0,0x20,0x80,0x40,0x20,0x80,0x20,0x60,0xFC,0xFF,0x7F,0x88,0x10,0x20,0x80,0x08,0x10,0xC0,0x08,0x0C,0x80,0x84,0x03,0xF8,0xFF,0x00,0xF8,0x09,0x00,0x88,0x88,0x7F,0x88,0x88,0x10,0x88,0x88,0x10,0x88,0x88,0x10,0x88,0xFF,0x10,0x88,0x88,0x10,0x88,0x88,0x10,0xF8,0x89,0x7F,0xF8,0x89,0x3F,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"据",22*/
+{0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1E,0xF8,0xFF,0x03,0x00,0x11,0x00,0x00,0x11,0x00,0xFE,0x11,0x00,0xFC,0xF1,0x1F,0x00,0xF1,0x4F,0x00,0x01,0x30,0x00,0x01,0x4E,0xF0,0xFF,0x21,0x10,0x01,0x20,0x10,0x03,0x10,0x10,0x3D,0x08,0x08,0xC1,0x04,0x08,0x01,0x03,0x08,0x81,0x07,0x08,0x71,0x0C,0x0C,0x1F,0x18,0x0C,0x03,0x30,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00},/*"版",23*/
+{0x00,0x00,0x00,0x00,0x00,0x08,0x40,0x00,0x04,0x40,0x00,0x04,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0xC0,0x02,0x40,0x60,0x02,0x40,0x38,0x02,0x40,0x0E,0x02,0xC0,0x03,0x02,0xFE,0xFF,0xFF,0xFC,0xFF,0xFF,0xC0,0x01,0x02,0x40,0x06,0x02,0x40,0x18,0x02,0x40,0x30,0x03,0x40,0xC0,0x02,0x40,0x80,0x01,0x40,0x00,0x03,0x60,0x00,0x07,0x40,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x00},/*"本",24*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,0xFF,0x7F,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0x08,0x04,0x08,0xFC,0xFF,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"日",25*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x80,0x20,0x20,0x80,0x10,0x20,0x80,0x08,0xFC,0xFF,0x07,0x20,0x89,0x02,0x20,0x89,0x00,0x20,0x89,0x00,0x20,0x89,0x02,0xFC,0xFF,0x44,0x20,0x80,0x2C,0x20,0x80,0x10,0x00,0x80,0x0C,0x18,0xF0,0x07,0xF8,0xFF,0x00,0x08,0x21,0x00,0x08,0x21,0x10,0x08,0x21,0x20,0x08,0x21,0x20,0xF8,0xFF,0x3F,0xF8,0xFF,0x1F,0x00,0x00,0x00,0x00,0x00,0x00},/*"期",26*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xFF,0x0F,0x10,0x04,0x02,0x10,0x04,0x02,0x10,0x04,0x02,0x10,0x04,0x02,0xF0,0xFF,0x0F,0xF0,0xFF,0x07,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x08,0x00,0x80,0x30,0x00,0x80,0x70,0x10,0x80,0x00,0x20,0x80,0x00,0x20,0x80,0x00,0x60,0xFE,0xFF,0x3F,0x84,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"时",27*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xFF,0x7F,0x20,0x00,0x00,0x06,0x00,0x00,0x1C,0x00,0x00,0x18,0x00,0x00,0x80,0xFF,0x03,0x88,0x10,0x01,0x88,0x10,0x01,0x88,0x10,0x01,0x88,0x10,0x01,0x88,0x10,0x01,0x88,0xFF,0x03,0x88,0x80,0x03,0x08,0x00,0x10,0x08,0x00,0x20,0x08,0x00,0x60,0x08,0x00,0x70,0xF8,0xFF,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"间",28*/
+{0x00,0x00,0x00,0x00,0x02,0x08,0x00,0x02,0x18,0x00,0x02,0x08,0xFC,0xFF,0x0F,0xFC,0xFF,0x07,0x00,0x02,0x04,0x00,0x0A,0x02,0x00,0x0A,0x02,0x00,0x04,0x02,0xF0,0xFF,0x1F,0xE0,0xFF,0x3F,0x00,0x02,0x20,0x00,0x02,0x20,0x02,0x82,0x23,0xFE,0xFF,0x23,0x00,0x81,0x20,0x80,0x80,0x20,0x80,0x80,0x21,0xC0,0xFF,0x21,0x80,0x00,0x20,0x00,0x00,0x3F,0x00,0x00,0x10,0x00,0x00,0x00},/*"地",29*/
+{0x00,0x00,0x00,0x00,0x01,0x04,0x00,0x01,0x0C,0x00,0x01,0x04,0x00,0x01,0x04,0xFE,0xFF,0x03,0x00,0x01,0x02,0x00,0x01,0x21,0x80,0x01,0x21,0x00,0x01,0x20,0x00,0x00,0x20,0x00,0xFF,0x3F,0x00,0x01,0x20,0x00,0x00,0x20,0x00,0x00,0x20,0xFE,0xFF,0x3F,0xFC,0xFF,0x3F,0x00,0x04,0x20,0x00,0x04,0x20,0x00,0x04,0x20,0x00,0x06,0x30,0x00,0x04,0x20,0x00,0x00,0x00,0x00,0x00,0x00},/*"址",30*/
+{0x00,0x00,0x00,0x40,0x00,0x01,0x40,0xC0,0x00,0x40,0x38,0x00,0x40,0x0F,0x00,0xFE,0xFF,0x7F,0x40,0x02,0x00,0x40,0x0C,0x00,0x70,0x18,0x41,0x10,0x00,0x41,0x10,0x00,0x21,0x90,0x7F,0x21,0xFE,0x24,0x11,0xFC,0x24,0x0D,0x90,0xE4,0x07,0x90,0x64,0x01,0x90,0x24,0x07,0xFE,0x24,0x09,0x90,0x24,0x11,0x90,0x7F,0x31,0x90,0x00,0x21,0x10,0x00,0x21,0x00,0x00,0x20,0x00,0x00,0x00},/*"模",31*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x08,0x30,0x40,0x08,0x30,0x40,0x08,0x10,0x40,0x08,0x10,0x40,0x08,0x08,0x40,0xF8,0x0F,0x40,0x08,0x08,0x40,0x08,0x04,0x40,0x08,0x04,0x40,0x08,0x04,0x40,0x00,0x04,0xFE,0x01,0x00,0xFC,0x7F,0x00,0x40,0xE0,0x01,0x40,0x00,0x07,0x44,0x00,0x0C,0x58,0x00,0x18,0x78,0x00,0x30,0x60,0x00,0x30,0x40,0x00,0x7E,0x00,0x00,0x40,0x00,0x00,0x00},/*"式",32*/
+{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x06,0x00,0x80,0x01,0x00,0xE0,0xFF,0x7F,0x3C,0x00,0x00,0x06,0x10,0x20,0x00,0x10,0x10,0x00,0x10,0x08,0xF8,0x13,0x04,0x08,0x11,0x03,0x08,0xD1,0x01,0x08,0x71,0x00,0x08,0xFF,0x7F,0x08,0x11,0x30,0x08,0x71,0x00,0x08,0x91,0x00,0x08,0x11,0x03,0xF8,0x13,0x04,0x08,0x10,0x18,0x00,0x18,0x18,0x00,0x10,0x00,0x00,0x00,0x00},/*"保",33*/
+{0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x80,0x00,0x10,0x40,0x00,0x10,0x20,0x00,0x10,0x18,0x00,0x10,0xFE,0x7F,0x10,0x03,0x00,0x90,0x41,0x00,0x70,0x40,0x00,0xBE,0x40,0x00,0x94,0x40,0x00,0x90,0x40,0x20,0x90,0x40,0x20,0x90,0x40,0x60,0x90,0xF8,0x3F,0x90,0x4C,0x00,0x90,0x42,0x00,0x90,0x41,0x00,0x90,0x41,0x00,0x18,0x40,0x00,0x10,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"存",34*/
+{0x00,0x00,0x00,0x00,0x02,0x08,0x00,0x02,0x18,0x04,0x02,0x04,0x18,0x02,0x04,0x30,0xFE,0x03,0x00,0x02,0x04,0x00,0x00,0x08,0x00,0x00,0x18,0x00,0x00,0x10,0xF8,0xFF,0x1F,0x48,0x04,0x36,0x48,0x04,0x32,0x48,0x04,0x31,0x48,0x24,0x31,0x48,0x44,0x30,0x48,0x44,0x30,0x48,0xA4,0x30,0xF8,0xA7,0x31,0x08,0x18,0x33,0x00,0x18,0x36,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00},/*"退",35*/
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0xE0,0x8F,0x3F,0xE0,0x8F,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0xFC,0xFF,0x3F,0xF8,0xFF,0x3F,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0x00,0x08,0x20,0xE0,0x1F,0x20,0x20,0x90,0x7F,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"出",36*/
+{0x00,0x00,0x00,0x08,0x00,0x02,0x08,0x00,0x06,0x08,0x00,0x06,0xF8,0xFF,0x03,0x88,0x10,0x02,0x88,0x10,0x02,0x88,0x10,0x01,0x88,0x10,0x01,0xF8,0xFF,0x7F,0x08,0x00,0x41,0x2C,0x80,0x20,0x20,0x80,0x10,0xE0,0x01,0x18,0x20,0x1E,0x0C,0x20,0xE0,0x02,0x20,0x80,0x01,0x20,0x70,0x06,0x20,0x1E,0x0C,0xE0,0x03,0x18,0x20,0x00,0x38,0x00,0x00,0x10,0x00,0x00,0x10,0x00,0x00,0x00},/*"取",37*/
+{0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x01,0x01,0x00,0x07,0x01,0x0C,0x06,0x3F,0x38,0x80,0x7F,0x30,0x70,0x00,0x00,0x0E,0x00,0xC0,0x01,0x00,0x04,0x00,0x00,0x08,0xFF,0x7F,0x70,0x89,0x00,0x60,0x89,0x00,0x00,0x89,0x00,0x00,0x89,0x00,0xFE,0x89,0x00,0x00,0x89,0x20,0xC0,0x89,0x20,0x20,0x89,0x60,0x18,0xFF,0x3F,0x08,0x01,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"消",38*/
+{0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x04,0x02,0x00,0x38,0xFE,0x1F,0x30,0x02,0x18,0x00,0x08,0x44,0x00,0x04,0x42,0x00,0x02,0x21,0x00,0x0B,0x20,0xFC,0x18,0x10,0x3C,0x68,0x10,0x04,0x88,0x09,0x04,0x08,0x0E,0x04,0x08,0x06,0x04,0x08,0x0B,0xFC,0xEB,0x18,0x08,0x7E,0x10,0x00,0x0A,0x30,0x00,0x02,0x20,0x00,0x02,0x20,0x00,0x02,0x00,0x00,0x00,0x00},/*"设",39*/
+{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x00,0x02,0x20,0xFC,0x02,0x20,0x44,0x02,0x20,0x44,0xFA,0x3F,0x44,0x4A,0x25,0x44,0x4A,0x25,0x7C,0x4A,0x25,0x44,0x4A,0x25,0xC4,0x4F,0x25,0x44,0x4A,0x25,0x44,0x4A,0x25,0x7C,0x4A,0x25,0x44,0x4A,0x25,0x44,0x4A,0x25,0x44,0xFE,0x3F,0x44,0x0A,0x20,0xFC,0x03,0x20,0x00,0x02,0x20,0x00,0x00,0x30,0x00,0x00,0x20,0x00,0x00,0x00},/*"置",40*/
+{0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x08,0x40,0x08,0x08,0x20,0x08,0x08,0x10,0x08,0x08,0x18,0x08,0x08,0x0C,0x08,0x88,0x03,0xF8,0xFF,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0xF8,0xFF,0x7F,0x08,0x08,0x00,0x08,0x08,0x00,0x08,0x08,0x00,0x0C,0x08,0x00,0x08,0x0C,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"开",41*/
+{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x10,0x40,0x40,0x10,0x20,0x40,0x10,0x20,0x40,0x10,0x10,0x40,0x10,0x10,0x44,0x10,0x08,0x4C,0x10,0x04,0x78,0x10,0x03,0x40,0xD0,0x01,0xC0,0x7F,0x00,0xC0,0x13,0x00,0x40,0x70,0x00,0x70,0x90,0x01,0x4E,0x10,0x03,0x44,0x10,0x04,0x40,0x10,0x08,0x40,0x10,0x18,0x40,0x10,0x30,0x40,0x18,0x70,0x00,0x10,0x20,0x00,0x00,0x20,0x00,0x00,0x00},/*"关",42*/
+{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x80,0x00,0x20,0x80,0x00,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x84,0x40,0x20,0x88,0x40,0x20,0xB8,0xFF,0x3F,0xF0,0xFF,0x3F,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x40,0x20,0x80,0x60,0x20,0xC0,0x40,0x20,0x80,0x00,0x30,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00},/*"主",43*/
+{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x06,0x00,0xC0,0x01,0x00,0x7F,0x00,0xFC,0x0F,0x40,0x08,0x10,0x20,0x00,0x60,0x10,0x00,0xC0,0x19,0x00,0x00,0x0C,0x00,0x00,0x03,0x00,0xE0,0x01,0xFC,0x7F,0x00,0xF8,0x03,0x00,0x00,0x3C,0x00,0x00,0xC0,0x01,0x00,0x00,0x07,0x00,0x00,0x0C,0x00,0x00,0x38,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00},/*"从",44*/
 };
 
 static inline int utf8_chrlen(uint8_t *str)

pro/ui/key.c

@@ -155,3 +155,22 @@ int key_get(key_val_t *kv)
     return -1;
 }
 
+
+int key_print(key_val_t *kv)
+{
+    switch(kv->key) {
+        case KEY_UP:
+        printf("____ KEY_UP, %s\n", (kv->type==TYPE_LONG)?"LONG":"SHORT");
+        break;
+
+        case KEY_DOWN:
+        printf("____ KEY_DOWN, %s\n", (kv->type==TYPE_LONG)?"LONG":"SHORT");
+        break;
+
+        case KEY_OK:
+        printf("____ KEY_OK, %s\n", (kv->type==TYPE_LONG)?"LONG":"SHORT");
+        break;
+    }
+    return 0;
+}
+

pro/ui/key.h

@@ -17,5 +17,6 @@ typedef struct {
 int key_init(void);
 int key_deinit(void);
 int key_get(key_val_t *kv);
+int key_print(key_val_t *kv);
 
 #endif

pro/ui/lcd.c

@@ -12,7 +12,7 @@
 #include "elog.h"
 
 
-//#define USE_FB
+#define USE_FB
 
 #define BK_GPIO             98      //PD2
 #define DC_GPIO             99      //PD3, 96+3=99
@@ -132,8 +132,10 @@ static int lcd_hw_write(lcd_handle_t *h, void *data, int len)
 }
 static void lcd_write_reg(lcd_handle_t *h, uint8_t reg)
 {
+#ifndef USE_FB
     gpio_set(h->io, 0);
     lcd_hw_write(h, &reg, 1);
+#endif
 }
 static int ssd1309_reset(void)
 {
@@ -192,6 +194,7 @@ static int ssd1309_init(lcd_handle_t *h)
 }
 static void ssd1309_refresh(lcd_handle_t *h)
 {
+#ifndef USE_FB
 	int i,n,offset;
     
 	for(i=0;i<8;i++) {
@@ -205,6 +208,7 @@ static void ssd1309_refresh(lcd_handle_t *h)
           lcd_hw_write(h, &h->buf[offset+n], 1);
 	   }
   	}
+#endif
 }
 static int lcd_hw_deinit(lcd_handle_t *h)
 {
@@ -267,6 +271,7 @@ void lcd_init(int width, int height, int color)
     h->height = height;
     h->color  = color;
     h->angle = ANGLE_0;
+
     lcd_hw_init(h);
 }
 
@@ -304,7 +309,7 @@ void lcd_fill(int color)
 {
     lcd_handle_t *h=&lcdHandle;
     
-    lcd_fill_rect(0, 0, h->width-1, h->height-1, color);
+    lcd_fill_rect(0, 0, h->width, h->height, color);
 }
 
 

pro/ui/led.c

@@ -78,7 +78,7 @@ int led_init(void)
         h->data[i].cnt = 0;
     }
     
-    //led_para_t para={1000, 1000, -1};
+    //led_para_t para={1000, 1000, 10};
     //led_set_ex(LED_ID_RED, &para);
     
     return 0;

pro/ui/menu.c

@@ -34,7 +34,10 @@ typedef struct {
     int item_id;
     int inedit;
     
-    int uflag;
+    
+    uint64_t ms;
+    uint16_t uflag;
+    int fliptime;
 }menu_handle_t;
 static int lang_id=LANG_ID_CHINESE;
 //static int lang_id=LANG_ID_ENGLISH;
@@ -55,21 +58,33 @@ enum {
     MODBUS_ITEM_ADDR=0,
     MODBUS_ITEM_MODE,
     MODBUS_ITEM_SAVE,
-    MODBUS_ITEM_CANCLE,
+    MODBUS_ITEM_QUIT,
 
     MODBUS_ITEM_MAX
 };
 
+enum {
+    UFLAG_KEY=(1<<0),
+    UFLAG_FLIP=(1<<1),
+    UFLAG_TIMER=(1<<2),
+};
+
+
 #define LEVEL_MAX  3
 static inline GlobalDeviceManager* get_dm(void)
 {
     return &__globalDeviceManage;
 }
-
+static uint64_t get_ms(void)
+{
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (uint64_t)(tv.tv_sec)*1000 + (uint64_t)(tv.tv_usec)/1000;
+}
 static void tmr_handler(void *arg, int last)
 {
     menu_handle_t *h=(menu_handle_t*)arg;
-    h->uflag = 1;
+    h->uflag |= UFLAG_TIMER;
     
     if(last) {
         timer_stop(h->tmr);
@@ -86,7 +101,6 @@ static void tmr_stop(menu_handle_t *h)
 {
     timer_stop(h->tmr);
     h->tmr = -1;
-    h->uflag = 0;
 }
 
 static void menu_system_paint(menu_handle_t *h, int font1, int font2, int item_h)
@@ -108,13 +122,56 @@ static void menu_system_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_refresh();
 }
+
+static int get_power(int ph)
+{
+    int k = 0;
+    GlobalTreeACManager *tmp3 = NULL;
+    GlobalDeviceManager *dm=get_dm();
+    //输入数据
+    int nselectPH = dm->g_shm_Data->nSelectPh;
+    if ((dm->_globalDevInfo.product.pwr_type == SmartPDU_Tree_AC_Tree ||
+         dm->_globalDevInfo.product.pwr_type == SmartPDU_Tree_AC_One ||
+         dm->_globalDevInfo.product.pwr_type == SmartPDU_Tree_AC_One_B))
+    {//三项输入数据
+        list_for_each_entry(tmp3, &dm->_globalPowerManger.list_Tree_AC, list_Tree_AC) {
+            k += 1;
+            if (ph == k)
+                break;
+        }
+        if (tmp3) {
+            dm->g_shm_Data->fV = tmp3->_PowerInfo.voltage;
+            dm->g_shm_Data->fA = tmp3->_PowerInfo.current;
+            dm->g_shm_Data->fW = tmp3->_PowerInfo.power;
+            dm->g_shm_Data->fF = tmp3->_PowerInfo.factor;
+            dm->g_shm_Data->fS = tmp3->_PowerInfo.consumption;
+            dm->g_shm_Data->nStatus = tmp3->_PowerInfo.status;
+            dm->g_shm_Data->fT = dm->g_modebus_read.temprature/100.0f;
+            dm->g_shm_Data->fH = dm->g_modebus_read.humidity/100.0f;
+        }
+    }
+    else
+    {
+        //其他输入数据
+        dm->g_shm_Data->fV = dm->_globalPowerManger._PowerInfo.voltage;
+        dm->g_shm_Data->fA = dm->_globalPowerManger._PowerInfo.current;
+        dm->g_shm_Data->fW = dm->_globalPowerManger._PowerInfo.power;
+        dm->g_shm_Data->fF = dm->_globalPowerManger._PowerInfo.factor;
+        dm->g_shm_Data->fS = dm->_globalPowerManger._PowerInfo.consumption;
+        dm->g_shm_Data->nStatus = dm->_globalPowerManger._PowerInfo.status;
+        dm->g_shm_Data->fT = dm->g_modebus_read.temprature/100.0f;
+        dm->g_shm_Data->fH = dm->g_modebus_read.humidity/100.0f;
+    }
+
+    return 0;
+}
 static void menu_input_paint(menu_handle_t *h, int font1, int font2, int item_h)
 {
     char tmp[100];
     GlobalDeviceManager *dm=get_dm();
 
     lcd_fill(0);
-    sprintf(tmp, "INPUT");
+    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);
 
 #ifdef TEXT_ALIGN
@@ -147,7 +204,7 @@ static void menu_output_paint(menu_handle_t *h, int font1, int font2, int item_h
     GlobalDeviceManager *dm=get_dm();
 
     lcd_fill(0);
-    sprintf(tmp, "OUTPUT CH3");
+    sprintf(tmp, "%s CH3", 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);
 
 #ifdef TEXT_ALIGN
@@ -176,19 +233,50 @@ static void menu_output_paint(menu_handle_t *h, int font1, int font2, int item_h
 
     lcd_refresh();
 }
+static void menu_sensor_paint(menu_handle_t *h, int font1, int font2, int item_h)
+{
+    char tmp[100];
+    PowerInfo ttt;
+    PowerInfo *pwr=&ttt;
+    GlobalDeviceManager *dm=get_dm();
+
+    lcd_fill(0);
+    sprintf(tmp, "%s/%s", lang_get_str(h->lang, STR_ID_TEMP), lang_get_str(h->lang, STR_ID_HUMI));
+    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:", lang_get_str(h->lang, STR_ID_TEMP));
+    lcd_draw_string(0, item_h, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+    sprintf(tmp, "%0.1f", 10.0f);
+    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:", lang_get_str(h->lang, STR_ID_HUMI));
+    lcd_draw_string(0, item_h*2, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+    sprintf(tmp, "%0.1f", 88.0f);
+    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.1f", lang_get_str(h->lang, STR_ID_TEMP), 10.0f);
+    lcd_draw_string(0, item_h, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+
+    sprintf(tmp, " %s: %0.1f", lang_get_str(h->lang, STR_ID_HUMI), 88.0f);
+    lcd_draw_string(0, item_h*2, LCD_WIDTH, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+#endif
+
+    lcd_refresh();
+}
 static int menu_modbus_handle(menu_handle_t *h, ModbusInfo_t *pmb, key_val_t *kv)
 {
     int r=-1;
     
-    if(h->inedit) {
-        if(kv->key==KEY_UP) {
+    switch(kv->key) {
+        case KEY_UP:
+        {
             if(h->inedit==1) {
                 if(h->item_id>0) {
-                    h->item_id = MODBUS_ITEM_CANCLE;
+                    h->item_id--;
                 }
                 else {
-                    h->item_id--;
+                    h->item_id = MODBUS_ITEM_QUIT;
                 }
             }
             else {
@@ -205,16 +293,19 @@ static int menu_modbus_handle(menu_handle_t *h, ModbusInfo_t *pmb, key_val_t *kv
                 }
             }
         }
-        else if(kv->key==KEY_DOWN) {
+        break;
+
+        case KEY_DOWN:
+        {
             if(h->inedit==1) {
-                if(h->item_id<MODBUS_ITEM_CANCLE) {
+                if(h->item_id<MODBUS_ITEM_QUIT) {
                     h->item_id++;
                 }
                 else {
-                    h->item_id = MODBUS_ITEM_ADDR;
+                    h->item_id = 0;
                 }
             }
-            else {      //��ֵ�༭
+            else {
                 if(h->item_id==MODBUS_ITEM_ADDR) {         //addr
                     if(pmb->addr) {
                         pmb->addr--;
@@ -228,10 +319,13 @@ static int menu_modbus_handle(menu_handle_t *h, ModbusInfo_t *pmb, key_val_t *kv
                 }
             }
         }
-        else if(kv->key==KEY_OK) {
+        break;
+
+        case KEY_OK:
+        {
             if(h->inedit==1) {
-                if(h->item_id==2 || h->item_id==3) {         //save
-                    if(h->item_id==2) {
+                if(h->item_id==MODBUS_ITEM_SAVE || h->item_id==MODBUS_ITEM_QUIT) {         //save
+                    if(h->item_id==MODBUS_ITEM_SAVE) {
                         r = cascade_set_modbus(pmb);
                         if(r==0) {
                             r = paras_save();
@@ -242,19 +336,23 @@ static int menu_modbus_handle(menu_handle_t *h, ModbusInfo_t *pmb, key_val_t *kv
                 }
                 else {
                     h->inedit = 2;
+                    tmr_start(h, 300);
                 }
             }
             else {
-                h->inedit = 1;
+                if(kv->type==TYPE_LONG) {
+                    h->inedit = 1;
+                }
             }
         }
+        break;
     }
     
     return r;
 }
 static void menu_modbus_paint(menu_handle_t *h, int font1, int font2, int item_h, key_val_t *kv)
 {
-    int r;
+    int r,font_color;
     char tmp[100];
     static uint8_t flash_cnt=0;
     
@@ -274,24 +372,68 @@ static void menu_modbus_paint(menu_handle_t *h, int font1, int font2, int item_h
         dev->cascade = mb_cas;
     }
     
+    if(kv->key==-1) {
+        flash_cnt++;
+    }    
+    
+    printf("___ inedit: %d, item_id: %d\n", h->inedit, h->item_id);
+
     lcd_fill(0);
+
     sprintf(tmp, "MODBUS %s", lang_get_str(h->lang, STR_ID_SETT));
     lcd_draw_string(0, 0, LCD_WIDTH, item_h, tmp, font1, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_CENTER, VERTICAL_CENTER);
 
-    sprintf(tmp, "%s:", lang_get_str(h->lang, STR_ID_ADDR));
+    font_color = COLOR_WHITE;
+    if(h->inedit && h->item_id==MODBUS_ITEM_ADDR) {
+        if(h->inedit==2) {
+            font_color = (flash_cnt%2)?COLOR_WHITE:COLOR_BLACK;
+        }
+        sprintf(tmp, ">%s:", lang_get_str(h->lang, STR_ID_ADDR));
+    }
+    else {
+        sprintf(tmp, " %s:", lang_get_str(h->lang, STR_ID_ADDR));
+    }
     lcd_draw_string(0, item_h, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
     sprintf(tmp, "%d", pmb->addr);
-    lcd_draw_string(LCD_WIDTH/2, item_h, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
+    lcd_draw_string(LCD_WIDTH/2, item_h, LCD_WIDTH/2, item_h, tmp, font2, font_color, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
 
-    sprintf(tmp, "%s:", lang_get_str(h->lang, STR_ID_MODE));
+    font_color = COLOR_WHITE;
+    if(h->inedit && h->item_id==MODBUS_ITEM_MODE) {
+        if(h->inedit==2) {
+            font_color = (flash_cnt%2)?COLOR_WHITE:COLOR_BLACK;
+        }
+        sprintf(tmp, ">%s:", lang_get_str(h->lang, STR_ID_MODE));
+    }
+    else {
+        sprintf(tmp, " %s:", lang_get_str(h->lang, STR_ID_MODE));
+    }
     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", (pmb->mode==MODBUS_MASTER)?lang_get_str(h->lang, STR_ID_MASTER):lang_get_str(h->lang, STR_ID_SLAVE));
-    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, font_color, COLOR_BLACK, HORIZONTAL_LEFT, VERTICAL_CENTER);
 
-    sprintf(tmp, "%s", lang_get_str(h->lang, STR_ID_SAVE));
-    lcd_draw_string(0, item_h*3, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_CENTER, VERTICAL_CENTER);
-    sprintf(tmp, "%s", lang_get_str(h->lang, STR_ID_QUIT));
-    lcd_draw_string(LCD_WIDTH/2, item_h*3, LCD_WIDTH/2, item_h, tmp, font2, COLOR_WHITE, COLOR_BLACK, HORIZONTAL_CENTER, VERTICAL_CENTER);
+    font_color = COLOR_WHITE;
+    if(h->inedit && h->item_id==MODBUS_ITEM_SAVE) {
+        if(h->inedit==2) {
+            font_color = (flash_cnt%2)?COLOR_WHITE:COLOR_BLACK;
+        }
+        sprintf(tmp, ">%s", lang_get_str(h->lang, STR_ID_SAVE));
+    }
+    else {
+        sprintf(tmp, " %s", lang_get_str(h->lang, STR_ID_SAVE));
+    }
+    lcd_draw_string(0, item_h*3, LCD_WIDTH/2, item_h, tmp, font2, font_color, COLOR_BLACK, HORIZONTAL_CENTER, VERTICAL_CENTER);
+    
+    font_color = COLOR_WHITE;
+    if(h->inedit && h->item_id==MODBUS_ITEM_QUIT) {
+        if(h->inedit==2) {
+            font_color = (flash_cnt%2)?COLOR_WHITE:COLOR_BLACK;
+        }
+        sprintf(tmp, ">%s", lang_get_str(h->lang, STR_ID_QUIT));
+    }
+    else {
+        sprintf(tmp, " %s", lang_get_str(h->lang, STR_ID_QUIT));
+    }
+    lcd_draw_string(LCD_WIDTH/2, item_h*3, LCD_WIDTH/2, item_h, tmp, font2, font_color, COLOR_BLACK, HORIZONTAL_CENTER, VERTICAL_CENTER);
 
     lcd_refresh();
 }
@@ -304,6 +446,9 @@ int menu_init(void)
     memset(h, 0, sizeof(menu_handle_t));
     h->lang = lang_id;
     h->tmr = -1;
+    h->ms = get_ms();
+    h->uflag = 1;
+    h->fliptime = get_dm()->_globalDevInfo.misc.flip_time*1000;
     
     key_init();
     led_init();
@@ -329,35 +474,90 @@ int menu_handle(void)
 {
     int r;
     key_val_t kv;
-    menu_handle_t *h=&mnHandle;
-    int font1=FONT_12,font2=FONT_12;
     int item_h=LCD_HEIGHT/4;
+    int font1=FONT_12,font2=FONT_12;
+    menu_handle_t *h=&mnHandle;
     
     r = key_get(&kv);
-    if(r && !h->inedit) {
-        return -1;
-    }
-    
-    h->menu_id++;
-    if(h->menu_id>=MENU_MAX) {
-        h->menu_id = 0;
-    }
-
-    if(kv.key==KEY_OK) {
-        if(kv.type==TYPE_SHORT) {
-            if(lcd_get_angle()==ANGLE_0) {
-                lcd_rotate(ANGLE_180);
+    key_print(&kv);
+    switch(kv.key) {
+        case KEY_OK:
+        {
+            if(kv.type==TYPE_SHORT) {
+                if(h->inedit==0) {
+                    if(lcd_get_angle()==ANGLE_0) {
+                        lcd_rotate(ANGLE_180);
+                    }
+                    else {
+                        lcd_rotate(ANGLE_0);
+                    }
+                }
             }
             else {
-                lcd_rotate(ANGLE_0);
+                if(h->inedit==0) {
+                    if(h->item_id==MENU_MODBUS) {
+                        h->inedit = 1;
+                    }
+                }
             }
+            h->uflag = UFLAG_KEY;
         }
-        else {
-            if(h->menu_id==MENU_MODBUS) {
-                h->inedit = !h->inedit;
+        break;
+
+        case KEY_UP:
+        {
+            if(h->inedit==0 && kv.type==TYPE_SHORT) {
+                if(h->menu_id>0) {
+                    h->menu_id--;
+                }
+                else {
+                    h->menu_id = MENU_MAX-1;
+                }
+            }
+            h->uflag = UFLAG_KEY;
+        }
+        break;
+
+        case KEY_DOWN:
+        {
+            if(!h->inedit && kv.type==TYPE_SHORT) {
+                if(h->menu_id<MENU_MAX-1) {
+                    h->menu_id++;
+                }
+                else {
+                    h->menu_id = 0;
+                }
             }
+            h->uflag = UFLAG_KEY;
+        }
+        break;
+
+        default:
+        {
+#if 0
+            if(h->fliptime>0) {
+                if(h->inedit==0) {
+                    if((get_ms()-h->ms)>=h->fliptime) {
+                        if(h->menu_id<MENU_MAX-1) {
+                            h->menu_id++;
+                        }
+                        else {
+                            h->menu_id = 0;
+                        }
+                        h->uflag = UFLAG_FLIP;
+                        h->ms = get_ms();
+                    }
+                }
+                else {
+                    h->ms = get_ms();
+                }
+            }
+#endif
         }
     }
+    if(h->uflag==0) {
+        return -1;
+    }
     
     switch(h->menu_id) {
         case MENU_SYSTEM:
@@ -379,12 +579,19 @@ int menu_handle(void)
         }
         break;
 
+        case MENU_SENSOR:
+        {
+            menu_sensor_paint(h, font1, font2, item_h);
+        }
+        break;
+
         case MENU_MODBUS:
         {
             menu_modbus_paint(h, font1, font2, item_h, &kv);
         }
         break;
     }
+    h->uflag = 0;
     
     return 0;
 }

pro/ui/timer.c

@@ -16,19 +16,14 @@ typedef struct {
 
 static void timer_callback(sigval_t sv)
 {
-    
     timer_handle_t *h=(timer_handle_t*)sv.sival_ptr;
     if(h->fn) {
-        int last=0;
-        if(h->times_max>0) {
-            if(h->times<h->times_max) {
-                h->times++;
-            }
-            
+        if(h->times_max>0 && h->times<h->times_max) {
+            int last=0;
+            h->times++;
             if(h->times==h->times_max) {
                 last = 1;
             }
-            
             h->fn(h->arg, last);
         }
         else {