Compare commits

..

2 Commits

Author SHA1 Message Date
f95f13188c 增加文件选取功能,选取后跳转到烧录界面 2025-04-02 17:46:41 +08:00
96c441aedd 取消button log输出 2025-04-02 16:42:03 +08:00
11 changed files with 544 additions and 173 deletions

View File

@ -237,7 +237,7 @@ static void lvgl_port_btn_longhold_handler(void *arg, void *arg2)
if (ctx && button) { if (ctx && button) {
// 调试输出按钮事件 // 调试输出按钮事件
iot_button_print_event(button); // iot_button_print_event(button);
/* PREV 按钮长按 */ /* PREV 按钮长按 */
if (button == ctx->btn[LVGL_PORT_NAV_BTN_PREV]) { if (button == ctx->btn[LVGL_PORT_NAV_BTN_PREV]) {
ctx->btn_longhold = true; ctx->btn_longhold = true;

View File

@ -10,12 +10,39 @@
#include "events_init.h" #include "events_init.h"
#include <stdio.h> #include <stdio.h>
#include "lvgl.h" #include "lvgl.h"
#include "spiffs.h"
static const char *TAG = "events_init";
#if LV_USE_GUIDER_SIMULATOR && LV_USE_FREEMASTER #if LV_USE_GUIDER_SIMULATOR && LV_USE_FREEMASTER
#include "freemaster_client.h" #include "freemaster_client.h"
#endif #endif
extern lv_indev_t *lvgl_button_indev; extern lv_indev_t *lvgl_button_indev;
const char* chip_list[6] = {
"esp32c2",
"esp32c3",
"esp32c6",
"esp32",
"esp32s2",
"esp32s3",
};
static char chip_path[48] = {0};
static char download_file[64] = {0};
static void file_btn_event_handler(lv_event_t *e) {
lv_obj_t *btn = lv_event_get_target(e); // 获取被点击的按钮
const char *btn_text = lv_list_get_btn_text(guider_ui.screen_imglist_list_1,btn); // 获取按钮上的文本
memset(&download_file[0],0x00,64);
sprintf(&download_file[0],"%s/%s",chip_path,btn_text);
printf("被点击的文件: %s\n", download_file);
ui_load_scr_animation(&guider_ui, &guider_ui.sscreen_burn, guider_ui.sscreen_burn_del, &guider_ui.screen_imglist_del, setup_scr_sscreen_burn, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, true);
}
static void key_event_handler(lv_event_t *e) static void key_event_handler(lv_event_t *e)
{ {
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
@ -33,12 +60,30 @@ static void key_event_handler(lv_event_t *e)
lv_group_add_obj(guider_ui.home_btn_group,guider_ui.screen_btn_1); lv_group_add_obj(guider_ui.home_btn_group,guider_ui.screen_btn_1);
lv_group_add_obj(guider_ui.home_btn_group,guider_ui.screen_btn_2); lv_group_add_obj(guider_ui.home_btn_group,guider_ui.screen_btn_2);
lv_group_add_obj(guider_ui.home_btn_group,guider_ui.screen_btn_3); lv_group_add_obj(guider_ui.home_btn_group,guider_ui.screen_btn_3);
}else{
lv_obj_t *dropdown = lv_event_get_target(e);
uint16_t selected_index = lv_dropdown_get_selected(dropdown);
sprintf(&chip_path[0],"/spiffs/%s",chip_list[selected_index]);
// printf("用户选择了: %s (索引: %d)\n", chip_list[selected_index], selected_index);
lv_obj_clean(guider_ui.screen_imglist_list_1);
lv_obj_t *file_btn[5];
spiffs_list_t directory[5];
uint8_t file_num = 0;
file_num = list_files_in_spiffs(chip_path,directory,5);
for(int i=0;i<file_num;i++)
{
ESP_LOGI(TAG,"[%d] Fond esp32s2 file:%s,size:%ld",i,directory[i].name,directory[i].size);
file_btn[i] = lv_list_add_btn(guider_ui.screen_imglist_list_1,NULL,directory[i].name);
lv_obj_add_event_cb(file_btn[i], file_btn_event_handler, LV_EVENT_CLICKED, NULL);
lv_group_add_obj(guider_ui.imglist_group,file_btn[i]);
}
} }
} }
} }
static void screen_btn_1_event_handler (lv_event_t *e) static void screen_btn_1_event_handler (lv_event_t *e)
{ {
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
@ -49,10 +94,31 @@ static void screen_btn_1_event_handler (lv_event_t *e)
ui_load_scr_animation(&guider_ui, &guider_ui.screen_imglist, guider_ui.screen_imglist_del, &guider_ui.screen_del, setup_scr_screen_imglist, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, false); ui_load_scr_animation(&guider_ui, &guider_ui.screen_imglist, guider_ui.screen_imglist_del, &guider_ui.screen_del, setup_scr_screen_imglist, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, false);
lv_indev_set_group(lvgl_button_indev, guider_ui.imglist_group); lv_indev_set_group(lvgl_button_indev, guider_ui.imglist_group);
lv_group_set_default(guider_ui.imglist_group); lv_group_set_default(guider_ui.imglist_group);
lv_group_add_obj(guider_ui.imglist_group,guider_ui.screen_imglist_ddlist_1);
lv_group_add_obj(guider_ui.imglist_group,guider_ui.screen_imglist_btn_1); lv_group_add_obj(guider_ui.imglist_group,guider_ui.screen_imglist_btn_1);
lv_group_add_obj(guider_ui.imglist_group,guider_ui.screen_imglist_ddlist_1);
lv_obj_add_event_cb(guider_ui.screen_imglist_ddlist_1, key_event_handler, LV_EVENT_VALUE_CHANGED, NULL); lv_obj_add_event_cb(guider_ui.screen_imglist_ddlist_1, key_event_handler, LV_EVENT_VALUE_CHANGED, NULL);
uint16_t selected_index = lv_dropdown_get_selected(guider_ui.screen_imglist_ddlist_1);
sprintf(&chip_path[0],"/spiffs/%s",chip_list[selected_index]);
lv_obj_t *file_btn[5];
spiffs_list_t directory[5];
uint8_t file_num = 0;
file_num = list_files_in_spiffs(chip_path,directory,5);
for(int i=0;i<file_num;i++)
{
ESP_LOGI(TAG,"[%d] Fond esp32s2 file:%s,size:%ld",i,directory[i].name,directory[i].size);
file_btn[i] = lv_list_add_btn(guider_ui.screen_imglist_list_1,NULL,directory[i].name);
lv_group_add_obj(guider_ui.imglist_group,file_btn[i]);
}
// lv_obj_t * btn1;
// btn1 = lv_list_add_btn(guider_ui.screen_imglist_list_1,NULL,"OfflineBurn.bin");
// lv_group_add_obj(guider_ui.imglist_group,btn1);
// lv_obj_t * btn2;
// btn2 = lv_list_add_btn(guider_ui.screen_imglist_list_1,NULL,"target_esp32s3.bin");
// lv_group_add_obj(guider_ui.imglist_group,btn2);
break; break;
} }

View File

@ -30,7 +30,14 @@ typedef struct
lv_obj_t *sscreen_burn; lv_obj_t *sscreen_burn;
bool sscreen_burn_del; bool sscreen_burn_del;
lv_obj_t *sscreen_burn_cont_1; lv_obj_t *sscreen_burn_cont_1;
lv_obj_t *sscreen_burn_label_1;
lv_obj_t *sscreen_burn_bar_1; lv_obj_t *sscreen_burn_bar_1;
lv_obj_t *sscreen_burn_btn_1;
lv_obj_t *sscreen_burn_btn_1_label;
lv_obj_t *sscreen_burn_btn_2;
lv_obj_t *sscreen_burn_btn_2_label;
lv_obj_t *sscreen_burn_spangroup_1;
lv_span_t *sscreen_burn_spangroup_1_span;
lv_obj_t *screen_imglist; lv_obj_t *screen_imglist;
bool screen_imglist_del; bool screen_imglist_del;
lv_obj_t *screen_imglist_cont_1; lv_obj_t *screen_imglist_cont_1;

View File

@ -523,6 +523,93 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+007E "~" */ /* U+007E "~" */
0x3c, 0xc7, 0x95, 0x22, 0x15, 0x50, 0x3c, 0xc7, 0x95, 0x22, 0x15, 0x50,
/* U+4FE1 "信" */
0x0, 0x5, 0x1, 0x60, 0x0, 0x0, 0x0, 0x1b,
0x0, 0x88, 0x0, 0x0, 0x0, 0x7a, 0xbb, 0xbb,
0xbb, 0xb0, 0x0, 0xe0, 0x45, 0x55, 0x55, 0x10,
0x8, 0xf0, 0x56, 0x66, 0x66, 0x10, 0x3c, 0xb0,
0x9c, 0xcc, 0xcc, 0x20, 0x11, 0xb0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xb0, 0x8c, 0xcc, 0xcc, 0x20,
0x0, 0xb0, 0xa1, 0x0, 0x9, 0x30, 0x0, 0xb0,
0xa1, 0x0, 0x9, 0x30, 0x0, 0xb0, 0xac, 0xcc,
0xce, 0x30,
/* U+5F55 "录" */
0x0, 0xbb, 0xbb, 0xbb, 0xf0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xd0, 0x0, 0x0, 0x3b, 0xbb, 0xbb,
0xc0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xb0, 0x0,
0x3a, 0xaa, 0xac, 0xba, 0xaa, 0xa1, 0x1, 0xb3,
0x6, 0x90, 0x1a, 0x10, 0x0, 0x7, 0x37, 0xab,
0xb2, 0x0, 0x2, 0x7c, 0x97, 0x52, 0xb8, 0x20,
0x1a, 0x50, 0x6, 0x50, 0x4, 0xb4, 0x0, 0x0,
0x9d, 0x20, 0x0, 0x0,
/* U+606F "息" */
0x0, 0x0, 0x7, 0x30, 0x0, 0x0, 0x0, 0x67,
0x9f, 0x87, 0x76, 0x0, 0x0, 0xd2, 0x22, 0x22,
0x2d, 0x0, 0x0, 0xda, 0xaa, 0xaa, 0xad, 0x0,
0x0, 0xd6, 0x66, 0x66, 0x6d, 0x0, 0x0, 0xd4,
0x44, 0x44, 0x4d, 0x0, 0x0, 0xa9, 0x9b, 0x99,
0x9a, 0x0, 0x0, 0x1, 0x3a, 0x70, 0x0, 0x0,
0x0, 0xb5, 0x90, 0x90, 0x2c, 0x30, 0x2b, 0x54,
0x90, 0x2, 0xb1, 0xc2, 0x12, 0x1, 0xaa, 0xaa,
0x30, 0x20,
/* U+6267 "执" */
0x0, 0x74, 0x0, 0x1c, 0x0, 0x0, 0x0, 0x75,
0x0, 0x1c, 0x0, 0x0, 0x3, 0x97, 0x30, 0x1c,
0x0, 0x0, 0x8, 0xca, 0x69, 0xae, 0xad, 0x40,
0x0, 0x75, 0x0, 0x1b, 0x9, 0x30, 0x0, 0x77,
0x69, 0x69, 0x9, 0x20, 0x6, 0xda, 0x21, 0xba,
0x9, 0x20, 0x15, 0x85, 0x0, 0x9d, 0x58, 0x30,
0x0, 0x75, 0x0, 0xc0, 0xd8, 0x53, 0x0, 0x75,
0x8, 0x50, 0x5, 0xaa, 0x8, 0xd2, 0x3a, 0x0,
0x0, 0xe5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+70E7 "烧" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x66,
0x0, 0x75, 0x0, 0x0, 0x0, 0x66, 0x16, 0xac,
0xbc, 0xb0, 0x1, 0x66, 0x76, 0x4c, 0x9, 0x20,
0xb, 0x6d, 0x80, 0xa, 0x98, 0x0, 0xb, 0x68,
0x0, 0x4c, 0xe4, 0x91, 0x38, 0x65, 0xb, 0x81,
0x19, 0x80, 0x0, 0x77, 0x29, 0x99, 0x99, 0x91,
0x0, 0xba, 0x81, 0xc2, 0xc1, 0x10, 0x1, 0xc0,
0x81, 0xc0, 0xc0, 0x0, 0x9, 0x50, 0x7, 0x70,
0xc0, 0x54, 0x3a, 0x0, 0x99, 0x0, 0xab, 0xc1,
0x0, 0x0, 0x10, 0x0, 0x0, 0x0,
/* U+7247 "片" */
0x0, 0x0, 0x0, 0xc0, 0x0, 0x0, 0xc0, 0x0,
0xc0, 0x0, 0x0, 0xc0, 0x0, 0xc0, 0x0, 0x0,
0xc1, 0x11, 0xc1, 0x10, 0x0, 0xea, 0xaa, 0xaa,
0xa8, 0x0, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xeb,
0xbb, 0xb9, 0x0, 0x1, 0xa0, 0x0, 0xb, 0x0,
0x5, 0x70, 0x0, 0xb, 0x0, 0xc, 0x10, 0x0,
0xb, 0x0, 0xa5, 0x0, 0x0, 0xb, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0,
/* U+82AF "芯" */
0x0, 0x1, 0xa0, 0x5, 0x60, 0x0, 0x0, 0x1,
0xa0, 0x5, 0x70, 0x0, 0xb, 0xbb, 0xeb, 0xbc,
0xdb, 0xb4, 0x0, 0x0, 0x60, 0x2, 0x30, 0x0,
0x0, 0x0, 0x6, 0xa0, 0x0, 0x0, 0x0, 0x10,
0x80, 0x87, 0x5, 0x0, 0x0, 0xa1, 0xc0, 0xc,
0x7, 0x70, 0x0, 0xc0, 0xc0, 0x0, 0x0, 0xc1,
0x8, 0x60, 0xc0, 0x0, 0x72, 0x66, 0x1b, 0x0,
0xc0, 0x0, 0xc0, 0x15, 0x0, 0x0, 0x7c, 0xcc,
0x60, 0x0,
/* U+884C "行" */
0x0, 0x2, 0x50, 0x0, 0x0, 0x0, 0x0, 0xc,
0x22, 0xcc, 0xcc, 0xa0, 0x1, 0xc5, 0x20, 0x0,
0x0, 0x0, 0xb, 0x34, 0xd0, 0x0, 0x0, 0x0,
0x0, 0x1d, 0x2b, 0xcc, 0xcc, 0xc7, 0x3, 0xec,
0x0, 0x0, 0x56, 0x0, 0xb, 0x4c, 0x0, 0x0,
0x56, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x56, 0x0,
0x0, 0x1c, 0x0, 0x0, 0x56, 0x0, 0x0, 0x1c,
0x0, 0x0, 0x56, 0x0, 0x0, 0x1c, 0x0, 0x9,
0xe3, 0x0,
/* U+F001 "" */ /* U+F001 "" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x12, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x12, 0x0, 0x0,
0x0, 0x3, 0x7c, 0xff, 0x0, 0x0, 0x59, 0xef, 0x0, 0x3, 0x7c, 0xff, 0x0, 0x0, 0x59, 0xef,
@ -1253,66 +1340,74 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 1975, .adv_w = 96, .box_w = 2, .box_h = 13, .ofs_x = 2, .ofs_y = -2}, {.bitmap_index = 1975, .adv_w = 96, .box_w = 2, .box_h = 13, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 1988, .adv_w = 96, .box_w = 3, .box_h = 11, .ofs_x = 1, .ofs_y = -1}, {.bitmap_index = 1988, .adv_w = 96, .box_w = 3, .box_h = 11, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 2005, .adv_w = 96, .box_w = 6, .box_h = 2, .ofs_x = 0, .ofs_y = 8}, {.bitmap_index = 2005, .adv_w = 96, .box_w = 6, .box_h = 2, .ofs_x = 0, .ofs_y = 8},
{.bitmap_index = 2011, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2011, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2089, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 2077, .adv_w = 192, .box_w = 12, .box_h = 10, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2143, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 2137, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2209, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 2203, .adv_w = 192, .box_w = 12, .box_h = 12, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2263, .adv_w = 132, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 2275, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2304, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2353, .adv_w = 192, .box_w = 10, .box_h = 12, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 2382, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2413, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2460, .adv_w = 216, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 2479, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2537, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2545, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2615, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 2623, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2678, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2677, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2756, .adv_w = 96, .box_w = 6, .box_h = 10, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 2743, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2786, .adv_w = 144, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 2797, .adv_w = 132, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2831, .adv_w = 216, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2838, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2922, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 2916, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2976, .adv_w = 132, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 2994, .adv_w = 216, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3035, .adv_w = 168, .box_w = 8, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 3071, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3083, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3149, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3155, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3212, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3216, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3290, .adv_w = 96, .box_w = 6, .box_h = 10, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3277, .adv_w = 168, .box_w = 8, .box_h = 12, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 3320, .adv_w = 144, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3325, .adv_w = 168, .box_w = 12, .box_h = 11, .ofs_x = -1, .ofs_y = -1}, {.bitmap_index = 3365, .adv_w = 216, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3391, .adv_w = 120, .box_w = 7, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3456, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3430, .adv_w = 120, .box_w = 7, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3510, .adv_w = 132, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3469, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3569, .adv_w = 168, .box_w = 8, .box_h = 12, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 3530, .adv_w = 168, .box_w = 11, .box_h = 3, .ofs_x = 0, .ofs_y = 3}, {.bitmap_index = 3617, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3547, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 3689, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3610, .adv_w = 240, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3750, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3714, .adv_w = 216, .box_w = 15, .box_h = 13, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 3811, .adv_w = 168, .box_w = 8, .box_h = 12, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 3812, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3859, .adv_w = 168, .box_w = 12, .box_h = 11, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 3878, .adv_w = 168, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 3925, .adv_w = 120, .box_w = 7, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3917, .adv_w = 168, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 3964, .adv_w = 120, .box_w = 7, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3956, .adv_w = 240, .box_w = 16, .box_h = 10, .ofs_x = -1, .ofs_y = 0}, {.bitmap_index = 4003, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4036, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4064, .adv_w = 168, .box_w = 11, .box_h = 3, .ofs_x = 0, .ofs_y = 3},
{.bitmap_index = 4090, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4081, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4168, .adv_w = 192, .box_w = 13, .box_h = 13, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 4144, .adv_w = 240, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4253, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4248, .adv_w = 216, .box_w = 15, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 4314, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4346, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4386, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4412, .adv_w = 168, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 4447, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4451, .adv_w = 168, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 4508, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4490, .adv_w = 240, .box_w = 16, .box_h = 10, .ofs_x = -1, .ofs_y = 0},
{.bitmap_index = 4562, .adv_w = 120, .box_w = 9, .box_h = 13, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 4570, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4621, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4624, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4693, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4702, .adv_w = 192, .box_w = 13, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 4765, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4787, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4828, .adv_w = 192, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 4848, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4919, .adv_w = 144, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4920, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4978, .adv_w = 240, .box_w = 15, .box_h = 12, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4981, .adv_w = 168, .box_w = 11, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5068, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5042, .adv_w = 192, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5136, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5096, .adv_w = 120, .box_w = 9, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 5204, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5155, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5272, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5227, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5340, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5299, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5408, .adv_w = 240, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5362, .adv_w = 192, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 5496, .adv_w = 168, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5453, .adv_w = 144, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5561, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5512, .adv_w = 240, .box_w = 15, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5633, .adv_w = 192, .box_w = 13, .box_h = 13, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 5602, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5718, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5670, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5786, .adv_w = 144, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5738, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5845, .adv_w = 193, .box_w = 13, .box_h = 9, .ofs_x = 0, .ofs_y = 0} {.bitmap_index = 5806, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5874, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5942, .adv_w = 240, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6030, .adv_w = 168, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6095, .adv_w = 168, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6167, .adv_w = 192, .box_w = 13, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 6252, .adv_w = 240, .box_w = 15, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6320, .adv_w = 144, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6379, .adv_w = 193, .box_w = 13, .box_h = 9, .ofs_x = 0, .ofs_y = 0}
}; };
/*--------------------- /*---------------------
@ -1320,14 +1415,15 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
*--------------------*/ *--------------------*/
static const uint16_t unicode_list_2[] = { static const uint16_t unicode_list_2[] = {
0x0, 0x7, 0xa, 0xb, 0xc, 0x10, 0x12, 0x14, 0x0, 0xf74, 0x108e, 0x1286, 0x2106, 0x2266, 0x32ce, 0x386b,
0x18, 0x1b, 0x20, 0x25, 0x26, 0x27, 0x3d, 0x42, 0xa020, 0xa027, 0xa02a, 0xa02b, 0xa02c, 0xa030, 0xa032, 0xa034,
0x47, 0x4a, 0x4b, 0x4c, 0x50, 0x51, 0x52, 0x53, 0xa038, 0xa03b, 0xa040, 0xa045, 0xa046, 0xa047, 0xa05d, 0xa062,
0x66, 0x67, 0x6d, 0x6f, 0x70, 0x73, 0x76, 0x77, 0xa067, 0xa06a, 0xa06b, 0xa06c, 0xa070, 0xa071, 0xa072, 0xa073,
0x78, 0x7a, 0x92, 0x94, 0xc3, 0xc4, 0xc6, 0xc8, 0xa086, 0xa087, 0xa08d, 0xa08f, 0xa090, 0xa093, 0xa096, 0xa097,
0xdf, 0xe6, 0xe9, 0xf2, 0x11b, 0x123, 0x15a, 0x1ea, 0xa098, 0xa09a, 0xa0b2, 0xa0b4, 0xa0e3, 0xa0e4, 0xa0e6, 0xa0e8,
0x23f, 0x240, 0x241, 0x242, 0x243, 0x286, 0x292, 0x2ec, 0xa0ff, 0xa106, 0xa109, 0xa112, 0xa13b, 0xa143, 0xa17a, 0xa20a,
0x303, 0x559, 0x7c1, 0x8a1 0xa25f, 0xa260, 0xa261, 0xa262, 0xa263, 0xa2a6, 0xa2b2, 0xa30c,
0xa323, 0xa579, 0xa7e1, 0xa8c1
}; };
/*Collect the unicode lists and glyph_id offsets*/ /*Collect the unicode lists and glyph_id offsets*/
@ -1342,8 +1438,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
}, },
{ {
.range_start = 61441, .range_length = 2210, .glyph_id_start = 95, .range_start = 20449, .range_length = 43202, .glyph_id_start = 95,
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 60, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 68, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
} }
}; };

View File

@ -644,6 +644,24 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+007E "~" */ /* U+007E "~" */
0x1a, 0xfc, 0x64, 0xb2, 0x28, 0x35, 0x9a, 0x70, 0x1a, 0xfc, 0x64, 0xb2, 0x28, 0x35, 0x9a, 0x70,
/* U+4FE1 "信" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xa3, 0x0, 0xd7, 0x0, 0x0, 0x0,
0x0, 0x0, 0xf1, 0x0, 0x1d, 0x80, 0x0, 0x0,
0x0, 0x5, 0xcc, 0xcc, 0xcd, 0xdc, 0xcc, 0xc0,
0x0, 0xb, 0x72, 0x22, 0x22, 0x22, 0x22, 0x20,
0x0, 0x2f, 0x20, 0x11, 0x11, 0x11, 0x11, 0x0,
0x0, 0xbf, 0x10, 0xee, 0xee, 0xee, 0xee, 0x0,
0x5, 0xee, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0,
0x1e, 0x4d, 0x10, 0xff, 0xff, 0xff, 0xff, 0x0,
0x2, 0xd, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0xd, 0x10, 0xbd, 0xdd, 0xdd, 0xdd, 0x0,
0x0, 0xd, 0x10, 0xd4, 0x22, 0x22, 0x3f, 0x0,
0x0, 0xd, 0x10, 0xd2, 0x0, 0x0, 0xf, 0x0,
0x0, 0xd, 0x10, 0xd2, 0x0, 0x0, 0x1f, 0x0,
0x0, 0xd, 0x10, 0xdf, 0xff, 0xff, 0xff, 0x0,
0x0, 0xd, 0x10, 0xd2, 0x0, 0x0, 0xf, 0x0,
/* U+50CF "像" */ /* U+50CF "像" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xa3, 0x5, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa3, 0x5, 0xb0, 0x0, 0x0, 0x0,
@ -679,6 +697,40 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x2, 0x0, 0x0, 0x9, 0x70, 0x0, 0x0, 0x40, 0x2, 0x0, 0x0, 0x9, 0x70, 0x0, 0x0, 0x40,
0x0, 0x0, 0x4, 0xff, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0xff, 0x30, 0x0, 0x0, 0x0,
/* U+606F "息" */
0x0, 0x0, 0x0, 0x7, 0x60, 0x0, 0x0, 0x0,
0x0, 0x1, 0x11, 0x6f, 0x51, 0x11, 0x10, 0x0,
0x0, 0xf, 0xcb, 0xbb, 0xbb, 0xbb, 0xf2, 0x0,
0x0, 0xf, 0x41, 0x11, 0x11, 0x11, 0xf2, 0x0,
0x0, 0xf, 0xdc, 0xcc, 0xcc, 0xcc, 0xf2, 0x0,
0x0, 0xf, 0x30, 0x0, 0x0, 0x0, 0xf2, 0x0,
0x0, 0xf, 0xee, 0xee, 0xee, 0xee, 0xf2, 0x0,
0x0, 0xf, 0x30, 0x0, 0x0, 0x0, 0xf2, 0x0,
0x0, 0xc, 0xdd, 0xde, 0xdd, 0xdd, 0xd1, 0x0,
0x0, 0x0, 0x1, 0x3d, 0x60, 0x0, 0x0, 0x0,
0x0, 0x5, 0x2e, 0x41, 0xd6, 0x2, 0x91, 0x0,
0x0, 0x4e, 0x2e, 0x40, 0x21, 0x35, 0x7e, 0x20,
0x8, 0xe3, 0xd, 0x40, 0x0, 0x8a, 0x6, 0xd0,
0x7, 0x10, 0x9, 0xee, 0xee, 0xd3, 0x0, 0x50,
/* U+6267 "执" */
0x0, 0x2, 0x0, 0x0, 0x4, 0x10, 0x0, 0x0,
0x0, 0xc, 0x40, 0x0, 0xe, 0x30, 0x0, 0x0,
0x0, 0xc, 0x40, 0x0, 0xe, 0x30, 0x0, 0x0,
0x1, 0x1d, 0x51, 0x0, 0xe, 0x30, 0x0, 0x0,
0xc, 0xdf, 0xed, 0x8d, 0xdf, 0xed, 0xd3, 0x0,
0x0, 0xc, 0x40, 0x0, 0xf, 0x30, 0xe3, 0x0,
0x0, 0xc, 0x40, 0x0, 0xf, 0x20, 0xe2, 0x0,
0x0, 0xc, 0x57, 0x3c, 0x3f, 0x10, 0xe1, 0x0,
0x0, 0x3e, 0xe8, 0x5, 0xef, 0x0, 0xe1, 0x0,
0x1d, 0xce, 0x40, 0x0, 0x6f, 0x40, 0xe2, 0x0,
0x1, 0xc, 0x40, 0x0, 0xaa, 0xe1, 0xd3, 0x0,
0x0, 0xc, 0x40, 0x1, 0xf1, 0x99, 0xc5, 0x20,
0x0, 0xc, 0x40, 0x9, 0xa0, 0x13, 0xa7, 0xe2,
0x0, 0xd, 0x40, 0x4f, 0x10, 0x0, 0x6d, 0xf0,
0x7, 0xfe, 0x10, 0xd5, 0x0, 0x0, 0x1d, 0x80,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+70E7 "烧" */ /* U+70E7 "烧" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x6, 0x80, 0x0, 0x4b, 0x0, 0x0, 0x0, 0x0, 0x6, 0x80, 0x0, 0x4b, 0x0, 0x0, 0x0,
@ -697,6 +749,22 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xd, 0x30, 0x6, 0xe7, 0x0, 0xc, 0xff, 0xa0, 0xd, 0x30, 0x6, 0xe7, 0x0, 0xc, 0xff, 0xa0,
0x0, 0x0, 0x1, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x10, 0x0, 0x0, 0x0, 0x0,
/* U+7247 "片" */
0x0, 0x0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x0,
0x6, 0x0, 0x0, 0xe1, 0x0, 0x0, 0x0, 0xf,
0x0, 0x0, 0xe1, 0x0, 0x0, 0x0, 0xf, 0x0,
0x0, 0xe1, 0x0, 0x0, 0x0, 0xf, 0x22, 0x22,
0xe3, 0x22, 0x20, 0x0, 0xf, 0xcc, 0xcc, 0xcc,
0xcc, 0xc4, 0x0, 0xf, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xf, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0xf, 0xdd, 0xdd, 0xdd, 0x90, 0x0, 0x0,
0x1e, 0x11, 0x11, 0x16, 0xb0, 0x0, 0x0, 0x5c,
0x0, 0x0, 0x5, 0xb0, 0x0, 0x0, 0xb6, 0x0,
0x0, 0x5, 0xb0, 0x0, 0x7, 0xd0, 0x0, 0x0,
0x5, 0xb0, 0x0, 0x5d, 0x20, 0x0, 0x0, 0x5,
0xb0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0,
/* U+7F6E "置" */ /* U+7F6E "置" */
0x0, 0xcd, 0xde, 0xed, 0xdf, 0xdd, 0xdc, 0x0, 0x0, 0xcd, 0xde, 0xed, 0xdf, 0xdd, 0xdc, 0x0,
0x0, 0xc5, 0x6, 0xa0, 0xf, 0x10, 0x4c, 0x0, 0x0, 0xc5, 0x6, 0xa0, 0xf, 0x10, 0x4c, 0x0,
@ -712,6 +780,39 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x6, 0xb5, 0x55, 0x55, 0x5a, 0x80, 0x0, 0x0, 0x6, 0xb5, 0x55, 0x55, 0x5a, 0x80, 0x0,
0x2d, 0xde, 0xed, 0xdd, 0xdd, 0xde, 0xed, 0xd0, 0x2d, 0xde, 0xed, 0xdd, 0xdd, 0xde, 0xed, 0xd0,
/* U+82AF "芯" */
0x0, 0x0, 0xc, 0x0, 0x0, 0xc0, 0x0, 0x0,
0x0, 0x0, 0xf, 0x0, 0x0, 0xf0, 0x0, 0x0,
0xe, 0xee, 0xef, 0xee, 0xee, 0xfe, 0xee, 0xe0,
0x1, 0x11, 0x1f, 0x11, 0x11, 0xf1, 0x11, 0x10,
0x0, 0x0, 0xf, 0x0, 0x0, 0xf0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xa, 0x20, 0x0, 0x0, 0x0,
0x0, 0x0, 0x3, 0x14, 0xe3, 0x0, 0x0, 0x0,
0x0, 0x8, 0xc, 0x40, 0x4e, 0x0, 0xe3, 0x0,
0x0, 0x2d, 0xc, 0x40, 0x9, 0x60, 0x6d, 0x0,
0x0, 0x88, 0xc, 0x40, 0x0, 0x0, 0xc, 0x60,
0x1, 0xe2, 0xc, 0x40, 0x0, 0x7, 0x4, 0xd0,
0xa, 0xa0, 0xc, 0x40, 0x0, 0x1f, 0x0, 0xe2,
0x2c, 0x10, 0xb, 0x61, 0x11, 0x8b, 0x0, 0x40,
0x0, 0x0, 0x5, 0xff, 0xff, 0xe4, 0x0, 0x0,
/* U+884C "行" */
0x0, 0x0, 0x1b, 0x10, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xba, 0x2, 0xff, 0xff, 0xff, 0x80,
0x0, 0xb, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x3, 0xdb, 0x15, 0x70, 0x0, 0x0, 0x0, 0x0,
0x8, 0x70, 0x2f, 0x50, 0x0, 0x0, 0x0, 0x0,
0x0, 0x1, 0xd8, 0x1f, 0xff, 0xff, 0xff, 0xf9,
0x0, 0x2d, 0xe0, 0x0, 0x0, 0x6, 0xa0, 0x0,
0x6, 0xea, 0xe0, 0x0, 0x0, 0x5, 0xa0, 0x0,
0x5, 0x43, 0xe0, 0x0, 0x0, 0x5, 0xa0, 0x0,
0x0, 0x3, 0xe0, 0x0, 0x0, 0x5, 0xa0, 0x0,
0x0, 0x3, 0xe0, 0x0, 0x0, 0x5, 0xa0, 0x0,
0x0, 0x3, 0xe0, 0x0, 0x0, 0x5, 0xa0, 0x0,
0x0, 0x3, 0xe0, 0x0, 0x0, 0x17, 0xa0, 0x0,
0x0, 0x3, 0xe0, 0x0, 0x1, 0xff, 0x50, 0x0,
0x0, 0x3, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
/* U+8BBE "设" */ /* U+8BBE "设" */
0x0, 0x82, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x82, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x7f, 0x30, 0xd, 0xff, 0xff, 0x20, 0x0, 0x0, 0x7f, 0x30, 0xd, 0xff, 0xff, 0x20, 0x0,
@ -1791,72 +1892,78 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 3134, .adv_w = 128, .box_w = 2, .box_h = 16, .ofs_x = 3, .ofs_y = -2}, {.bitmap_index = 3134, .adv_w = 128, .box_w = 2, .box_h = 16, .ofs_x = 3, .ofs_y = -2},
{.bitmap_index = 3150, .adv_w = 128, .box_w = 4, .box_h = 15, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 3150, .adv_w = 128, .box_w = 4, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 3180, .adv_w = 128, .box_w = 8, .box_h = 2, .ofs_x = 0, .ofs_y = 11}, {.bitmap_index = 3180, .adv_w = 128, .box_w = 8, .box_h = 2, .ofs_x = 0, .ofs_y = 11},
{.bitmap_index = 3188, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 3188, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3324, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3316, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 3436, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3452, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3564, .adv_w = 256, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 3564, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3668, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3676, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3788, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3804, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3916, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 3932, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 4052, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4037, .adv_w = 256, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4148, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4141, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4260, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4253, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4356, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4373, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4422, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4493, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4550, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4621, .adv_w = 256, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4678, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 4757, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4804, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 4853, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4932, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 4965, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5040, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5061, .adv_w = 176, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5168, .adv_w = 128, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5127, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5224, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5255, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5308, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5383, .adv_w = 288, .box_w = 18, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5452, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 5509, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5548, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 5637, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5636, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2}, {.bitmap_index = 5745, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5716, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3}, {.bitmap_index = 5873, .adv_w = 128, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5842, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 5929, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5947, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6013, .adv_w = 288, .box_w = 18, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6045, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2}, {.bitmap_index = 6157, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6125, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1}, {.bitmap_index = 6253, .adv_w = 176, .box_w = 11, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6237, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6341, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 6307, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6421, .adv_w = 224, .box_w = 14, .box_h = 18, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 6377, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 6547, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6475, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4}, {.bitmap_index = 6652, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6503, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 6750, .adv_w = 224, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 6611, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 6830, .adv_w = 224, .box_w = 16, .box_h = 14, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 6771, .adv_w = 288, .box_w = 20, .box_h = 16, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 6942, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6931, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7012, .adv_w = 160, .box_w = 10, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7059, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 7082, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7129, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 7180, .adv_w = 224, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 4},
{.bitmap_index = 7199, .adv_w = 320, .box_w = 20, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 7208, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7339, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 7316, .adv_w = 320, .box_w = 20, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7435, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7476, .adv_w = 288, .box_w = 20, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 7563, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 7636, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7708, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 7764, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 7813, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 7834, .adv_w = 224, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 7925, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 7904, .adv_w = 320, .box_w = 20, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8023, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8044, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8121, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 8140, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8217, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2}, {.bitmap_index = 8268, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 8313, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 8413, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8425, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 8518, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8537, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 8630, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8645, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3}, {.bitmap_index = 8728, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8807, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 8826, .adv_w = 256, .box_w = 16, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8903, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 8922, .adv_w = 160, .box_w = 12, .box_h = 16, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 9053, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 9018, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9153, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 9130, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9253, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 9242, .adv_w = 288, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9353, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 9350, .adv_w = 256, .box_w = 18, .box_h = 18, .ofs_x = -1, .ofs_y = -3},
{.bitmap_index = 9453, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1}, {.bitmap_index = 9512, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9553, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1}, {.bitmap_index = 9608, .adv_w = 320, .box_w = 20, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9700, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2}, {.bitmap_index = 9758, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 9796, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 9858, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 9908, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3}, {.bitmap_index = 9958, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 10053, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0}, {.bitmap_index = 10058, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 10173, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2}, {.bitmap_index = 10158, .adv_w = 320, .box_w = 20, .box_h = 10, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 10269, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1} {.bitmap_index = 10258, .adv_w = 320, .box_w = 21, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10405, .adv_w = 224, .box_w = 12, .box_h = 16, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 10501, .adv_w = 224, .box_w = 14, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10613, .adv_w = 256, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = -3},
{.bitmap_index = 10758, .adv_w = 320, .box_w = 20, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10878, .adv_w = 192, .box_w = 12, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10974, .adv_w = 258, .box_w = 17, .box_h = 11, .ofs_x = 0, .ofs_y = 1}
}; };
/*--------------------- /*---------------------
@ -1864,15 +1971,15 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
*--------------------*/ *--------------------*/
static const uint16_t unicode_list_2[] = { static const uint16_t unicode_list_2[] = {
0x0, 0xe86, 0x2018, 0x2e9f, 0x3aef, 0x448d, 0x9f32, 0x9f39, 0x0, 0xee, 0xf74, 0x108e, 0x1286, 0x2106, 0x2266, 0x2f8d,
0x9f3c, 0x9f3d, 0x9f3e, 0x9f42, 0x9f44, 0x9f46, 0x9f4a, 0x9f4d, 0x32ce, 0x386b, 0x3bdd, 0x457b, 0xa020, 0xa027, 0xa02a, 0xa02b,
0x9f52, 0x9f57, 0x9f58, 0x9f59, 0x9f6f, 0x9f74, 0x9f79, 0x9f7c, 0xa02c, 0xa030, 0xa032, 0xa034, 0xa038, 0xa03b, 0xa040, 0xa045,
0x9f7d, 0x9f7e, 0x9f82, 0x9f83, 0x9f84, 0x9f85, 0x9f98, 0x9f99, 0xa046, 0xa047, 0xa05d, 0xa062, 0xa067, 0xa06a, 0xa06b, 0xa06c,
0x9f9f, 0x9fa1, 0x9fa2, 0x9fa5, 0x9fa8, 0x9fa9, 0x9faa, 0x9fac, 0xa070, 0xa071, 0xa072, 0xa073, 0xa086, 0xa087, 0xa08d, 0xa08f,
0x9fc4, 0x9fc6, 0x9ff5, 0x9ff6, 0x9ff8, 0x9ffa, 0xa011, 0xa018, 0xa090, 0xa093, 0xa096, 0xa097, 0xa098, 0xa09a, 0xa0b2, 0xa0b4,
0xa01b, 0xa024, 0xa04d, 0xa055, 0xa08c, 0xa11c, 0xa171, 0xa172, 0xa0e3, 0xa0e4, 0xa0e6, 0xa0e8, 0xa0ff, 0xa106, 0xa109, 0xa112,
0xa173, 0xa174, 0xa175, 0xa1b8, 0xa1c4, 0xa21e, 0xa235, 0xa48b, 0xa13b, 0xa143, 0xa17a, 0xa20a, 0xa25f, 0xa260, 0xa261, 0xa262,
0xa6f3, 0xa7d3 0xa263, 0xa2a6, 0xa2b2, 0xa30c, 0xa323, 0xa579, 0xa7e1, 0xa8c1
}; };
/*Collect the unicode lists and glyph_id offsets*/ /*Collect the unicode lists and glyph_id offsets*/
@ -1887,8 +1994,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
}, },
{ {
.range_start = 20687, .range_length = 42964, .glyph_id_start = 95, .range_start = 20449, .range_length = 43202, .glyph_id_start = 95,
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 66, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 72, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
} }
}; };

View File

@ -74,13 +74,7 @@ void setup_scr_screen_imglist(lv_ui *ui)
//Write codes screen_imglist_list_1 //Write codes screen_imglist_list_1
ui->screen_imglist_list_1 = lv_list_create(ui->screen_imglist); ui->screen_imglist_list_1 = lv_list_create(ui->screen_imglist);
// ui->screen_imglist_list_1_item0 =lv_list_add_text(ui->screen_imglist_list_1, "save_1");
lv_obj_t * btn1;
btn1 = lv_list_add_btn(ui->screen_imglist_list_1,LV_SYMBOL_FILE,"OfflineBurn.bin");
lv_group_add_obj(ui->imglist_group,btn1);
lv_obj_t * btn2;
btn2 = lv_list_add_btn(ui->screen_imglist_list_1,LV_SYMBOL_FILE,"target_esp32s3.bin");
lv_group_add_obj(ui->imglist_group,btn2);
lv_obj_set_pos(ui->screen_imglist_list_1, 2, 43); lv_obj_set_pos(ui->screen_imglist_list_1, 2, 43);
lv_obj_set_size(ui->screen_imglist_list_1, 124, 110); lv_obj_set_size(ui->screen_imglist_list_1, 124, 110);
lv_obj_set_scrollbar_mode(ui->screen_imglist_list_1, LV_SCROLLBAR_MODE_OFF); lv_obj_set_scrollbar_mode(ui->screen_imglist_list_1, LV_SCROLLBAR_MODE_OFF);

View File

@ -33,19 +33,44 @@ void setup_scr_sscreen_burn(lv_ui *ui)
lv_obj_set_scrollbar_mode(ui->sscreen_burn_cont_1, LV_SCROLLBAR_MODE_OFF); lv_obj_set_scrollbar_mode(ui->sscreen_burn_cont_1, LV_SCROLLBAR_MODE_OFF);
//Write style for sscreen_burn_cont_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. //Write style for sscreen_burn_cont_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_bg_opa(ui->sscreen_burn_cont_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_color(ui->sscreen_burn_cont_1, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_grad_dir(ui->sscreen_burn_cont_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_shadow_width(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_border_width(ui->sscreen_burn_cont_1, 2, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_border_width(ui->sscreen_burn_cont_1, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_border_opa(ui->sscreen_burn_cont_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_border_opa(ui->sscreen_burn_cont_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_border_color(ui->sscreen_burn_cont_1, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_border_color(ui->sscreen_burn_cont_1, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_border_side(ui->sscreen_burn_cont_1, LV_BORDER_SIDE_FULL, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_border_side(ui->sscreen_burn_cont_1, LV_BORDER_SIDE_FULL, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_opa(ui->sscreen_burn_cont_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_color(ui->sscreen_burn_cont_1, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_grad_dir(ui->sscreen_burn_cont_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_pad_top(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_pad_bottom(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_left(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_pad_left(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_pad_right(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_shadow_width(ui->sscreen_burn_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
//Write codes sscreen_burn_label_1
ui->sscreen_burn_label_1 = lv_label_create(ui->sscreen_burn_cont_1);
lv_label_set_text(ui->sscreen_burn_label_1, "OfflineBurn.bin");
lv_label_set_long_mode(ui->sscreen_burn_label_1, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->sscreen_burn_label_1, 0, 0);
lv_obj_set_size(ui->sscreen_burn_label_1, 124, 18);
//Write style for sscreen_burn_label_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_border_width(ui->sscreen_burn_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->sscreen_burn_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_color(ui->sscreen_burn_label_1, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui->sscreen_burn_label_1, &lv_font_GB2312_12, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_opa(ui->sscreen_burn_label_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_letter_space(ui->sscreen_burn_label_1, 2, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_line_space(ui->sscreen_burn_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui->sscreen_burn_label_1, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_opa(ui->sscreen_burn_label_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_color(ui->sscreen_burn_label_1, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_grad_dir(ui->sscreen_burn_label_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui->sscreen_burn_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui->sscreen_burn_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui->sscreen_burn_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_pad_left(ui->sscreen_burn_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_shadow_width(ui->sscreen_burn_label_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
//Write codes sscreen_burn_bar_1 //Write codes sscreen_burn_bar_1
ui->sscreen_burn_bar_1 = lv_bar_create(ui->sscreen_burn); ui->sscreen_burn_bar_1 = lv_bar_create(ui->sscreen_burn);
@ -53,8 +78,8 @@ void setup_scr_sscreen_burn(lv_ui *ui)
lv_bar_set_mode(ui->sscreen_burn_bar_1, LV_BAR_MODE_NORMAL); lv_bar_set_mode(ui->sscreen_burn_bar_1, LV_BAR_MODE_NORMAL);
lv_bar_set_range(ui->sscreen_burn_bar_1, 0, 100); lv_bar_set_range(ui->sscreen_burn_bar_1, 0, 100);
lv_bar_set_value(ui->sscreen_burn_bar_1, 50, LV_ANIM_OFF); lv_bar_set_value(ui->sscreen_burn_bar_1, 50, LV_ANIM_OFF);
lv_obj_set_pos(ui->sscreen_burn_bar_1, 4, 135); lv_obj_set_pos(ui->sscreen_burn_bar_1, 7, 151);
lv_obj_set_size(ui->sscreen_burn_bar_1, 120, 20); lv_obj_set_size(ui->sscreen_burn_bar_1, 113, 4);
//Write style for sscreen_burn_bar_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. //Write style for sscreen_burn_bar_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_bg_opa(ui->sscreen_burn_bar_1, 60, LV_PART_MAIN|LV_STATE_DEFAULT); lv_obj_set_style_bg_opa(ui->sscreen_burn_bar_1, 60, LV_PART_MAIN|LV_STATE_DEFAULT);
@ -69,6 +94,81 @@ void setup_scr_sscreen_burn(lv_ui *ui)
lv_obj_set_style_bg_grad_dir(ui->sscreen_burn_bar_1, LV_GRAD_DIR_NONE, LV_PART_INDICATOR|LV_STATE_DEFAULT); lv_obj_set_style_bg_grad_dir(ui->sscreen_burn_bar_1, LV_GRAD_DIR_NONE, LV_PART_INDICATOR|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->sscreen_burn_bar_1, 10, LV_PART_INDICATOR|LV_STATE_DEFAULT); lv_obj_set_style_radius(ui->sscreen_burn_bar_1, 10, LV_PART_INDICATOR|LV_STATE_DEFAULT);
//Write codes sscreen_burn_btn_1
ui->sscreen_burn_btn_1 = lv_btn_create(ui->sscreen_burn);
ui->sscreen_burn_btn_1_label = lv_label_create(ui->sscreen_burn_btn_1);
lv_label_set_text(ui->sscreen_burn_btn_1_label, "执行烧录");
lv_label_set_long_mode(ui->sscreen_burn_btn_1_label, LV_LABEL_LONG_WRAP);
lv_obj_align(ui->sscreen_burn_btn_1_label, LV_ALIGN_CENTER, 0, 0);
lv_obj_set_style_pad_all(ui->sscreen_burn_btn_1, 0, LV_STATE_DEFAULT);
lv_obj_set_width(ui->sscreen_burn_btn_1_label, LV_PCT(100));
lv_obj_set_pos(ui->sscreen_burn_btn_1, 71, 126);
lv_obj_set_size(ui->sscreen_burn_btn_1, 50, 16);
//Write style for sscreen_burn_btn_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_border_width(ui->sscreen_burn_btn_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->sscreen_burn_btn_1, 5, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_opa(ui->sscreen_burn_btn_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_color(ui->sscreen_burn_btn_1, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_grad_dir(ui->sscreen_burn_btn_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_shadow_width(ui->sscreen_burn_btn_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_color(ui->sscreen_burn_btn_1, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui->sscreen_burn_btn_1, &lv_font_GB2312_12, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_opa(ui->sscreen_burn_btn_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui->sscreen_burn_btn_1, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
//Write codes sscreen_burn_btn_2
ui->sscreen_burn_btn_2 = lv_btn_create(ui->sscreen_burn);
ui->sscreen_burn_btn_2_label = lv_label_create(ui->sscreen_burn_btn_2);
lv_label_set_text(ui->sscreen_burn_btn_2_label, "芯片信息");
lv_label_set_long_mode(ui->sscreen_burn_btn_2_label, LV_LABEL_LONG_WRAP);
lv_obj_align(ui->sscreen_burn_btn_2_label, LV_ALIGN_CENTER, 0, 0);
lv_obj_set_style_pad_all(ui->sscreen_burn_btn_2, 0, LV_STATE_DEFAULT);
lv_obj_set_width(ui->sscreen_burn_btn_2_label, LV_PCT(100));
lv_obj_set_pos(ui->sscreen_burn_btn_2, 7, 126);
lv_obj_set_size(ui->sscreen_burn_btn_2, 50, 16);
//Write style for sscreen_burn_btn_2, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
lv_obj_set_style_bg_opa(ui->sscreen_burn_btn_2, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_color(ui->sscreen_burn_btn_2, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_bg_grad_dir(ui->sscreen_burn_btn_2, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_border_width(ui->sscreen_burn_btn_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_radius(ui->sscreen_burn_btn_2, 5, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_shadow_width(ui->sscreen_burn_btn_2, 0, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_color(ui->sscreen_burn_btn_2, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_font(ui->sscreen_burn_btn_2, &lv_font_GB2312_12, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_opa(ui->sscreen_burn_btn_2, 255, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_obj_set_style_text_align(ui->sscreen_burn_btn_2, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT);
//Write codes sscreen_burn_spangroup_1
ui->sscreen_burn_spangroup_1 = lv_spangroup_create(ui->sscreen_burn);
lv_spangroup_set_align(ui->sscreen_burn_spangroup_1, LV_TEXT_ALIGN_LEFT);
lv_spangroup_set_overflow(ui->sscreen_burn_spangroup_1, LV_SPAN_OVERFLOW_CLIP);
lv_spangroup_set_mode(ui->sscreen_burn_spangroup_1, LV_SPAN_MODE_BREAK);
//create span
ui->sscreen_burn_spangroup_1_span = lv_spangroup_new_span(ui->sscreen_burn_spangroup_1);
lv_span_set_text(ui->sscreen_burn_spangroup_1_span, "1:\n2:\n3:\n4:\n5:\n6:\n7:\n8:");
lv_style_set_text_color(&ui->sscreen_burn_spangroup_1_span->style, lv_color_hex(0x000000));
lv_style_set_text_decor(&ui->sscreen_burn_spangroup_1_span->style, LV_TEXT_DECOR_NONE);
lv_style_set_text_font(&ui->sscreen_burn_spangroup_1_span->style, &lv_font_montserratMedium_12);
lv_obj_set_pos(ui->sscreen_burn_spangroup_1, 4, 25);
lv_obj_set_size(ui->sscreen_burn_spangroup_1, 120, 96);
//Write style state: LV_STATE_DEFAULT for &style_sscreen_burn_spangroup_1_main_main_default
static lv_style_t style_sscreen_burn_spangroup_1_main_main_default;
ui_init_style(&style_sscreen_burn_spangroup_1_main_main_default);
lv_style_set_border_width(&style_sscreen_burn_spangroup_1_main_main_default, 0);
lv_style_set_radius(&style_sscreen_burn_spangroup_1_main_main_default, 0);
lv_style_set_bg_opa(&style_sscreen_burn_spangroup_1_main_main_default, 0);
lv_style_set_pad_top(&style_sscreen_burn_spangroup_1_main_main_default, 0);
lv_style_set_pad_right(&style_sscreen_burn_spangroup_1_main_main_default, 0);
lv_style_set_pad_bottom(&style_sscreen_burn_spangroup_1_main_main_default, 0);
lv_style_set_pad_left(&style_sscreen_burn_spangroup_1_main_main_default, 0);
lv_style_set_shadow_width(&style_sscreen_burn_spangroup_1_main_main_default, 0);
lv_obj_add_style(ui->sscreen_burn_spangroup_1, &style_sscreen_burn_spangroup_1_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
lv_spangroup_refr_mode(ui->sscreen_burn_spangroup_1);
//The custom code of sscreen_burn. //The custom code of sscreen_burn.

View File

@ -78,7 +78,7 @@ void Connection_test(uint8_t *buffer)
data_len = sizeof(Device_info_t) + 2; data_len = sizeof(Device_info_t) + 2;
send_buff[4] = data_len & 0xff; send_buff[4] = data_len & 0xff;
send_buff[5] = (data_len >> 8) & 0xff; send_buff[5] = (data_len >> 8) & 0xff;
list_files_in_spiffs(off_line_tool.directory, 10); list_files_in_spiffs("/spiffs",off_line_tool.directory, 10);
memcpy(&send_buff[6],&off_line_tool,sizeof(Device_info_t)); memcpy(&send_buff[6],&off_line_tool,sizeof(Device_info_t));
if (buffer[0] == 0x01) { if (buffer[0] == 0x01) {
// usb_serial_jtag_write_bytes(&send_buff[0],(6 + sizeof(Device_info_t) + 2),20 / portTICK_PERIOD_MS); // usb_serial_jtag_write_bytes(&send_buff[0],(6 + sizeof(Device_info_t) + 2),20 / portTICK_PERIOD_MS);
@ -124,7 +124,7 @@ void Transfer_file(uint8_t *buffer)
} }
file_size = data_buff[0] | data_buff[1] << 8 | data_buff[2] << 16 | data_buff[3] << 24; file_size = data_buff[0] | data_buff[1] << 8 | data_buff[2] << 16 | data_buff[3] << 24;
sprintf(&file_name[0],"/spiffs/%s",&data_buff[4]); sprintf(&file_name[0],"/spiffs/esp32s2/%s",&data_buff[4]);
ESP_LOGI(TAG,"file name:%s file size:%ld",file_name,file_size); ESP_LOGI(TAG,"file name:%s file size:%ld",file_name,file_size);
file = fopen(file_name, "ab"); file = fopen(file_name, "ab");
if (file == NULL) { if (file == NULL) {

View File

@ -38,11 +38,11 @@ esp_err_t init_spiffs(void)
return ESP_OK; return ESP_OK;
} }
void list_files_in_spiffs(spiffs_list_t *directory, size_t max_files) { uint8_t list_files_in_spiffs(const char *dir_path,spiffs_list_t *directory, size_t max_files) {
DIR *dir = opendir("/spiffs"); DIR *dir = opendir(dir_path);
if (dir == NULL) { if (dir == NULL) {
ESP_LOGE(TAG, "Failed to open directory"); ESP_LOGE(TAG, "Failed to open directory");
return; return 0;
} }
struct dirent *entry; struct dirent *entry;
@ -51,10 +51,10 @@ void list_files_in_spiffs(spiffs_list_t *directory, size_t max_files) {
uint8_t id = 0; uint8_t id = 0;
while ((entry = readdir(dir)) != NULL && id < max_files) { while ((entry = readdir(dir)) != NULL && id < max_files) {
snprintf(filepath, sizeof(filepath), "/spiffs/%s", entry->d_name); snprintf(filepath, sizeof(filepath), "%s/%s", dir_path, entry->d_name);
if (stat(filepath, &st) == 0) { if (stat(filepath, &st) == 0) {
directory[id].id = id; directory[id].id = id;
directory[id].addr = 0; // SPIFFS 本身没有物理地址,可以留空或自定义 directory[id].addr = 0; // SPIFFS 本身没有物理地址,可以留空或自定义
directory[id].size = st.st_size; directory[id].size = st.st_size;
memset(directory[id].name, 0, sizeof(directory[id].name)); memset(directory[id].name, 0, sizeof(directory[id].name));
strncpy(directory[id].name, entry->d_name, sizeof(directory[id].name) - 1); strncpy(directory[id].name, entry->d_name, sizeof(directory[id].name) - 1);
@ -66,6 +66,7 @@ void list_files_in_spiffs(spiffs_list_t *directory, size_t max_files) {
} }
closedir(dir); closedir(dir);
return id;
} }

View File

@ -32,7 +32,7 @@ typedef struct spiffs_list_
extern esp_err_t init_spiffs(void); extern esp_err_t init_spiffs(void);
extern esp_err_t sdmmc_init(void); extern esp_err_t sdmmc_init(void);
extern void list_files_in_spiffs(spiffs_list_t *directory, size_t max_files); extern uint8_t list_files_in_spiffs(const char *dir_path,spiffs_list_t *directory, size_t max_files);
extern void delete_file(const char *file_path); extern void delete_file(const char *file_path);
extern void delete_all_file(); extern void delete_all_file();
// void Read_file(char* filename, Read_data data,uint16_t size); // void Read_file(char* filename, Read_data data,uint16_t size);

View File

@ -86,7 +86,7 @@ void app_main(void)
ESP_ERROR_CHECK(esp_event_loop_create_default()); ESP_ERROR_CHECK(esp_event_loop_create_default());
xTaskCreate(&Gui_Task, "Gui_Task", 1024*20, NULL, 12, NULL); xTaskCreate(&Gui_Task, "Gui_Task", 1024*20, NULL, 12, NULL);
init_spiffs(); init_spiffs();
list_files_in_spiffs(off_line_tool.directory, 10); list_files_in_spiffs("/spiffs",off_line_tool.directory, 10);
ESP_LOGI(TAG, "Found file: %s, size: %ld bytes", off_line_tool.directory[0].name, off_line_tool.directory[0].size); ESP_LOGI(TAG, "Found file: %s, size: %ld bytes", off_line_tool.directory[0].name, off_line_tool.directory[0].size);
ESP_LOGI(TAG, "Found file: %s, size: %ld bytes", off_line_tool.directory[1].name, off_line_tool.directory[1].size); ESP_LOGI(TAG, "Found file: %s, size: %ld bytes", off_line_tool.directory[1].name, off_line_tool.directory[1].size);
ESPFlash_Init(); ESPFlash_Init();