wxsmart-test
/
sggt
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新： 

1、设置菜单内容选择与修改功能实现；
2、焦点后文本新增"<"">"符号；
3、设置屏幕内容与加载屏幕之间加入计数延时；
4、参数复位功能实现；
5、LVGL内存降至32KB，峰值占用为70%左右；
This commit is contained in:
吴俊潮 2025-04-01 14:16:45 +08:00
parent f2c6fd09f5
commit f5495479f1
14 changed files with 21729 additions and 17190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
App/APP_WU/Inc/app_screen_setting.h
View File

@ -102,6 +102,9 @@
//设置菜单数据初始化
void tab_data_init(void);
//选项卡 0 数据初始化
void item0_data_init(void);
//按键功能，详细设置菜单界面
void key_functions_setting(void);
@ -115,16 +118,22 @@ void setting_items_page(uint8_t ite, uint8_t page);
void setting_contents_check(uint8_t cursor, uint8_t cursor_prv);
//设置界面选项卡内部内容选中之后，根据键值key_val和步长step修改内容，修改第ite个选项卡的第con个内容
void setting_contents_modify(uint8_t ite, uint8_t con, uint8_t key_val, int8_t step);
void setting_contents_modify(uint8_t ite, uint8_t con, int8_t step);
//修改选项卡0的内容
void contents_modify_item_0(uint8_t cursor, int8_t step);
//修改选项卡0的值
void set_item0_value(uint8_t con, int8_t step);
//修改选项卡1的内容
void contents_modify_item_1(uint8_t cursor, int8_t step);
//修改选项卡0的文本
void set_item0_text(uint8_t con);
//修改选项卡0的值
void set_item1_value(uint8_t con, int8_t step);
//修改选项卡1的文本
void set_item1_text(uint8_t con);
//此处仅用于修改设置界面的显示内容，修改后的内容会在返回主界面时（KEY_BACK）再更新
void setting_text_update(uint8_t ite, uint8_t con);
void setting_contents_update(uint8_t ite, uint8_t con);
//设置内容的底色
void set_contents_color(uint8_t cursor, uint32_t color);

3
App/APP_WU/Inc/apps_gather.h
View File

@ -2,7 +2,7 @@
* @Author: wujunchao wujunchao@wuxismart.com
* @Date: 2024-12-27 11:51:06
* @LastEditors: wujunchao wujunchao@wuxismart.com
* @LastEditTime: 2025-03-31 12:46:50
* @LastEditTime: 2025-04-01 11:42:55
* @FilePath: \signal_generator\App\APP_WU\Inc\apps_gather.h
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -264,6 +264,7 @@ float32 temp2tcmv(SIG_FUNCTIONS_TYPE type, float32 temp);
#endif

11
App/APP_WU/Src/app_screen_main.c
View File

@ -227,6 +227,7 @@ void key_functions_main(void)
//加载菜单界面
setup_scr_screen_setting(&guider_ui);
delay_cnt(500);
lv_scr_load(guider_ui.screen_setting);
//切换至菜单后，清除主界面对象，释放内存
@ -542,6 +543,7 @@ void scr_init_run(void)
if( m5data.tick_prv == -1 )
{
m5data.tick_prv = xTaskGetTickCount(); //记录起始时刻
}else
{
m5data.tick_cur = xTaskGetTickCount(); //记录当前时刻
@ -573,6 +575,8 @@ void scr_init_run(void)
//加载主界面
setup_scr_screen_main(&guider_ui);
delay_cnt(500);
lv_scr_load(guider_ui.screen_main);
//删除初始界面对象，释放剩余内存
@ -1558,8 +1562,11 @@ void set_working_mode(SIG_FUNCTIONS mode, SIG_FUNCTIONS_TYPE type)
// pltdata.yreal_scd_value_prv = pltdata.yreal_scd_low;
// set_nixie_cube(IO_INPUT, 99, pltdata.yreal_scd_low*1000);
// //当前输出数值更新为新的上下限
// set_output(pltdata.yreal_pri_low);
//当前输出数值更新为新的上下限
if( pltdata.yreal_pri_low > 0 )
{
set_output(pltdata.yreal_pri_low);
}
//通道选择与切换
sig_channel_select(m5data.io_mode, type);

907
App/APP_WU/Src/app_screen_setting.c
View File

File diff suppressed because it is too large Load Diff

4
App/APP_WU/Src/apps_gather.c
View File

@ -2,7 +2,7 @@
* @Author: wujunchao wujunchao@wuxismart.com
* @Date: 2024-12-27 11:50:56
* @LastEditors: wujunchao wujunchao@wuxismart.com
* @LastEditTime: 2025-03-25 10:41:48
* @LastEditTime: 2025-04-01 11:40:27
* @FilePath: \signal_generator\App\APP_WU\Src\apps_gather.c
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@ -783,5 +783,3 @@ float32 my_power(int a, int b)

22
Core/Src/freertos.c
View File

@ -190,6 +190,7 @@ void start_task_lcd(void const * argument)
lv_timer_handler(); //LVGL刷新任务
osDelay(LVGL_BREATHE_INTERVAL);
lvgl_stack_watch = uxTaskGetStackHighWaterMark(NULL);
lvgl_stack_watch = 768 - lvgl_stack_watch;
}
/* USER CODE END start_task_lcd */
}
@ -261,6 +262,9 @@ void start_rs485(void const * argument)
* @param argument: Not used
* @retval None
*/
uint8_t my_monitor_cnt = 0;
uint32_t cpu_watch = 0, memuse_watch = 0, cpu_max = 0, memuse_max = 0;
lv_mem_monitor_t my_mon;
/* USER CODE END Header_start_mux_analog */
void start_mux_analog(void const * argument)
{
@ -271,6 +275,21 @@ void start_mux_analog(void const * argument)
{
mux_signal_switch(&mux_signal);
osDelay(50);
my_monitor_cnt++;
//my monitors
if(my_monitor_cnt >= 5)
{
my_monitor_cnt = 0;
cpu_watch = 100 - lv_timer_get_idle();
cpu_max = (cpu_max < cpu_watch)?(cpu_watch):(cpu_max);
lv_mem_monitor(&my_mon);
memuse_watch = my_mon.used_pct;
memuse_max = (memuse_max < memuse_watch)?(memuse_watch):(memuse_max);
}
}
/* USER CODE END start_mux_analog */
}
@ -293,6 +312,7 @@ void start_menu(void const * argument)
screen_run();
osDelay(200);
menu_stack_watch = uxTaskGetStackHighWaterMark(NULL);
menu_stack_watch = 512 - menu_stack_watch;
}
/* USER CODE END start_menu */
}
@ -304,6 +324,7 @@ void start_menu(void const * argument)
* @retval None
*/
//char task_status[255];
/* USER CODE END Header_start_task_monitor */
void start_task_monitor(void const * argument)
{
@ -315,6 +336,7 @@ void start_task_monitor(void const * argument)
//任务名 状态 优先级 空闲栈 任务号
//vTaskList(task_status);
//HAL_UART_Transmit(&huart3, (uint8_t *)task_status, 255, 0xFFFF);
osDelay(3000);
}
/* USER CODE END start_task_monitor */

2
Core/Src/main.c
View File

@ -35,7 +35,9 @@
/* Private typedef -----------------------------------------------------------*/
/* USER CODE BEGIN PTD */
lv_ui guider_ui; // 声明 lvgl界面对象
/* USER CODE END PTD */
/* Private define ------------------------------------------------------------*/

2
LVGL/lv_conf.h
View File

@ -49,7 +49,7 @@
#define LV_MEM_CUSTOM 0
#if LV_MEM_CUSTOM == 0
/*Size of the memory available for `lv_mem_alloc()` in bytes (>= 2kB)*/
#define LV_MEM_SIZE (60U * 1024U) /*[bytes]*/
#define LV_MEM_SIZE (32U * 1024U) /*[bytes]*/
/*Set an address for the memory pool instead of allocating it as a normal array. Can be in external SRAM too.*/
#define LV_MEM_ADR 0 /*0: unused*/

283
LVGL/myGUI/generated/guider_fonts/lv_font_SourceHanSerifSC_Regular_14.c
View File

@ -786,6 +786,18 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xd1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc0,
0x0, 0x0, 0x0,
/* U+4E2D "中" */
0x0, 0x0, 0x9, 0x30, 0x0, 0x0, 0x0, 0x0,
0xd, 0x10, 0x0, 0x0, 0x10, 0x0, 0xd, 0x10,
0x0, 0x20, 0xb7, 0x66, 0x6e, 0x76, 0x66, 0xf2,
0xb2, 0x0, 0xd, 0x10, 0x0, 0xe0, 0xb2, 0x0,
0xd, 0x10, 0x0, 0xe0, 0xb2, 0x0, 0xd, 0x10,
0x0, 0xe0, 0xb8, 0x66, 0x6e, 0x76, 0x66, 0xf0,
0xb2, 0x0, 0xd, 0x10, 0x0, 0xb0, 0x0, 0x0,
0xd, 0x10, 0x0, 0x0, 0x0, 0x0, 0xd, 0x10,
0x0, 0x0, 0x0, 0x0, 0xd, 0x10, 0x0, 0x0,
0x0, 0x0, 0xc, 0x0, 0x0, 0x0,
/* U+4F4D "位" */
0x0, 0x7, 0x40, 0x5, 0x10, 0x0, 0x0, 0x0,
0x1f, 0x20, 0x1, 0xd0, 0x0, 0x0, 0x0, 0x6a,
@ -871,6 +883,21 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x66, 0x66, 0x60, 0x10, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+53C2 "参" */
0x0, 0x0, 0x3, 0x70, 0x0, 0x0, 0x0, 0x0,
0x0, 0x5d, 0x40, 0x14, 0x0, 0x0, 0x0, 0x2a,
0x70, 0x1, 0x16, 0xd3, 0x0, 0x0, 0xcd, 0xcc,
0xe7, 0x63, 0x4b, 0x0, 0x0, 0x0, 0xa, 0x90,
0x0, 0x1, 0x60, 0x16, 0x66, 0xbc, 0x66, 0x79,
0x67, 0x71, 0x0, 0x6, 0xa0, 0x2b, 0x16, 0x70,
0x0, 0x0, 0x77, 0x4, 0xd3, 0x1, 0x6d, 0x82,
0x25, 0x12, 0x97, 0x2, 0xc9, 0x1, 0x91, 0x0,
0x44, 0x1, 0x8b, 0x40, 0x63, 0x0, 0x0, 0x4,
0x77, 0x30, 0x2b, 0xb3, 0x0, 0x0, 0x31, 0x0,
0x5b, 0xa4, 0x0, 0x0, 0x0, 0x36, 0x78, 0x51,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
/* U+56F4 "围" */
0x20, 0x0, 0x0, 0x0, 0x0, 0x40, 0xc7, 0x66,
0x68, 0x66, 0x66, 0xe4, 0xc1, 0x0, 0xe, 0x0,
@ -883,6 +910,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0xd1, 0xc7, 0x66, 0x67, 0x66, 0x66, 0xe1,
0xb1, 0x0, 0x0, 0x0, 0x0, 0xc0,
/* U+578B "型" */
0x0, 0x0, 0x0, 0x23, 0x0, 0x0, 0x91, 0x4,
0x7a, 0x6b, 0x88, 0xe, 0x0, 0xe0, 0x0, 0x2a,
0xc, 0x10, 0xd, 0x0, 0xe0, 0x0, 0x3a, 0xc,
0x38, 0xd, 0x0, 0xe0, 0x6, 0x9b, 0x6e, 0x76,
0x1d, 0x0, 0xe0, 0x0, 0x94, 0xc, 0x10, 0xd,
0x0, 0xe0, 0x1, 0xa0, 0xc, 0x10, 0x2, 0x1,
0xe0, 0x7, 0x10, 0xb, 0x46, 0x0, 0x1b, 0xa0,
0x0, 0x0, 0x0, 0x68, 0x0, 0x4, 0x0, 0x0,
0x46, 0x66, 0xab, 0x66, 0x8b, 0x10, 0x0, 0x0,
0x0, 0x68, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x68, 0x0, 0x0, 0x10, 0x6, 0x66, 0x66, 0xab,
0x66, 0x67, 0xf3,
/* U+590D "复" */
0x0, 0x5, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0,
0x1e, 0x40, 0x0, 0x0, 0x19, 0x0, 0x0, 0x8a,
@ -912,6 +953,19 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x2b, 0xb0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0,
/* U+5DF2 "已" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x66,
0x66, 0x66, 0x66, 0xd5, 0x0, 0x0, 0x0, 0x0,
0x0, 0xe, 0x0, 0x0, 0x61, 0x0, 0x0, 0x0,
0xe0, 0x0, 0xe, 0x0, 0x0, 0x0, 0xe, 0x0,
0x0, 0xe6, 0x66, 0x66, 0x66, 0xf0, 0x0, 0xe,
0x0, 0x0, 0x0, 0xe, 0x0, 0x0, 0xe0, 0x0,
0x0, 0x0, 0x20, 0x0, 0xe, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0xe0, 0x0, 0x0, 0x0, 0x0,
0x40, 0xe, 0x0, 0x0, 0x0, 0x0, 0x16, 0x0,
0xd4, 0x0, 0x0, 0x0, 0x18, 0x90, 0x4, 0xbd,
0xdd, 0xdd, 0xdd, 0xc9, 0x0,
/* U+6570 "数" */
0x0, 0x2, 0x90, 0x20, 0x19, 0x10, 0x0, 0x5,
0x63, 0xa3, 0xb0, 0x4c, 0x0, 0x0, 0x0, 0xa3,
@ -941,6 +995,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x50, 0x0, 0x4, 0xf7, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0,
/* U+672A "未" */
0x0, 0x0, 0x0, 0x53, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xb3, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0xb3, 0x0, 0x75, 0x0, 0x2, 0x66, 0x66,
0xd8, 0x66, 0x65, 0x0, 0x0, 0x0, 0x0, 0xb3,
0x0, 0x1, 0x0, 0x36, 0x66, 0x66, 0xd8, 0x66,
0x6d, 0xa0, 0x0, 0x0, 0xc, 0xf9, 0x0, 0x0,
0x0, 0x0, 0x0, 0x6b, 0xb4, 0x90, 0x0, 0x0,
0x0, 0x3, 0xc1, 0xb3, 0x59, 0x0, 0x0, 0x0,
0x3b, 0x10, 0xb3, 0x8, 0xb1, 0x0, 0x4, 0x80,
0x0, 0xb3, 0x0, 0x8e, 0x60, 0x44, 0x0, 0x0,
0xb3, 0x0, 0x4, 0x90, 0x0, 0x0, 0x0, 0xa2,
0x0, 0x0, 0x0,
/* U+6D41 "流" */
0x1, 0x50, 0x0, 0x4, 0x50, 0x0, 0x0, 0x0,
0x6b, 0x0, 0x0, 0xd1, 0x1, 0x20, 0x0, 0x6,
@ -1014,6 +1082,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x4, 0x0, 0x0, 0xd1, 0x0, 0x0, 0x55,
0x0, 0x0, 0x8f, 0xee, 0xee, 0xe5,
/* U+7C7B "类" */
0x0, 0x0, 0x0, 0x84, 0x0, 0x20, 0x0, 0x0,
0xa, 0x50, 0xb3, 0x9, 0xa0, 0x0, 0x0, 0x0,
0xd0, 0xb3, 0x58, 0x2, 0x0, 0x26, 0x66, 0x78,
0xe8, 0xa6, 0x6b, 0x80, 0x0, 0x0, 0x6c, 0xc8,
0x72, 0x0, 0x0, 0x0, 0x8, 0x90, 0xb3, 0x2b,
0xb2, 0x0, 0x4, 0x83, 0x0, 0xa2, 0x0, 0x6e,
0x0, 0x22, 0x0, 0x0, 0xb1, 0x0, 0x1, 0x0,
0x36, 0x66, 0x67, 0xf6, 0x66, 0x6b, 0xc0, 0x0,
0x0, 0x6, 0x96, 0x0, 0x0, 0x0, 0x0, 0x0,
0x2c, 0x22, 0x91, 0x0, 0x0, 0x0, 0x7, 0x92,
0x0, 0x2c, 0xa4, 0x10, 0x36, 0x72, 0x0, 0x0,
0x0, 0x5b, 0xc1,
/* U+7F6E "置" */
0x0, 0x30, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0,
0xe6, 0x6e, 0x66, 0xe6, 0x6e, 0x30, 0x0, 0xe0,
@ -2034,89 +2116,95 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 3916, .adv_w = 224, .box_w = 12, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3982, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4073, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4164, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4255, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4346, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4437, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4535, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4620, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4718, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 4164, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 4242, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4333, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4424, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4515, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4613, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4698, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4796, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4894, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4985, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5083, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 5174, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5272, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5377, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5482, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5573, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 2, .ofs_y = -1},
{.bitmap_index = 5651, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5742, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5833, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5931, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 6016, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 6107, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6212, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6317, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 6430, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6507, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6598, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6675, .adv_w = 154, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 6730, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6835, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6940, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7044, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7149, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7237, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7342, .adv_w = 112, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7384, .adv_w = 168, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7450, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7562, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7639, .adv_w = 154, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7714, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 7784, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7882, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7967, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8052, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 8122, .adv_w = 196, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 8213, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8272, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8331, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8416, .adv_w = 196, .box_w = 13, .box_h = 4, .ofs_x = 0, .ofs_y = 3},
{.bitmap_index = 8442, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8530, .adv_w = 280, .box_w = 18, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8665, .adv_w = 252, .box_w = 17, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 8793, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8884, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 8936, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 8988, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9087, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9164, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9269, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 9382, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9467, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9565, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9650, .adv_w = 196, .box_w = 13, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9728, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9805, .adv_w = 140, .box_w = 10, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 9880, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9978, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10076, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10164, .adv_w = 224, .box_w = 16, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 10284, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10367, .adv_w = 280, .box_w = 18, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10484, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10574, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10664, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10754, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10844, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10934, .adv_w = 280, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11042, .adv_w = 196, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11132, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11230, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 11343, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11442, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11525, .adv_w = 225, .box_w = 15, .box_h = 10, .ofs_x = 0, .ofs_y = 0}
{.bitmap_index = 4894, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 4972, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5063, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5161, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5252, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 5337, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5435, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 5526, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 5617, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5715, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5820, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5925, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6016, .adv_w = 224, .box_w = 12, .box_h = 13, .ofs_x = 2, .ofs_y = -1},
{.bitmap_index = 6094, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6185, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6276, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 6367, .adv_w = 224, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6465, .adv_w = 224, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 6550, .adv_w = 224, .box_w = 13, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 6641, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6746, .adv_w = 224, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 6851, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 6964, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7041, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7132, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7209, .adv_w = 154, .box_w = 10, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7264, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7369, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7474, .adv_w = 252, .box_w = 16, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7578, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7683, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 7771, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 7876, .adv_w = 112, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7918, .adv_w = 168, .box_w = 11, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 7984, .adv_w = 252, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8096, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 8173, .adv_w = 154, .box_w = 10, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8248, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 8318, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 8416, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8501, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8586, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 8656, .adv_w = 196, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 8747, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8806, .adv_w = 140, .box_w = 9, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8865, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 8950, .adv_w = 196, .box_w = 13, .box_h = 4, .ofs_x = 0, .ofs_y = 3},
{.bitmap_index = 8976, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9064, .adv_w = 280, .box_w = 18, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9199, .adv_w = 252, .box_w = 17, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 9327, .adv_w = 224, .box_w = 14, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 9418, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 9470, .adv_w = 196, .box_w = 13, .box_h = 8, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 9522, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9621, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 9698, .adv_w = 224, .box_w = 14, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 9803, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 9916, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10001, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10099, .adv_w = 196, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10184, .adv_w = 196, .box_w = 13, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 10262, .adv_w = 224, .box_w = 14, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10339, .adv_w = 140, .box_w = 10, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 10414, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10512, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10610, .adv_w = 252, .box_w = 16, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 10698, .adv_w = 224, .box_w = 16, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 10818, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 10901, .adv_w = 280, .box_w = 18, .box_h = 13, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11018, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11108, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11198, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11288, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11378, .adv_w = 280, .box_w = 18, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11468, .adv_w = 280, .box_w = 18, .box_h = 12, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 11576, .adv_w = 196, .box_w = 12, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11666, .adv_w = 196, .box_w = 13, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 11764, .adv_w = 224, .box_w = 15, .box_h = 15, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 11877, .adv_w = 280, .box_w = 18, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 11976, .adv_w = 168, .box_w = 11, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 12059, .adv_w = 225, .box_w = 15, .box_h = 10, .ofs_x = 0, .ofs_y = 0}
};
/*---------------------
@ -2124,17 +2212,18 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
*--------------------*/
static const uint16_t unicode_list_2[] = {
0x0, 0x1d5a, 0x4a61, 0x4a62, 0x4ba4, 0x4c34, 0x4c93, 0x4ccd,
0x4fac, 0x4fe2, 0x534b, 0x5564, 0x57af, 0x61c7, 0x6265, 0x6998,
0x6d44, 0x6dbe, 0x6fde, 0x718c, 0x7bc5, 0x7f5a, 0x8815, 0x9292,
0x92a7, 0x94d0, 0x94e8, 0xec58, 0xec5f, 0xec62, 0xec63, 0xec64,
0xec68, 0xec6a, 0xec6c, 0xec70, 0xec73, 0xec78, 0xec7d, 0xec7e,
0xec7f, 0xec95, 0xec9a, 0xec9f, 0xeca2, 0xeca3, 0xeca4, 0xeca8,
0xeca9, 0xecaa, 0xecab, 0xecbe, 0xecbf, 0xecc5, 0xecc7, 0xecc8,
0xeccb, 0xecce, 0xeccf, 0xecd0, 0xecd2, 0xecea, 0xecec, 0xed1b,
0xed1c, 0xed1e, 0xed20, 0xed37, 0xed3e, 0xed41, 0xed4a, 0xed73,
0xed7b, 0xedb2, 0xee42, 0xee97, 0xee98, 0xee99, 0xee9a, 0xee9b,
0xeede, 0xeeea, 0xef44, 0xef5b, 0xf1b1, 0xf419, 0xf4f9
0x0, 0x1d5a, 0x4a61, 0x4a62, 0x4a84, 0x4ba4, 0x4c34, 0x4c93,
0x4ccd, 0x4fac, 0x4fe2, 0x5019, 0x534b, 0x53e2, 0x5564, 0x57af,
0x5a49, 0x61c7, 0x6265, 0x6381, 0x6998, 0x6d44, 0x6dbe, 0x6fde,
0x718c, 0x78d2, 0x7bc5, 0x7f5a, 0x8815, 0x9292, 0x92a7, 0x94d0,
0x94e8, 0xec58, 0xec5f, 0xec62, 0xec63, 0xec64, 0xec68, 0xec6a,
0xec6c, 0xec70, 0xec73, 0xec78, 0xec7d, 0xec7e, 0xec7f, 0xec95,
0xec9a, 0xec9f, 0xeca2, 0xeca3, 0xeca4, 0xeca8, 0xeca9, 0xecaa,
0xecab, 0xecbe, 0xecbf, 0xecc5, 0xecc7, 0xecc8, 0xeccb, 0xecce,
0xeccf, 0xecd0, 0xecd2, 0xecea, 0xecec, 0xed1b, 0xed1c, 0xed1e,
0xed20, 0xed37, 0xed3e, 0xed41, 0xed4a, 0xed73, 0xed7b, 0xedb2,
0xee42, 0xee97, 0xee98, 0xee99, 0xee9a, 0xee9b, 0xeede, 0xeeea,
0xef44, 0xef5b, 0xf1b1, 0xf419, 0xf4f9
};
/*Collect the unicode lists and glyph_id offsets*/
@ -2150,7 +2239,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
},
{
.range_start = 937, .range_length = 62714, .glyph_id_start = 95,
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 87, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 93, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};
@ -2184,7 +2273,8 @@ static const uint8_t kern_left_class_mapping[] =
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0
};
/*Map glyph_ids to kern right classes*/
@ -2212,7 +2302,8 @@ static const uint8_t kern_right_class_mapping[] =
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0
};
/*Kern values between classes*/

2
LVGL/myGUI/generated/setup_scr_screen_hidden.c
View File

@ -30,7 +30,7 @@ void setup_scr_screen_hidden(lv_ui *ui)
//Write codes screen_hidden_label_1
ui->screen_hidden_label_1 = lv_label_create(ui->screen_hidden);
lv_label_set_text(ui->screen_hidden_label_1, "照 明 热 电 偶 阻 ℃ Ω 复 位 保 存");
lv_label_set_text(ui->screen_hidden_label_1, "照 明 热 电 偶 阻 ℃ Ω 类 型\n参 数 复 位 保 存 未 中 已 ");
lv_label_set_long_mode(ui->screen_hidden_label_1, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_hidden_label_1, 0, 0);
lv_obj_set_size(ui->screen_hidden_label_1, 320, 240);

6
LVGL/myGUI/generated/setup_scr_screen_setting.c
View File

@ -410,7 +410,7 @@ void setup_scr_screen_setting(lv_ui *ui)
//Write codes screen_setting_label_50
ui->screen_setting_label_50 = lv_label_create(ui->screen_setting);
lv_label_set_text(ui->screen_setting_label_50, "频率上限(KHz)");
lv_label_set_text(ui->screen_setting_label_50, "电阻上限(Ω)");
lv_label_set_long_mode(ui->screen_setting_label_50, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_setting_label_50, 95, 190);
lv_obj_set_size(ui->screen_setting_label_50, 105, 25);
@ -433,7 +433,7 @@ void setup_scr_screen_setting(lv_ui *ui)
//Write codes screen_setting_label_51
ui->screen_setting_label_51 = lv_label_create(ui->screen_setting);
lv_label_set_text(ui->screen_setting_label_51, "100");
lv_label_set_text(ui->screen_setting_label_51, "4000");
lv_label_set_long_mode(ui->screen_setting_label_51, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_setting_label_51, 200, 190);
lv_obj_set_size(ui->screen_setting_label_51, 120, 25);
@ -458,7 +458,7 @@ void setup_scr_screen_setting(lv_ui *ui)
//Write codes screen_setting_label_page
ui->screen_setting_label_page = lv_label_create(ui->screen_setting);
lv_label_set_text(ui->screen_setting_label_page, "< 1 / 6 >");
lv_label_set_text(ui->screen_setting_label_page, "< 1 / 3 >");
lv_label_set_long_mode(ui->screen_setting_label_page, LV_LABEL_LONG_WRAP);
lv_obj_set_pos(ui->screen_setting_label_page, 165, 221);
lv_obj_set_size(ui->screen_setting_label_page, 70, 15);

3664
MDK-ARM/signal_generator.uvguix.吴俊潮 Normal file
View File

File diff suppressed because one or more lines are too long

15
MDK-ARM/signal_generator.uvoptx
View File

@ -270,6 +270,21 @@
<WinNumber>1</WinNumber>
<ItemText>menu_stack_watch,0x0A</ItemText>
</Ww>
<Ww>
<count>23</count>
<WinNumber>1</WinNumber>
<ItemText>cpu_watch,0x0A</ItemText>
</Ww>
<Ww>
<count>24</count>
<WinNumber>1</WinNumber>
<ItemText>memuse_watch,0x0A</ItemText>
</Ww>
<Ww>
<count>25</count>
<WinNumber>1</WinNumber>
<ItemText>memuse_max,0x0A</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>

33479
MDK-ARM/signal_generator/signal_generator.hex
View File

File diff suppressed because it is too large Load Diff