diff --git a/.gitignore b/.gitignore index 4b2bc4a..b0f0065 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ bin2/bl_temp.hex bin2/settings.hex build_log.txt output/ +screen_res/font/data/fontimg/* diff --git a/app/src/app_service/display_ctrl_service/display_mgr.c b/app/src/app_service/display_ctrl_service/display_mgr.c index eef9f0f..14a8217 100644 --- a/app/src/app_service/display_ctrl_service/display_mgr.c +++ b/app/src/app_service/display_ctrl_service/display_mgr.c @@ -325,9 +325,8 @@ static void page_charging_page_tmr_cb() { * 采样准备页面 * ***********************************************************************************************************************/ #if 1 -static int m_prepare_page_progress = 0; static void page_prepare_sample_show(int progress) { - m_prepare_page_progress = progress; + if (progress > 4) progress = 4; ssd1306_basic_clear_gram(); uint8_t x = 0; uint8_t y = 0; @@ -336,10 +335,14 @@ static void page_prepare_sample_show(int progress) { x = compute_x_pos_by_center(SCREEN_CENTER_X, font24x24_zh_lib.widthPixel * 4); y = compute_y_pos_by_center(SCREEN_CENTER_Y, font24x24_zh_lib.heightPixel); - ssd1306_basic_draw_str(x, y, &xchange, &ychange, "保持静止", &font24x24_zh_lib); + if (progress == 0) { + ssd1306_basic_draw_str(x, y, &xchange, &ychange, "放上双手", &font24x24_zh_lib); + }else{ + ssd1306_basic_draw_str(x, y, &xchange, &ychange, "保持静止", &font24x24_zh_lib); + } if (progress == 0) { - ssd1306_basic_draw_str(x - font8x8_xo_lib.widthPixel, y - font8x8_xo_lib.heightPixel, &xchange, &ychange, "xxxx", &font8x8_xo_lib); + ssd1306_basic_draw_str(x - font8x8_xo_lib.widthPixel, y - font8x8_xo_lib.heightPixel, &xchange, &ychange, " ", &font8x8_xo_lib); } else if (progress == 1) { ssd1306_basic_draw_str(x - font8x8_xo_lib.widthPixel, y - font8x8_xo_lib.heightPixel, &xchange, &ychange, "oxxx", &font8x8_xo_lib); } else if (progress == 2) { diff --git a/app/src/app_service/display_ctrl_service/font.h b/app/src/app_service/display_ctrl_service/font.h index 627cdb4..ee7cc0f 100644 --- a/app/src/app_service/display_ctrl_service/font.h +++ b/app/src/app_service/display_ctrl_service/font.h @@ -99,98 +99,145 @@ static FontLibrary_t font12x24_asiic_lib = { .heightPixel = 24, }; -const uint8_t font24x24_zh_code[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xF8, 0x38, 0x10, 0x10, 0xF0, 0x90, 0x10, 0x10, 0x10, 0x88, 0xF8, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x20, 0x10, 0x0C, 0x06, 0xE7, 0x1C, 0x10, 0x10, 0x10, 0x10, 0x93, 0x71, 0xFF, 0x39, 0x49, 0x89, 0x08, 0x08, 0x0C, 0x08, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x04, 0x02, 0x01, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x03, 0x07, 0x06, 0x06, 0x04, 0x04, 0x00, /*"保",0*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFC, 0xFC, 0xC0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x80, 0x80, 0xC2, 0x63, 0x33, 0xFF, 0x0D, 0x09, 0x08, 0x48, 0x48, 0x49, 0x48, 0x47, 0x4F, 0xFC, 0x24, 0x24, 0x26, 0x06, 0x04, 0x00, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x08, 0x38, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x20, 0x60, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*"持",1*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0xFC, 0x20, 0xA0, 0x20, 0x00, 0x80, 0x60, 0x3C, 0x2C, 0xA0, 0x70, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x08, 0x08, 0x0C, 0x94, 0x75, 0x55, 0x57, 0x15, 0xF4, 0x02, 0x90, 0x92, 0x92, 0x92, 0xFF, 0x92, 0x8A, 0x49, 0x3F, 0x08, 0x08, 0x08, 0x00, - 0x00, 0x00, 0x00, 0x18, 0x0F, 0x02, 0x01, 0x09, 0x18, 0x0F, 0x00, 0x00, 0x00, 0x20, 0x60, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*"静",2*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xF8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xF8, 0x00, 0x00, 0x00, 0xFF, 0x0F, 0x08, 0x08, 0x08, 0x0C, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x08, 0x08, 0x18, 0x08, 0x08, 0x08, 0x0F, 0x08, 0x08, 0x0C, 0x0F, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, /*"止",3*/ - 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x60, 0x60, 0x20, 0x20, 0x20, 0x20, 0xA0, 0xE0, 0x30, 0x30, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0x60, 0x30, 0x0D, 0xFF, 0x03, 0x00, 0x00, 0x10, 0x20, 0x60, 0xE0, 0xC0, 0x80, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, /*"不",4*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xE0, 0x20, 0x20, 0x10, 0x10, 0x10, 0xF8, 0xF8, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x70, 0x61, 0x87, 0x82, 0x06, 0xFE, 0x12, 0x11, 0x11, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x08, 0x04, 0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x02, 0x06, 0x0C, 0x0C, 0x18, 0x18, 0x18, 0x18, 0x18, 0x10, 0x00, 0x00, /*"足",5*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0xE0, 0x30, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x04, 0xC4, 0x64, 0x1A, 0xFF, 0x12, 0x32, 0x00, 0x18, 0x0F, 0x00, 0x00, 0x1F, 0x80, 0xE0, 0x3C, 0x08, 0x01, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x40, 0x20, 0x30, 0x18, 0x0C, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*"秒",6*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x20, 0x38, 0xF8, 0x20, 0x20, 0x20, 0x60, 0x9C, 0x24, 0x10, 0x10, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x67, 0x7E, 0x00, 0x10, 0x8C, 0x9B, 0xB9, 0xE4, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x23, 0x3F, 0x11, 0x13, 0x1D, 0x11, 0x1D, 0x17, 0x10, 0x18, 0x1F, 0x11, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, /*"蓝",7*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x10, 0x10, 0x10, 0x10, 0x10, 0xF0, 0x18, 0x18, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0F, 0x04, 0x84, 0x64, 0x34, 0x1E, 0x06, 0xFF, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x10, 0x20, 0x70, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*"牙",8*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0xF0, 0x70, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xFF, 0x0E, 0x08, 0x08, 0x08, 0x04, 0x04, 0x07, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 0x08, 0x08, 0x18, 0x18, 0x18, 0x10, 0x18, 0x18, 0x18, 0x18, 0x08, 0x08, 0x0C, 0x0E, 0x07, 0x00, 0x00, 0x00, /*"已",9*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x30, 0x10, 0xC0, 0xC0, 0x00, 0x00, 0x40, 0x20, 0x20, 0xA0, 0xF0, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x06, 0x67, 0x74, 0x2C, 0x26, 0x01, 0x00, 0x10, 0x50, 0x48, 0x44, 0xC3, 0xC3, 0x62, 0x24, 0x2C, 0x0C, 0x18, 0x10, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x04, 0x04, 0x06, 0x02, 0x02, 0x01, 0x10, 0x18, 0x08, 0x08, 0x08, 0x0F, 0x0B, 0x08, 0x08, 0x08, 0x0C, 0x0C, 0x08, 0x00, 0x00, /*"经",10*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xC0, 0x00, 0x00, 0x40, 0x40, 0xC0, 0xE0, 0x5C, 0x2C, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x08, 0xF8, 0x08, 0x00, 0x40, 0x48, 0x4E, 0x4B, 0x44, 0x45, 0xFF, 0x24, 0x24, 0x24, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, - 0x00, 0x00, 0x08, 0x0C, 0x04, 0x07, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x10, 0x10, 0x17, 0x30, 0x30, 0x30, 0x30, 0x30, 0x10, 0x10, 0x00, 0x00, /*"连",11*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x88, 0x98, 0xD0, 0xC0, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x80, 0x82, 0xC2, 0x62, 0xFF, 0x11, 0x91, 0x80, 0x80, 0x90, 0x92, 0xF4, 0xB0, 0x98, 0x97, 0x89, 0x48, 0x48, 0x48, 0x40, 0x00, 0x00, - 0x00, 0x01, 0x01, 0x00, 0x00, 0x18, 0x3F, 0x0F, 0x00, 0x00, 0x20, 0x20, 0x13, 0x12, 0x0C, 0x06, 0x0F, 0x08, 0x18, 0x30, 0x20, 0x00, 0x00, 0x00, /*"接",12*/ - 0x00, 0x00, 0x00, 0xE0, 0x40, 0x40, 0x80, 0x00, 0xF8, 0x88, 0x40, 0x20, 0x00, 0x80, 0x80, 0x40, 0x40, 0x20, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xFF, 0x80, 0x40, 0x25, 0x1A, 0xFF, 0x12, 0x12, 0x12, 0x00, 0xE0, 0x3F, 0x08, 0x04, 0xFC, 0xFC, 0x04, 0x04, 0x04, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x07, 0x04, 0x02, 0x02, 0x02, 0x03, 0x02, 0x12, 0x08, 0x06, 0x01, 0x00, 0x00, 0x00, 0x7F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, /*"断",13*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x60, 0xE0, 0x20, 0x20, 0x20, 0x20, 0xF0, 0x30, 0x30, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xE8, 0x3F, 0x08, 0x08, 0x04, 0x04, 0xFF, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x04, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x04, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*"开",14*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xF8, 0x80, 0x80, 0x80, 0x80, 0xC0, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x03, 0x7F, 0x81, 0x89, 0x49, 0xC8, 0xFF, 0x4C, 0x44, 0x44, 0x40, 0x3C, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x18, 0x10, 0x10, 0x30, 0x30, 0x30, 0x10, 0x10, 0x1A, 0x1C, 0x00, 0x00, 0x00, /*"电",15*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x78, 0xA8, 0xA8, 0xA8, 0xA8, 0x88, 0xE4, 0x7C, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x14, 0xF4, 0x94, 0x14, 0x52, 0xF2, 0xAA, 0xAA, 0x8A, 0xFA, 0x3A, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x24, 0x25, 0x25, 0x25, 0x3F, 0x24, 0x24, 0x27, 0x30, 0x30, 0x30, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, /*"量",16*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0xC0, 0xC6, 0xFC, 0xA0, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x20, 0x10, 0x08, 0x24, 0xE6, 0xA3, 0xA1, 0x94, 0xAF, 0x10, 0x11, 0xF3, 0xF6, 0x2C, 0x0C, 0x18, 0x18, 0x18, 0x10, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x21, 0x27, 0x24, 0x24, 0x34, 0x12, 0x16, 0x13, 0x10, 0x10, 0x10, 0x10, 0x30, 0x00, 0x00, 0x00, 0x00, /*"查",17*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x90, 0x90, 0xF0, 0xB8, 0x88, 0x8C, 0xCC, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0xC8, 0x78, 0xFC, 0xA7, 0xA4, 0xA4, 0xA4, 0x14, 0x14, 0xF2, 0x22, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, - 0x00, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x3F, 0x14, 0x14, 0x14, 0x12, 0x10, 0x30, 0x7F, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*"看",18*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x38, 0x10, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x38, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0xC6, 0x65, 0x3C, 0x2C, 0x23, 0x01, 0x80, 0x02, 0x22, 0x22, 0x22, 0x22, 0x3F, 0x91, 0x91, 0x91, 0x01, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x0C, 0x04, 0x06, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x03, 0x1F, 0x09, 0x09, 0x09, 0x08, 0x08, 0x0F, 0x01, 0x00, 0x00, 0x00, /*"结",19*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0xF0, 0x10, 0x90, 0x90, 0xF0, 0xF0, 0xD0, 0x10, 0x88, 0xF8, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x21, 0x27, 0xA4, 0x64, 0xFF, 0x52, 0x92, 0x12, 0x13, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x20, 0x20, 0x10, 0x08, 0x04, 0x06, 0x03, 0x01, 0x00, 0x7F, 0x00, 0x00, 0x01, 0x02, 0x06, 0x0C, 0x18, 0x18, 0x18, 0x10, 0x00, 0x00, /*"果",20*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0xD0, 0x90, 0x18, 0x0C, 0x88, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x20, 0x20, 0x60, 0x20, 0x20, 0x20, 0x22, 0x22, 0x33, 0x11, 0xFF, 0x11, 0x11, 0x11, 0x11, 0x10, 0x18, 0x18, 0x18, 0x10, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x60, 0x78, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*"手",21*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x86, 0xC2, 0x32, 0x0F, 0xFF, 0x21, 0x61, 0x01, 0x01, 0xFF, 0x01, 0x01, 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, - 0x00, 0x04, 0x02, 0x01, 0x00, 0x00, 0x3F, 0x0F, 0x00, 0x08, 0x04, 0x03, 0x01, 0x00, 0x00, 0x00, 0x07, 0x06, 0x0C, 0x0C, 0x0C, 0x0F, 0x06, 0x00, /*"机",22*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x20, 0x20, 0x50, 0xD0, 0x88, 0x0C, 0x8C, 0x40, 0x70, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x11, 0xD0, 0x70, 0x32, 0xFC, 0x30, 0x48, 0x88, 0x88, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x08, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x30, 0x7F, 0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x06, 0x0C, 0x0C, 0x04, 0x08, 0x00, 0x00, /*"采",23*/ - 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0xF0, 0x0C, 0x24, 0xA0, 0xA4, 0xEC, 0xE8, 0x90, 0x50, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0xBF, 0x90, 0x90, 0xD2, 0xF2, 0xCF, 0x4B, 0x4A, 0x49, 0x48, 0x48, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x20, 0x10, 0x10, 0x08, 0x04, 0x06, 0x03, 0x01, 0x7F, 0x00, 0x01, 0x02, 0x04, 0x0C, 0x18, 0x18, 0x18, 0x10, 0x10, 0x00, 0x00, /*"集",24*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x7C, 0xC0, 0x80, 0x80, 0x88, 0x98, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x02, 0xFE, 0x42, 0x42, 0x22, 0x22, 0xE1, 0x21, 0x03, 0x1F, 0x70, 0x80, 0xE0, 0x3C, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x10, 0x08, 0x06, 0x03, 0x00, 0x04, 0x08, 0x1C, 0x07, 0x00, 0x08, 0x04, 0x02, 0x01, 0x07, 0x0C, 0x18, 0x30, 0x70, 0x78, 0x00, 0x00, /*"成",25*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x81, 0x81, 0xC1, 0x7F, 0x20, 0x20, 0x20, 0x12, 0x82, 0xE2, 0x3E, 0x07, 0x02, 0x01, 0x01, 0xFF, 0x0F, 0x02, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x10, 0x10, 0x08, 0x04, 0x03, 0x01, 0x00, 0x04, 0x08, 0x38, 0x1C, 0x0F, 0x01, 0x00, 0x00, 0x00, 0x00, /*"功",26*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x80, 0x80, 0x80, 0x40, 0x48, 0x58, 0x50, 0x40, 0x20, 0x20, 0xA0, 0xE0, 0xC0, 0x40, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x07, 0x01, 0x40, 0x60, 0x24, 0xE4, 0x26, 0x22, 0xF2, 0x12, 0x10, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x10, 0x08, 0x04, 0x06, 0x03, 0x00, 0x00, 0x00, 0x1F, 0x30, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x3E, 0x10, 0x00, 0x00, /*"完",27*/ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x78, 0x10, 0x00, 0x80, 0x80, 0x40, 0x40, 0xA0, 0x38, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x20, 0x18, 0x0C, 0x03, 0xFD, 0x00, 0x00, 0x00, 0xE1, 0xFF, 0x10, 0x88, 0x0F, 0x3C, 0xE4, 0x84, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x1F, 0x00, 0x00, 0x04, 0x0F, 0x03, 0x01, 0x00, 0x04, 0x0C, 0x00, 0x01, 0x06, 0x0C, 0x18, 0x3E, 0x30, 0x00, /*"低",28*/ +const uint8_t + font24x24_zh_code[] = + { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x1C, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x82, 0xFF, 0x21, 0x21, 0x11, 0xF9, 0x01, 0x60, 0x1C, + 0x63, 0x82, 0x62, 0x1F, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x10, 0x0C, 0x03, 0x10, 0x10, 0x70, + 0x4F, 0x40, 0x20, 0x10, 0x08, 0x06, 0x01, 0x06, 0x08, 0x70, 0x60, 0x40, 0x40, 0x00, 0x00, // [0], "放",Size:72, W24×H24, addr:0x0000 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x1F, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // [1], "上",Size:72, W24×H24, addr:0x0048 + 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x10, 0x10, 0x90, 0x78, 0x10, 0x10, 0x10, 0x10, 0x10, 0x90, 0x78, 0x08, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x86, 0x68, 0x38, 0xE7, 0x80, 0x00, 0x07, 0x88, + 0x70, 0xD8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x04, 0x03, 0x00, 0x40, 0x20, + 0x10, 0x0B, 0x04, 0x02, 0x01, 0x00, 0x00, 0x03, 0x0C, 0x18, 0x10, 0x10, 0x00, 0x00, 0x00, // [2], "双",Size:72, W24×H24, addr:0x0090 + 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0xF0, 0x08, 0x08, 0x08, 0x04, 0x06, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xFF, 0x21, + 0x21, 0x21, 0x11, 0x11, 0x11, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, + 0x10, 0x20, 0x60, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [3], "手",Size:72, W24×H24, addr:0x00D8 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xE0, 0x1C, 0x00, 0x00, 0x08, 0xF0, 0x10, 0x10, 0x10, 0x10, 0x10, 0xD0, 0x38, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0C, 0x02, 0xF9, 0x07, 0x00, 0x20, 0x20, 0x22, 0x27, 0xE2, 0x62, + 0xFE, 0x72, 0x92, 0x11, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x10, 0x08, + 0x04, 0x02, 0x01, 0x00, 0x20, 0x7F, 0x00, 0x01, 0x02, 0x0C, 0x18, 0x10, 0x10, 0x00, 0x00, // [4], "保",Size:72, W24×H24, addr:0x0120 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0x08, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0xFC, 0x40, 0x40, 0x40, 0x40, + 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC2, 0x41, 0x21, 0xEF, 0x11, 0x11, 0x4D, 0x4D, 0xC4, 0x44, 0x44, + 0x47, 0x24, 0xF4, 0x2C, 0x24, 0x22, 0x22, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x7F, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x03, 0x00, 0x10, 0x20, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [5], "持",Size:72, W24×H24, addr:0x0168 + 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0xA0, 0xFC, 0xA0, 0xA0, 0xA0, 0x00, 0x80, 0x60, 0x50, 0x4C, 0x40, 0xE0, 0x20, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0xFD, 0x95, 0x94, 0x53, 0x92, 0xFA, 0x02, 0x02, 0x13, 0x12, + 0x12, 0xFE, 0x93, 0x92, 0x92, 0xFF, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x02, 0x02, 0x12, 0x22, + 0x7F, 0x00, 0x00, 0x00, 0x11, 0x21, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [6], "静",Size:72, W24×H24, addr:0x01B0 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0xFB, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x10, 0x1F, 0x10, + 0x10, 0x10, 0x10, 0x1F, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x10, 0x00, 0x00, // [7], "止",Size:72, W24×H24, addr:0x01F8 + 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x90, 0x70, 0x30, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x03, 0xFC, 0x00, + 0x00, 0x08, 0x08, 0x10, 0x20, 0x60, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x20, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [8], "不",Size:72, W24×H24, addr:0x0240 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0xC8, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x7F, 0x02, 0x02, 0x02, 0xFE, 0x21, 0x21, + 0x21, 0x21, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x30, 0x08, 0x06, 0x01, 0x01, 0x01, + 0x02, 0x02, 0x07, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, // [9], "足",Size:72, W24×H24, addr:0x0288 + 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x10, 0xF0, 0x08, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFC, 0x00, 0x80, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x42, 0x32, 0x0E, 0xFF, 0x09, 0x31, 0x61, 0x18, 0x06, 0x01, + 0x00, 0x10, 0x1F, 0x80, 0x70, 0x20, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, + 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [10], "秒",Size:72, W24×H24, addr:0x02D0 + 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x20, 0x20, 0x20, 0xFC, 0x20, 0x20, 0x20, 0xE0, 0x38, 0x24, 0x10, 0x10, 0x10, + 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0xFE, 0x00, 0x00, 0x7F, 0x00, 0x30, 0x0C, 0x03, + 0x0A, 0x12, 0xB2, 0x82, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x3F, 0x21, 0x21, + 0x21, 0x3F, 0x21, 0x31, 0x2F, 0x21, 0x21, 0x3F, 0x20, 0x20, 0x20, 0x10, 0x00, 0x00, 0x00, // [11], "蓝",Size:72, W24×H24, addr:0x0318 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x90, 0x10, 0x10, 0x10, 0x08, 0x08, 0xF8, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x84, 0x84, 0x44, 0x34, 0x1C, 0x0C, + 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0x02, 0x01, 0x00, + 0x00, 0x08, 0x10, 0x20, 0x60, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [12], "牙",Size:72, W24×H24, addr:0x0360 + 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xF8, 0x08, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF6, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, + 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3F, 0x20, 0x00, 0x00, // [13], "已",Size:72, W24×H24, addr:0x03A8 + 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x1C, 0x00, 0x00, 0x80, 0x10, 0x10, 0x10, 0x10, 0x10, 0x88, 0x68, 0x18, 0x08, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x86, 0xC5, 0xB4, 0x8A, 0x46, 0x63, 0x50, 0x50, 0x48, 0x44, 0x42, + 0xC1, 0x40, 0x21, 0x22, 0x24, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x19, 0x08, 0x08, 0x08, 0x04, 0x24, + 0x24, 0x20, 0x20, 0x20, 0x20, 0x3F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x00, 0x00, 0x00, // [14], "经",Size:72, W24×H24, addr:0x03F0 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x60, 0x00, 0x00, 0x40, 0x40, 0x40, 0xC0, 0x70, 0x4C, 0x40, 0x20, 0x20, 0x20, + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xF4, 0x0E, 0x00, 0x80, 0x8C, 0x8B, 0x88, 0x88, + 0xFF, 0x48, 0x48, 0x44, 0x44, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x06, 0x09, 0x08, + 0x08, 0x10, 0x10, 0x10, 0x10, 0x2F, 0x20, 0x20, 0x60, 0x60, 0x20, 0x20, 0x20, 0x00, 0x00, // [15], "连",Size:72, W24×H24, addr:0x0438 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x80, 0x80, 0x40, 0x40, 0xC0, 0x42, 0x44, 0x58, 0x20, 0xE0, 0x20, + 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x41, 0x41, 0x21, 0xFF, 0x11, 0x88, 0x88, 0x88, 0x88, 0xC8, 0x7B, + 0x58, 0x44, 0x47, 0xC4, 0x44, 0x44, 0x44, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x7F, 0x80, 0x80, + 0x40, 0x40, 0x22, 0x25, 0x14, 0x08, 0x0C, 0x0B, 0x10, 0x10, 0x20, 0x60, 0x00, 0x00, 0x00, // [16], "接",Size:72, W24×H24, addr:0x0480 + 0x00, 0x00, 0x00, 0xE0, 0x40, 0x20, 0xC0, 0x00, 0xFC, 0x00, 0xC0, 0x38, 0x00, 0xF0, 0x20, 0x20, 0x10, 0x10, 0x08, + 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0xC2, 0x23, 0x1E, 0xFF, 0x0B, 0x12, 0x22, 0x00, 0xFB, + 0x04, 0x04, 0x04, 0x04, 0xFC, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1F, 0x09, 0x08, 0x08, 0x08, 0x0F, + 0x48, 0x28, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x3C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, // [17], "断",Size:72, W24×H24, addr:0x04C8 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0xF0, 0x10, 0x10, 0x10, 0x10, 0xD0, 0x30, 0x08, 0x08, 0x08, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x88, 0x7F, 0x08, 0x08, 0x08, 0x08, + 0xFB, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x10, 0x08, 0x06, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [18], "开",Size:72, W24×H24, addr:0x0510 + 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0xFC, 0x80, 0x80, 0x80, 0x80, 0x80, 0xC0, 0x40, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x11, 0x11, 0x11, 0x09, 0x88, 0xFF, 0x88, 0x88, + 0x88, 0x88, 0x88, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x01, 0x01, 0x01, + 0x01, 0x00, 0x3F, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6C, 0x30, 0x00, 0x00, // [19], "电",Size:72, W24×H24, addr:0x0558 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x48, 0x48, 0x28, 0xA8, 0xA8, 0xA8, 0xA8, 0xC8, 0xF8, 0x0C, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0xF7, 0x95, 0x95, 0x95, 0xB4, 0x54, 0x54, + 0x54, 0x94, 0xF4, 0x1A, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x53, 0x52, + 0x52, 0x4A, 0x7F, 0x4A, 0x4A, 0x49, 0x49, 0x49, 0x48, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, // [20], "量",Size:72, W24×H24, addr:0x05A0 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0xC0, 0xFE, 0x44, 0xA0, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08, 0x08, 0x14, 0xE2, 0x21, 0xA0, 0xAF, 0x90, 0x90, + 0x11, 0xF1, 0x12, 0x04, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x4F, + 0x25, 0x24, 0x24, 0x24, 0x24, 0x25, 0x27, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, // [21], "查",Size:72, W24×H24, addr:0x05E8 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90, 0x90, 0x90, 0x90, 0xD0, 0xB8, 0x48, 0x48, 0x48, 0x44, 0x44, 0x40, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x84, 0x44, 0x24, 0x1C, 0xEE, 0xA3, 0xA2, 0x92, 0x92, + 0x92, 0x92, 0xF2, 0x12, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x7F, 0x24, 0x24, 0x24, 0x22, 0x22, 0x22, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [22], "看",Size:72, W24×H24, addr:0x0630 + 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x20, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x04, 0x00, 0x80, 0x80, + 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x87, 0xE4, 0x94, 0x4C, 0x43, 0x01, 0x01, 0x91, 0x11, 0x91, + 0x9F, 0x91, 0x91, 0x90, 0xC8, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x08, 0x08, 0x04, 0x04, + 0x04, 0x04, 0x3F, 0x21, 0x20, 0x10, 0x10, 0x10, 0x1C, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, // [23], "结",Size:72, W24×H24, addr:0x0678 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xF0, 0x90, 0x88, 0x48, 0xF8, 0x48, 0x48, 0x48, 0x88, 0xF8, 0x0C, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x2F, 0x24, 0xA4, 0x64, 0xFF, 0x24, 0x62, + 0xA2, 0x12, 0x13, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x04, 0x04, 0x02, 0x01, + 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0C, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, // [24], "果",Size:72, W24×H24, addr:0x06C0 + 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0xF0, 0x08, 0x08, 0x08, 0x04, 0x06, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xFF, 0x21, + 0x21, 0x21, 0x11, 0x11, 0x11, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, + 0x10, 0x20, 0x60, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [25], "手",Size:72, W24×H24, addr:0x0708 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x20, 0x20, 0x20, 0xE0, 0x10, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x42, 0x31, 0x0D, 0xFF, 0x09, 0x11, 0x01, 0x80, 0x7F, 0x00, + 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x20, 0x3F, 0x60, + 0x10, 0x0C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x30, 0x20, 0x20, 0x20, 0x3E, 0x00, 0x00, // [26], "机",Size:72, W24×H24, addr:0x0750 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x90, 0x10, 0x10, 0x10, 0xD0, 0x88, 0x08, 0x08, 0x04, 0xC4, 0x64, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0x10, 0x11, 0x91, 0xD0, 0x30, 0xFE, 0x11, 0x70, + 0x96, 0x11, 0x10, 0x10, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08, 0x04, 0x02, 0x03, 0x01, + 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0C, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, // [27], "采",Size:72, W24×H24, addr:0x0798 + 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0xF0, 0x4C, 0x40, 0x40, 0x40, 0xEC, 0x38, 0x20, 0xA0, 0xA0, 0x20, 0x20, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x20, 0x1F, 0x25, 0x25, 0x25, 0xF5, 0x1F, 0x95, + 0x95, 0x94, 0x94, 0x90, 0x90, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x21, 0x11, 0x11, 0x09, 0x09, 0x05, + 0x03, 0x03, 0x7F, 0x01, 0x02, 0x02, 0x04, 0x08, 0x18, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // [28], "集",Size:72, W24×H24, addr:0x07E0 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xFC, 0x00, 0x84, 0x88, 0x90, 0x80, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x21, 0x21, 0x21, 0xF1, 0x11, 0x01, 0x0F, + 0xF1, 0x80, 0x40, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x18, 0x07, 0x00, 0x04, 0x08, + 0x18, 0x07, 0x08, 0x04, 0x02, 0x03, 0x03, 0x04, 0x18, 0x30, 0x20, 0x7C, 0x00, 0x00, 0x00, // [29], "成",Size:72, W24×H24, addr:0x0828 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x04, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0xFF, 0x80, 0x80, 0x80, 0x44, 0x02, 0xC2, + 0x3F, 0x02, 0x02, 0x02, 0x02, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x40, + 0x20, 0x10, 0x08, 0x06, 0x01, 0x10, 0x10, 0x20, 0x60, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, // [30], "功",Size:72, W24×H24, addr:0x0870 + 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x44, 0x58, 0x40, 0x40, 0x40, 0x40, 0x40, 0xA0, + 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x21, 0x20, 0x20, 0x20, 0xE4, 0x24, 0x24, 0x22, 0xE2, + 0x22, 0x22, 0x20, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x06, + 0x01, 0x00, 0x00, 0x00, 0x3F, 0x20, 0x40, 0x40, 0x40, 0x40, 0x24, 0x38, 0x00, 0x00, 0x00, // [31], "完",Size:72, W24×H24, addr:0x08B8 + 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x30, 0x1E, 0x00, 0x10, 0xE0, 0x20, 0x20, 0x20, 0xF0, 0x10, 0x10, 0x08, 0x0C, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x06, 0x01, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x08, 0x08, 0x08, + 0x08, 0x7F, 0x84, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, + 0x10, 0x1F, 0x08, 0x04, 0x0A, 0x08, 0x30, 0x03, 0x04, 0x18, 0x30, 0x20, 0x7F, 0x00, 0x00, // [32], "低",Size:72, W24×H24, addr:0x0900 }; static FontLibrary_t font24x24_zh_lib = { .font = font24x24_zh_code, - .fontIndex = "保持静止不足秒蓝牙已经连接断开电量查看结果手机采集成功完低", + .fontIndex = "放上双手保持静止不足秒蓝牙已经连接断开电量查看结果手机采集成功完低", .fontIndexLen = 88, .fontCode = kgbk, .isAscii = false, diff --git a/app/src/app_service/ecg_service/ecg_service.c b/app/src/app_service/ecg_service/ecg_service.c index 5302824..0e394ef 100644 --- a/app/src/app_service/ecg_service/ecg_service.c +++ b/app/src/app_service/ecg_service/ecg_service.c @@ -227,7 +227,7 @@ static void leadoff_state_process(ads129x_capture_data_t* capture_data) { } if (leadoff != m_leadoffstate) { - if (m_leadoffstate && un_leadoffcnt > 10) { + if (m_leadoffstate && un_leadoffcnt > 1500) { m_leadoffstate = false; } else { m_leadoffstate = true; diff --git a/app/src/one_conduction_main.c b/app/src/one_conduction_main.c index 7bf8a65..a2fd1e6 100644 --- a/app/src/one_conduction_main.c +++ b/app/src/one_conduction_main.c @@ -340,7 +340,7 @@ void on_zapp_ebus_event(void* p_event_data, uint16_t event_size) { beep_set_effect(START_SAMPLE_EFFECT); } else if (event == kappevent_state_machine_state_exit) { } else { - if (zble_module_has_disconnected_ms() >= 1000) { + if (zble_module_has_disconnected_ms() >= 5000) { ecg_service_stop_capture(); zapp_state_machine_change_state(kstate_standby); } else if (event == kappevent_stop_capture) { @@ -350,13 +350,17 @@ void on_zapp_ebus_event(void* p_event_data, uint16_t event_size) { if (event == kappevent_tmr_1s_scheduler_event) { if (ecg_leadoff_detect()) { m_capture_prepare_progress = 0; - dsp_mgr_page_sample_prepare_set_progress(m_capture_prepare_progress / 2); + dsp_mgr_page_sample_prepare_set_progress(m_capture_prepare_progress); } else { - if (m_capture_prepare_progress < 4 * 2) { + if (m_capture_prepare_progress < 4) { m_capture_prepare_progress++; - dsp_mgr_page_sample_prepare_set_progress(m_capture_prepare_progress / 2); + dsp_mgr_page_sample_prepare_set_progress(m_capture_prepare_progress); } else { + /** + * @brief 开始采集 + */ zapp_state_machine_change_state(kstate_capture); + beep_set_effect(POWER_ON_EFFECT); } } } @@ -453,7 +457,7 @@ void one_conduction_main() { dsp_mgr_init(); ecg_service_init(); - // zapp_state_machine_change_state(kstate_capture); + zapp_state_machine_change_state(kstate_prepare_capture); zble_module_start_adv(); zapp_start_schedule(); diff --git a/screen_res/姹夊瓧鐢熸垚/PC2LCD2021.exe b/screen_res/font/PC2LCD2021.exe similarity index 100% rename from screen_res/姹夊瓧鐢熸垚/PC2LCD2021.exe rename to screen_res/font/PC2LCD2021.exe diff --git a/screen_res/font/data/config/FontsCfg.table b/screen_res/font/data/config/FontsCfg.table new file mode 100644 index 0000000..e960c94 --- /dev/null +++ b/screen_res/font/data/config/FontsCfg.table @@ -0,0 +1,3 @@ +锘縶 +cfg={offsetH="0";cutDown=0;fontH=24;userImgPixClrN=4282994728;userImgPixClrP=4288471279;userImgMaxNum=223.22222222222;isRotate180FlipX=false;imgW=24;userImgPixSize="5";imgH=24;userImgDir="./data/fontimg/";cutRight=0;cwRotate90=0;font="浠垮畫";fontStyple=0;offsetV="0";cutLeft=0;cutUp=0;isRotate180FlipY=false;fontW=24} +} \ No newline at end of file diff --git a/screen_res/font/data/config/array2ImgFrom.table b/screen_res/font/data/config/array2ImgFrom.table new file mode 100644 index 0000000..d596e6c --- /dev/null +++ b/screen_res/font/data/config/array2ImgFrom.table @@ -0,0 +1,16 @@ +锘縶 +edtOffset="0"; +rdScanModeH=0; +afterLoad=null; +cmbbxMode=1; +rdScanModeVH=1; +rdByteLsb=1; +rdComVcc=0; +edtImgW='8\r\n'; +edtImgH="16"; +rdScanModeHV=0; +edtArray=' { 0x08,0xF8,0x08,0x08,0x08,0xC8,0x18,0x00,0x00,0x3F,0x21,0x21,0x21,0x23,0x30,0x00, }/* 0, "涓",Size:100, 25脳25 */'; +rdByteMsb=0; +rdScanModeV=0; +rdComGnd=1 +} \ No newline at end of file diff --git a/screen_res/姹夊瓧鐢熸垚/data/config/arrayCfg.table b/screen_res/font/data/config/arrayCfg.table similarity index 98% rename from screen_res/姹夊瓧鐢熸垚/data/config/arrayCfg.table rename to screen_res/font/data/config/arrayCfg.table index d568251..2691e5f 100644 --- a/screen_res/姹夊瓧鐢熸垚/data/config/arrayCfg.table +++ b/screen_res/font/data/config/arrayCfg.table @@ -1,6 +1,6 @@ 锘縶 +isByteMsb=0; txtLineCharMaxNum=20; scanMode="VH"; -isByteMsb=0; isCommonGnd=1 } \ No newline at end of file diff --git a/screen_res/姹夊瓧鐢熸垚/data/config/arrayCfgFrom.table b/screen_res/font/data/config/arrayCfgFrom.table similarity index 99% rename from screen_res/姹夊瓧鐢熸垚/data/config/arrayCfgFrom.table rename to screen_res/font/data/config/arrayCfgFrom.table index 9d7149b..812acdf 100644 --- a/screen_res/姹夊瓧鐢熸垚/data/config/arrayCfgFrom.table +++ b/screen_res/font/data/config/arrayCfgFrom.table @@ -1,13 +1,13 @@ 锘縶 +rdScanModeH=0; afterLoad=null; rdScanModeVH=1; rdByteLsb=1; rdComVcc=0; beforeSave=null; -rdByteMsb=0; -rdScanModeH=0; +edtTxtRowByteNum="20"; rdScanModeHV=0; rdScanModeV=0; -edtTxtRowByteNum="20"; +rdByteMsb=0; rdComGnd=1 } \ No newline at end of file diff --git a/screen_res/姹夊瓧鐢熸垚/data/config/bottomFrom.table b/screen_res/font/data/config/bottomFrom.table similarity index 100% rename from screen_res/姹夊瓧鐢熸垚/data/config/bottomFrom.table rename to screen_res/font/data/config/bottomFrom.table diff --git a/screen_res/姹夊瓧鐢熸垚/瀛楀簱鐢熸垚閰嶇疆.png b/screen_res/font/瀛楀簱鐢熸垚閰嶇疆.png similarity index 100% rename from screen_res/姹夊瓧鐢熸垚/瀛楀簱鐢熸垚閰嶇疆.png rename to screen_res/font/瀛楀簱鐢熸垚閰嶇疆.png diff --git a/screen_res/姹夊瓧鐢熸垚/瀛楀簱鐢熸垚閰嶇疆2.png b/screen_res/font/瀛楀簱鐢熸垚閰嶇疆2.png similarity index 100% rename from screen_res/姹夊瓧鐢熸垚/瀛楀簱鐢熸垚閰嶇疆2.png rename to screen_res/font/瀛楀簱鐢熸垚閰嶇疆2.png diff --git a/screen_res/姹夊瓧鐢熸垚/data/config/array2ImgFrom.table b/screen_res/姹夊瓧鐢熸垚/data/config/array2ImgFrom.table deleted file mode 100644 index 620cc4f..0000000 --- a/screen_res/姹夊瓧鐢熸垚/data/config/array2ImgFrom.table +++ /dev/null @@ -1,16 +0,0 @@ -锘縶 -edtOffset="25"; -rdByteMsb=1; -afterLoad=null; -cmbbxMode=1; -rdScanModeVH=0; -rdByteLsb=0; -rdComVcc=0; -edtImgW="25"; -edtImgH="25"; -rdScanModeH=1; -edtArray=' { 0x00,0x1C,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x0C,0x00, 0x1F,0xFF,0xFE,0x00,0x1C,0x0C,0x0C,0x00,0x1C,0x0C,0x0C,0x00,0x1C,0x0C,0x0C,0x00,0x1C,0x0C,0x0C,0x00, 0x1C,0x0C,0x0C,0x00,0x1C,0x0C,0x0C,0x00,0x1F,0xFF,0xFC,0x00,0x1C,0x0C,0x0C,0x00,0x18,0x0C,0x0C,0x00, 0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00, 0x00,0x1C,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, },/* 0, "涓",Size:100, 25脳25 */'; -rdScanModeV=0; -rdScanModeHV=0; -rdComGnd=1 -} \ No newline at end of file diff --git a/screen_res/姹夊瓧鐢熸垚/data/fontimg/img1.jpg b/screen_res/姹夊瓧鐢熸垚/data/fontimg/img1.jpg deleted file mode 100644 index adc199a..0000000 Binary files a/screen_res/姹夊瓧鐢熸垚/data/fontimg/img1.jpg and /dev/null differ diff --git a/screen_res/姹夊瓧鐢熸垚/data/fontimg/img2.jpg b/screen_res/姹夊瓧鐢熸垚/data/fontimg/img2.jpg deleted file mode 100644 index 270ee5a..0000000 Binary files a/screen_res/姹夊瓧鐢熸垚/data/fontimg/img2.jpg and /dev/null differ diff --git a/scripter/flash.bat b/scripter/flash.bat index f4716de..e4e6655 100644 --- a/scripter/flash.bat +++ b/scripter/flash.bat @@ -4,16 +4,7 @@ echo "Start flashing..." call scripter\unlock.bat - -@REM 烧录整体镜像 -nrfjprog --eraseall -f NRF52 %全擦除% -if %errorlevel% neq 0 ( - echo EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE - echo E 擦除失败 E - echo EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE - exit /b 1 -) -nrfjprog --program output/app_whole.hex --verify -f NRF52 %烧录% +nrfjprog --program output/app_whole.hex -f NRF52 %烧录% if %errorlevel% neq 0 ( echo EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE echo E 烧录失败 E