From 97f015374ff5bb9a1e45699d2a2d30fac41c1325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=90=83=E6=B2=B9=E7=82=B8=E9=B8=A1?= <1425962791@qq.com> Date: Wed, 26 Nov 2025 19:22:06 +0800 Subject: [PATCH] update --- Power_Pico/BSP/EEPROM/BL24C02.c | 2 +- Power_Pico/User/GUI/common/lv_lib_pm.c | 18 +++++++++--------- Power_Pico/User/GUI/common/lv_lib_pm.h | 16 ++++++++-------- Power_Pico/User/GUI/screens/ui_ChartPage.c | 2 +- Power_Pico/User/GUI/screens/ui_SetPage.c | 2 +- Power_Pico/User/GUI/screens/ui_mainPage.c | 2 +- Power_Pico/User/GUI/ui.c | 6 +++--- Power_Pico/User/Tasks/Src/user_TasksInit.c | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Power_Pico/BSP/EEPROM/BL24C02.c b/Power_Pico/BSP/EEPROM/BL24C02.c index f3dd9a7..7ad1c60 100644 --- a/Power_Pico/BSP/EEPROM/BL24C02.c +++ b/Power_Pico/BSP/EEPROM/BL24C02.c @@ -93,7 +93,7 @@ void EEPROM_SysSetting_Get(void) if(buff[0] <= 100) sys_settings.backlight_level = buff[0]; else - sys_settings.backlight_level = 80; + sys_settings.backlight_level = 60; if(buff[1] <= 1) sys_settings.key_sound_enable = buff[1]; else diff --git a/Power_Pico/User/GUI/common/lv_lib_pm.c b/Power_Pico/User/GUI/common/lv_lib_pm.c index 34daacc..2c7e585 100644 --- a/Power_Pico/User/GUI/common/lv_lib_pm.c +++ b/Power_Pico/User/GUI/common/lv_lib_pm.c @@ -7,14 +7,14 @@ PageManager_t PageManager; /** * 初始化页面管理器 */ -void PageManager_init(void) { +void lv_lib_pm_Init(void) { memset(&PageManager, 0, sizeof(PageManager)); } /** * load init screen */ -void PageManager_load_init_screen(void) { +void lv_lib_pm_load_init_screen(void) { if (PageManager.count == 0) return; Page_t* initial_page = PageManager.pages[0]; @@ -27,7 +27,7 @@ void PageManager_load_init_screen(void) { * 注册一个新页面 * @param page 页面结构体指针 */ -void PageManager_register(Page_t* page) { +void lv_lib_pm_register(Page_t* page) { if (PageManager.count >= MAX_PAGES) { LV_LOG_WARN("PageManager: page list is full!"); return; @@ -38,7 +38,7 @@ void PageManager_register(Page_t* page) { /** * 切换到下一个页面(循环) */ -void PageManager_next(void) { +void lv_lib_pm_next(void) { if (PageManager.count == 0) return; Page_t* prev = PageManager.pages[PageManager.current_index]; @@ -59,7 +59,7 @@ void PageManager_next(void) { /** * 切换到上一个页面(循环) */ -void PageManager_prev(void) { +void lv_lib_pm_prev(void) { if (PageManager.count == 0) return; Page_t* current = PageManager.pages[PageManager.current_index]; @@ -80,7 +80,7 @@ void PageManager_prev(void) { * 跳转到指定索引页面 * @param index 目标页面索引 */ -void PageManager_goto(uint8_t index) { +void lv_lib_pm_goto(uint8_t index) { if (index >= PageManager.count || PageManager.count == 0) return; Page_t* current = PageManager.pages[PageManager.current_index]; @@ -98,7 +98,7 @@ void PageManager_goto(uint8_t index) { * 获取当前页面 * @return 当前页面指针 */ -Page_t* PageManager_get_current_page(void) { +Page_t* lv_lib_pm_get_current_page(void) { if (PageManager.count == 0) return NULL; return PageManager.pages[PageManager.current_index]; } @@ -107,8 +107,8 @@ Page_t* PageManager_get_current_page(void) { * 处理按键事件,调用当前页面的按键事件处理函数 * @param key_id 按键ID */ -void PageManager_handle_key_event(uint8_t key_id) { - Page_t* current_page = PageManager_get_current_page(); +void lv_lib_pm_handle_key_event(uint8_t key_id) { + Page_t* current_page = lv_lib_pm_get_current_page(); if (current_page && current_page->key_event_handler) { current_page->key_event_handler(key_id); // 调用当前页面的按键事件处理函数 } else { diff --git a/Power_Pico/User/GUI/common/lv_lib_pm.h b/Power_Pico/User/GUI/common/lv_lib_pm.h index 49464f3..2e4f796 100644 --- a/Power_Pico/User/GUI/common/lv_lib_pm.h +++ b/Power_Pico/User/GUI/common/lv_lib_pm.h @@ -26,13 +26,13 @@ typedef struct { extern PageManager_t PageManager; // API 函数声明 -void PageManager_init(void); -void PageManager_register(Page_t* page); -void PageManager_load_init_screen(void); -void PageManager_next(void); -void PageManager_prev(void); -void PageManager_goto(uint8_t index); -Page_t* PageManager_get_current_page(void); -void PageManager_handle_key_event(uint8_t key_id); +void lv_lib_pm_Init(void); +void lv_lib_pm_register(Page_t* page); +void lv_lib_pm_load_init_screen(void); +void lv_lib_pm_next(void); +void lv_lib_pm_prev(void); +void lv_lib_pm_goto(uint8_t index); +Page_t* lv_lib_pm_get_current_page(void); +void lv_lib_pm_handle_key_event(uint8_t key_id); #endif // PAGE_MANAGER_H diff --git a/Power_Pico/User/GUI/screens/ui_ChartPage.c b/Power_Pico/User/GUI/screens/ui_ChartPage.c index 0215b01..788e947 100644 --- a/Power_Pico/User/GUI/screens/ui_ChartPage.c +++ b/Power_Pico/User/GUI/screens/ui_ChartPage.c @@ -62,7 +62,7 @@ static void _chart_update_cb(lv_timer_t * timer) { void ui_chart_page_key_handler(uint8_t key_id) { if(key_id == KEYB_NUM) { - PageManager_next(); + lv_lib_pm_next(); } } diff --git a/Power_Pico/User/GUI/screens/ui_SetPage.c b/Power_Pico/User/GUI/screens/ui_SetPage.c index 6fce545..5ec9978 100644 --- a/Power_Pico/User/GUI/screens/ui_SetPage.c +++ b/Power_Pico/User/GUI/screens/ui_SetPage.c @@ -36,7 +36,7 @@ void ui_set_page_key_handler(uint8_t key_id) { int panel_count = sizeof(panels) / sizeof(panels[0]); if(key_id == KEYB_NUM) { // key boot - PageManager_next(); + lv_lib_pm_next(); } if (key_id == KEYL_NUM) { // key left lv_obj_clear_state(panels[current_panel_index], LV_STATE_CHECKED); current_panel_index = (current_panel_index - 1 + panel_count) % panel_count; diff --git a/Power_Pico/User/GUI/screens/ui_mainPage.c b/Power_Pico/User/GUI/screens/ui_mainPage.c index 1fbf270..0cbb5c2 100644 --- a/Power_Pico/User/GUI/screens/ui_mainPage.c +++ b/Power_Pico/User/GUI/screens/ui_mainPage.c @@ -30,7 +30,7 @@ static uint8_t timecount = 0; void ui_main_page_key_handler(uint8_t key_id) { if(key_id == KEYB_NUM) { - PageManager_next(); + lv_lib_pm_next(); } else if (key_id == KEYL_NUM) { // rotation - 90 degrees // rotation – LV_DISPLAY_ROTATION_0/90/180/270 diff --git a/Power_Pico/User/GUI/ui.c b/Power_Pico/User/GUI/ui.c index c07ea4a..a721c25 100644 --- a/Power_Pico/User/GUI/ui.c +++ b/Power_Pico/User/GUI/ui.c @@ -115,11 +115,11 @@ static void main_timer(lv_timer_t * timer) ui_set_back_light_level(backlight_level); // 设置当前亮度 } else { // 初始化页面并加载主要界面 - PageManager_init(); + lv_lib_pm_Init(); for (uint8_t i = 0; i < sizeof(pages) / sizeof(pages[0]); i++) { - PageManager_register(&pages[i]); + lv_lib_pm_register(&pages[i]); } - PageManager_load_init_screen(); + lv_lib_pm_load_init_screen(); // 停止定时器,避免重复初始化 lv_timer_del(timer); diff --git a/Power_Pico/User/Tasks/Src/user_TasksInit.c b/Power_Pico/User/Tasks/Src/user_TasksInit.c index 8b222ec..a582fd6 100644 --- a/Power_Pico/User/Tasks/Src/user_TasksInit.c +++ b/Power_Pico/User/Tasks/Src/user_TasksInit.c @@ -131,7 +131,7 @@ void LvHandlerTask(void *argument) while(1) { if(osMessageQueueGet(Key_MessageQueue, &keystr, NULL, 1)==osOK) { - PageManager_handle_key_event(keystr); + lv_lib_pm_handle_key_event(keystr); } lv_task_handler(); osDelay(1);