diff --git a/User/driver/uart_lcd.c b/User/driver/uart_lcd.c index b476c20..b353ea6 100644 --- a/User/driver/uart_lcd.c +++ b/User/driver/uart_lcd.c @@ -2,7 +2,7 @@ * @Author: wangxujie wangxujie@wuxismart.com * @Date: 2025-03-10 15:05:20 * @LastEditors: wangxujie wangxujie@wuxismart.com - * @LastEditTime: 2025-07-31 18:36:56 + * @LastEditTime: 2025-08-01 10:44:49 * @FilePath: \signal_generator\User\driver\uart_lcd.c * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -33,7 +33,7 @@ static void uart_lcd_page_init(lcd_switchscreen_t *screen_data) screen_data->cmd_head = LCD_CMD_HEAD; screen_data->cmd_type = LCD_CMD_TYPE; screen_data->cmd_ctrl_type = LCD_CMD_CTRL_TYPE_SWITCH_SCREEN; - screen_data->cmd_screen_id = 0x0000; // 默认切换到主界面 + screen_data->cmd_screen_id = LCD_SCREEN_ID_CRUUENT; // 默认切换到主界面 screen_data->cmd_tail = LCD_CMD_TAIL; } @@ -251,31 +251,31 @@ void uart_lcd_init(void) uart_lcd_page_switch(uart_lcd_state.page_num); // 切换到第一个页面 // 初始化按钮 - uart_lcd_button_init(&lcd_set_button1_data, LCD_SCREEN_ID_CRUUENT, 1); - uart_lcd_button_init(&lcd_set_button2_data, LCD_SCREEN_ID_CRUUENT, 2); - uart_lcd_button_init(&lcd_set_button3_data, LCD_SCREEN_ID_CRUUENT, 3); - uart_lcd_button_init(&lcd_set_button4_data, 1, 1); - uart_lcd_button_init(&lcd_set_button5_data, 1, 2); + uart_lcd_button_init(&lcd_set_button1_data, LCD_SCREEN_ID_CRUUENT, LCD_CTRL_ID_BUTTON1); + uart_lcd_button_init(&lcd_set_button2_data, LCD_SCREEN_ID_CRUUENT, LCD_CTRL_ID_BUTTON2); + uart_lcd_button_init(&lcd_set_button3_data, LCD_SCREEN_ID_CRUUENT, LCD_CTRL_ID_BUTTON3); + uart_lcd_button_init(&lcd_set_button4_data, LCD_SCREEN_ID_CURVE, LCD_CTRL_ID_BUTTON4); + uart_lcd_button_init(&lcd_set_button5_data, LCD_SCREEN_ID_CURVE, LCD_CTRL_ID_BUTTON5); uart_lcd_state.current_out_channel = 0; uart_lcd_current_out_channel_switch(uart_lcd_state.current_out_channel); uart_lcd_set_button_status(&lcd_set_button4_data, 0); // 设置按钮状态 uart_lcd_set_button_status(&lcd_set_button5_data, 0); // 设置按钮状态 // 初始化滑块 - uart_lcd_slidervalue_init(&lcd_set_slidervalue1_data, 0, 4); // 第一路滑块 - uart_lcd_slidervalue_init(&lcd_set_slidervalue2_data, 0, 5); // 第二路滑块 + uart_lcd_slidervalue_init(&lcd_set_slidervalue1_data, LCD_SCREEN_ID_CRUUENT, LCD_CTRL_ID_SLIDERVALUE1); // 第一路滑块 + uart_lcd_slidervalue_init(&lcd_set_slidervalue2_data, LCD_SCREEN_ID_CRUUENT, LCD_CTRL_ID_SLIDERVALUE2); // 第二路滑块 uart_lcd_state.current_value[0] = 0; uart_lcd_state.current_value[1] = 0; uart_lcd_set_slidervalue(&lcd_set_slidervalue1_data, uart_lcd_state.current_value[0]); // 设置滑块值 uart_lcd_set_slidervalue(&lcd_set_slidervalue2_data, uart_lcd_state.current_value[1]); // 设置滑块值 // 初始化曲线 - uart_lcd_markcurve_init(&lcd_makecurve_data, 1, 14); // 曲线数据初始化 + uart_lcd_markcurve_init(&lcd_makecurve_data, LCD_SCREEN_ID_CURVE, LCD_CTRL_ID_MAKE_CURVE); // 曲线数据初始化 // 初始化文本 - uart_lcd_txt_init(&lcd_set_txt1_data, 1, 5); - uart_lcd_txt_init(&lcd_set_txt2_data, 1, 6); - uart_lcd_txt_init(&lcd_set_txt3_data, 1, 7); + uart_lcd_txt_init(&lcd_set_txt1_data, LCD_SCREEN_ID_CURVE, LCD_CTRL_ID_TXT1); + uart_lcd_txt_init(&lcd_set_txt2_data, LCD_SCREEN_ID_CURVE, LCD_CTRL_ID_TXT2); + uart_lcd_txt_init(&lcd_set_txt3_data, LCD_SCREEN_ID_CURVE, LCD_CTRL_ID_TXT3); uart_lcd_set_txt(&lcd_set_txt1_data, 0.0f); // 设置文本内容 uart_lcd_set_txt(&lcd_set_txt2_data, 0.0f); // 设置文本内容 uart_lcd_set_txt(&lcd_set_txt3_data, 0.0f); // 设置文本内容 diff --git a/User/driver/uart_lcd.h b/User/driver/uart_lcd.h index e99fc99..f6e3419 100644 --- a/User/driver/uart_lcd.h +++ b/User/driver/uart_lcd.h @@ -2,7 +2,7 @@ * @Author: wangxujie wangxujie@wuxismart.com * @Date: 2025-03-10 15:05:20 * @LastEditors: wangxujie wangxujie@wuxismart.com - * @LastEditTime: 2025-07-31 11:06:48 + * @LastEditTime: 2025-08-01 10:36:24 * @FilePath: \signal_generator\User\driver\uart_lcd.h * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -23,6 +23,21 @@ #define LCD_SCREEN_ID_CRUUENT 0x00 // 电流输出界面ID #define LCD_SCREEN_ID_CURVE 0x01 // 绘制曲线界面ID +#define LCD_CTRL_ID_BUTTON1 0x01 // 按钮控件ID +#define LCD_CTRL_ID_BUTTON2 0x02 // 按钮控件ID +#define LCD_CTRL_ID_BUTTON3 0x03 // 按钮控件ID +#define LCD_CTRL_ID_BUTTON4 0x01 // 按钮控件ID +#define LCD_CTRL_ID_BUTTON5 0x02 // 按钮控件ID + +#define LCD_CTRL_ID_TXT1 0x05 // 文本控件ID +#define LCD_CTRL_ID_TXT2 0x06 // 文本控件ID +#define LCD_CTRL_ID_TXT3 0x07 // 文本控件ID + +#define LCD_CTRL_ID_SLIDERVALUE1 0x04 // 滑块控件ID +#define LCD_CTRL_ID_SLIDERVALUE2 0x05 // 滑块控件ID + +#define LCD_CTRL_ID_MAKE_CURVE 0x0E // 曲线控件ID + #define LCD_CMD_SET_BUTTON_LEN 0x0C // 设置按钮状态命令长度 #pragma pack(1)