wangbeihong/SmartMassager_STM32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:添加清空显示区域函数，使用任务事件组init_ok同步初始化 完善屏幕显示

Browse Source
This commit is contained in:
wangbeihong
2026-02-16 02:06:53 +08:00
parent 6b3c37263a
commit 00af5d343f
10 changed files with 228 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Core/Inc/gbk_text.h
View File

@@ -27,11 +27,11 @@ extern const uint8_t text_massage_ended_GBK[];
// GBK文本长度宏（预计算，不含\0）
#define text_device_name_LEN (10)
#define text_device_loading_LEN (16)
#define text_start_massage_LEN (8)
#define text_start_heating_LEN (8)
#define text_stop_massage_LEN (8)
#define text_stop_heating_LEN (8)
#define text_device_loading_LEN (20)
#define text_start_massage_LEN (10)
#define text_start_heating_LEN (10)
#define text_stop_massage_LEN (10)
#define text_stop_heating_LEN (10)
#define text_massage_gear_1_LEN (13)
#define text_massage_gear_2_LEN (13)
#define text_massage_gear_3_LEN (13)
@@ -41,11 +41,11 @@ extern const uint8_t text_massage_ended_GBK[];
#define text_massage_time_30_LEN (16)
#define text_massage_time_cont_LEN (14)
#define text_remaining_time_LEN (18)
#define text_heating_on_LEN (10)
#define text_heating_off_LEN (10)
#define text_massage_running_LEN (6)
#define text_massage_paused_LEN (10)
#define text_massage_ended_LEN (10)
#define text_heating_on_LEN (12)
#define text_heating_off_LEN (12)
#define text_massage_running_LEN (8)
#define text_massage_paused_LEN (12)
#define text_massage_ended_LEN (12)
// 兼容旧代码的别名
#define text_device_name text_device_name_GBK

2
Core/Inc/screen.h
View File

@@ -84,7 +84,7 @@ void Screen_DrawText32V_GBK(uint16_t x,uint16_t y,const uint8_t *gbk,uint16_t le
void Screen_DrawText48_GBK(uint16_t x,uint16_t y,const uint8_t *gbk,uint16_t len,uint8_t color,uint8_t transparent);
void Screen_ClearContent(void);
#ifdef __cplusplus
}
#endif

1
Core/Inc/stm32f1xx_it.h
View File

@@ -52,6 +52,7 @@ void MemManage_Handler(void);
void BusFault_Handler(void);
void UsageFault_Handler(void);
void DebugMon_Handler(void);
void USART3_IRQHandler(void);
void TIM8_UP_IRQHandler(void);
/* USER CODE BEGIN EFP */