SXDT-Embedded
/
BLE_TYQ_BJQ_CH32V303
mirror of https://gitee.com/SXDT-Embedded/ble_-tyq_-bjq_-ch32-v303.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

合并暂存

This commit is contained in:
小马_666 2025-06-13 11:51:01 +08:00
parent c2b522a404
commit ef6fc52c5b
2 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bsp/src/bsp_button.c
View File

@ -51,8 +51,6 @@ static uint8_t _CommonBtnRead (void *arg)
static void _CommonBtnEvtCb (void *arg) static void _CommonBtnEvtCb (void *arg)
{ {
// static rt_uint8_t button_cnt = 0;
if (flex_button_event_read (&user_button[USER_BUTTON_1]) == FLEX_BTN_PRESS_CLICK) if (flex_button_event_read (&user_button[USER_BUTTON_1]) == FLEX_BTN_PRESS_CLICK)
{ {
if(SysControl.status != kCalibrationEvent) if(SysControl.status != kCalibrationEvent)
@ -66,33 +64,6 @@ static void _CommonBtnEvtCb (void *arg)
{ {
Send_Laser_Alarm_Event(KMuteEvent); Send_Laser_Alarm_Event(KMuteEvent);
} }
// if (button_cnt == 1)
// {
// LED_OFF (y);
// LED_OFF (r);
// LED_ON (g);
// LOG_D ("GREEN ON");
// }
// else if (button_cnt == 2)
// {
// LED_OFF (g);
// LED_OFF (r);
// LED_ON (y);
// LOG_D ("Yellow ON");
// }
// else if (button_cnt == 3)
// {
// LED_OFF (g);
// LED_OFF (y);
// LED_ON (r);
// LOG_D ("RED ON");
// }
// else if (button_cnt >= 4)
// {
// button_cnt = 0;
// }
// button_cnt++;
} }
else if ((flex_button_event_read(&user_button[USER_BUTTON_1]) == FLEX_BTN_PRESS_LONG_HOLD) else if ((flex_button_event_read(&user_button[USER_BUTTON_1]) == FLEX_BTN_PRESS_LONG_HOLD)
&&(flex_button_event_read(&user_button[USER_BUTTON_0]) == FLEX_BTN_PRESS_DOUBLE_CLICK)) &&(flex_button_event_read(&user_button[USER_BUTTON_0]) == FLEX_BTN_PRESS_DOUBLE_CLICK))

2
bsp/src/bsp_flash.c
View File

@ -904,7 +904,7 @@ int BSP_Flash_Init (void)
Flash_SetProductTimeLimit (2025, 6, 11, 11, 50, 20, kFactoryTimeId); Flash_SetProductTimeLimit (2025, 6, 11, 11, 50, 20, kFactoryTimeId);
Set_ExpirationTime (MAX_EXPIRATION_DAYS); Set_ExpirationTime (MAX_EXPIRATION_DAYS);
Flash_Set_Calibration_State(kSysGasCalibStatus); // 标定状态 Flash_Set_Calibration_State(kNotCalibrated); // 标定状态
Flash_Set_Valve_Num(0); Flash_Set_Valve_Num(0);
sci.hw_ver = SYS_HW_VERSION; sci.hw_ver = SYS_HW_VERSION;
sci.sw_ver = SYS_SW_VERSION; sci.sw_ver = SYS_SW_VERSION;