暂存,屏蔽蜂鸣器,1.9V OK,低压阈值设置了2V

This commit is contained in:
stark1898y 2025-05-29 18:46:31 +08:00
parent 9924f8c58d
commit 2b614e340f
4 changed files with 16 additions and 15 deletions

View File

@ -667,12 +667,6 @@ static void peripheralStateNotificationCB(gapRole_States_t newState, gapRoleEven
}; };
GATT_ExchangeMTU(peripheralConnList.connHandle, &req, Peripheral_TaskID); GATT_ExchangeMTU(peripheralConnList.connHandle, &req, Peripheral_TaskID);
// Peripheral_SetMacName(); // Peripheral_SetMacName();
// BSP_BlockSleep();
// BSP_RequestBoost();
// DelayMs(1);
// // ShowLed();
// BEEP_ON;
// DelayMs(500);
} }
break; break;
@ -792,6 +786,8 @@ static void performPeriodicTask(void)
BSP_VALVE_Generate_UploadData(&RawData); BSP_VALVE_Generate_UploadData(&RawData);
peripheralChar4Notify(&RawData.buf[0], RawData.len); peripheralChar4Notify(&RawData.buf[0], RawData.len);
tmos_set_event(led_task_id, LED_SHOW_START_EVT);
} }
/********************************************************************* /*********************************************************************

View File

@ -2,7 +2,7 @@
* @Author : stark1898y 1658608470@qq.com * @Author : stark1898y 1658608470@qq.com
* @Date : 2024-12-12 15:55:38 * @Date : 2024-12-12 15:55:38
* @LastEditors : stark1898y 1658608470@qq.com * @LastEditors : stark1898y 1658608470@qq.com
* @LastEditTime : 2025-05-29 17:28:34 * @LastEditTime : 2025-05-29 18:34:19
* @FilePath : \BLE_TYQ_CH584M\BSP\inc\bsp_valve.h * @FilePath : \BLE_TYQ_CH584M\BSP\inc\bsp_valve.h
* @Description : * @Description :
* *
@ -41,13 +41,14 @@ extern tmosTaskID vavle_task_id;
#define VALVE_DECT_PERIOD_MS (1000 * 60 * 10) #define VALVE_DECT_PERIOD_MS (1000 * 60 * 10)
#define CHARGE_TIME_MS (1500) #define CHARGE_TIME_MS (2000)
// 2.2V // 2.2V
#define LOW_VABAT_ALARM_VALUE 23 #define LOW_VABAT_ALARM_VALUE 23
#define LOW_VABAT_CLOSE_VALUE 2000 #define LOW_VABAT_CLOSE_VALUE 2000
#define LOW_VABAT_ALARM_MV 2050
#define LOW_VABAT_CLOSE_MV 2000 #define LOW_VABAT_CLOSE_MV 2000

View File

@ -27,7 +27,8 @@ void ShowLed()
// BSP_RequestBoost(); // BSP_RequestBoost();
// 电压过低就关阀 // 电压过低就关阀
if (gValveData.bat <= LOW_VABAT_ALARM_VALUE) // if (gValveData.bat <= LOW_VABAT_ALARM_VALUE)
if (bat_mv <= LOW_VABAT_CLOSE_MV)
{ {
LED_ALL_OFF_DEINIT; LED_ALL_OFF_DEINIT;
LED_Y_ON; LED_Y_ON;
@ -60,10 +61,11 @@ static tmosEvents LED_Task_ProcessEvent(tmosTaskID taskID, tmosEvents event)
logDebug("LED_SHOW_START_EVT"); logDebug("LED_SHOW_START_EVT");
BSP_BlockSleep(); BSP_BlockSleep();
BSP_RequestBoost(); BSP_RequestBoost();
DelayMs(3); // DelayMs(3);
ShowLed(); ShowLed();
tmos_stop_task(led_task_id, LED_SHOW_ONCE_EVT); tmos_stop_task(led_task_id, LED_SHOW_END_EVT);
tmos_start_task(led_task_id, LED_SHOW_ONCE_EVT, MS1_TO_SYSTEM_TIME(1000)); // tmos_start_task(led_task_id, LED_SHOW_ONCE_EVT, MS1_TO_SYSTEM_TIME(10));
tmos_start_task(led_task_id, LED_SHOW_END_EVT, MS1_TO_SYSTEM_TIME(10));
return (event ^ LED_SHOW_START_EVT); return (event ^ LED_SHOW_START_EVT);
} }
if (event & LED_SHOW_ONCE_EVT) if (event & LED_SHOW_ONCE_EVT)
@ -102,12 +104,12 @@ static tmosEvents LED_Task_ProcessEvent(tmosTaskID taskID, tmosEvents event)
if (event & CONNECT_BEEP_START_EVT) if (event & CONNECT_BEEP_START_EVT)
{ {
logDebug("CONNECT_BEEP_START_EVT"); logDebug("CONNECT_BEEP_START_EVT");
// LED_G_ON;
BSP_BlockSleep(); BSP_BlockSleep();
BSP_RequestBoost(); BSP_RequestBoost();
// BEEP_ON; // BEEP_ON;
LED_G_ON;
tmos_start_task(led_task_id, CONNECT_BEEP_END_EVT, MS1_TO_SYSTEM_TIME(20)); tmos_start_task(led_task_id, CONNECT_BEEP_END_EVT, MS1_TO_SYSTEM_TIME(50));
return (event ^ CONNECT_BEEP_START_EVT); return (event ^ CONNECT_BEEP_START_EVT);
} }

View File

@ -2,7 +2,7 @@
* @Author : stark1898y 1658608470@qq.com * @Author : stark1898y 1658608470@qq.com
* @Date : 2024-12-15 15:01:15 * @Date : 2024-12-15 15:01:15
* @LastEditors : stark1898y 1658608470@qq.com * @LastEditors : stark1898y 1658608470@qq.com
* @LastEditTime : 2025-05-29 17:25:55 * @LastEditTime : 2025-05-29 18:42:42
* @FilePath : \BLE_TYQ_CH584M\BSP\src\bsp_valve.c * @FilePath : \BLE_TYQ_CH584M\BSP\src\bsp_valve.c
* @Description : * @Description :
* *
@ -353,6 +353,7 @@ static void VAVLE_Task_ProcessTmosMsg(uint8_t *p_rev_msg)
logError("数据帧解析失败"); logError("数据帧解析失败");
} }
tmos_msg_deallocate((uint8_t *)HostFrameData); tmos_msg_deallocate((uint8_t *)HostFrameData);
// tmos_set_event(led_task_id, LED_SHOW_START_EVT);
HostFrameData = NULL; HostFrameData = NULL;
#endif #endif
} }
@ -419,6 +420,7 @@ static uint16_t VAVLE_Task_ProcessEvent(uint8_t task_id, uint16_t events)
EMV_CHARGE_OFF_DEINIT; EMV_CHARGE_OFF_DEINIT;
// BEEP_ON; // BEEP_ON;
LED_R_ON;
logDebug("EMV_CHARGE_OFF_DEINIT"); logDebug("EMV_CHARGE_OFF_DEINIT");