|
|
@@ -1771,50 +1771,39 @@ static void Control_Heat_thread_entry(void *parameter) {
|
|
|
// 修正变量名和初始化
|
|
|
static int GaoYa_cnt = 500, GuangShan_cnt = 500;
|
|
|
static bool GaoYa = false, GuangShan = false;
|
|
|
- static int gaoYaDebounce = 0, guangShanDebounce = 0;
|
|
|
- static enum { PHOTO_IDLE, PHOTO_TRIGGERED, PHOTO_DELAY } photoState = PHOTO_IDLE;
|
|
|
- static int photoDelayTicks = 0;
|
|
|
+ static int highPressureDuration = 0;
|
|
|
|
|
|
- // 去抖动阈值 (100ms)
|
|
|
- #define DEBOUNCE_TICKS 5
|
|
|
-
|
|
|
- // 新增高压持续时间监测
|
|
|
- static uint32_t highPressureDuration = 0; // 持续时间计数器
|
|
|
- const uint32_t pressureTimeout = 250; // 5秒阈值(250 * 20ms=5000ms)
|
|
|
- bool pressureAlarmTriggered = false; // 报警触发标志
|
|
|
|
|
|
while (1) {
|
|
|
// 高压信号去抖动
|
|
|
if (rt_pin_read(SIGNAL_GaoYa) == 0) {
|
|
|
- if (gaoYaDebounce < DEBOUNCE_TICKS) {
|
|
|
- gaoYaDebounce++;
|
|
|
- if (gaoYaDebounce == DEBOUNCE_TICKS && !GaoYa) {
|
|
|
- LOG_I("高压信号稳定触发");
|
|
|
- GaoYa = true;
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- gaoYaDebounce = 0;
|
|
|
+ LOG_I("高压信号稳定触发");
|
|
|
+ GaoYa = true;
|
|
|
+ highPressureDuration ++;
|
|
|
+ }else{
|
|
|
+ highPressureDuration = 0;
|
|
|
}
|
|
|
|
|
|
// 光栅信号去抖动(类似逻辑)
|
|
|
- // ...
|
|
|
+ if(rt_pin_read(SIGNAL_GuangShan)==0)
|
|
|
+ {
|
|
|
+ LOG_I("检测到光栅计数!");
|
|
|
+ GuangShan = true;
|
|
|
+ }
|
|
|
/* 高压持续时间监测 */
|
|
|
if(GaoYa)
|
|
|
{
|
|
|
// 持续时间累计(每次循环+1,20ms/次)
|
|
|
- if(++highPressureDuration >= pressureTimeout)
|
|
|
+ if(highPressureDuration >= 250)
|
|
|
{
|
|
|
- if(!pressureAlarmTriggered)
|
|
|
- {
|
|
|
- LOG_E("高压持续超过5秒!");
|
|
|
- // 执行关闭高压操作(示例函数)
|
|
|
- ctr_lamp(OFF, 1);
|
|
|
- pressureAlarmTriggered = true;
|
|
|
- // 可选:自动复位保护
|
|
|
- rt_thread_mdelay(10000); // 等待2秒
|
|
|
- ctr_lamp(ON, 1);
|
|
|
- }
|
|
|
+ LOG_E("高压持续超过5秒!");
|
|
|
+ // 执行关闭高压操作(示例函数)
|
|
|
+ ctr_lamp(OFF, 1);
|
|
|
+ // 可选:自动复位保护
|
|
|
+ rt_thread_mdelay(10000); // 等待2秒
|
|
|
+ ctr_lamp(ON, 1);
|
|
|
+ GaoYa = false;
|
|
|
+ highPressureDuration = 0;
|
|
|
}
|
|
|
}
|
|
|
// 计数器逻辑
|
|
|
@@ -1835,26 +1824,9 @@ static void Control_Heat_thread_entry(void *parameter) {
|
|
|
// 触发拍照逻辑
|
|
|
if (GaoYa && GuangShan) {
|
|
|
device_status.all_ycct++;
|
|
|
- photoState = PHOTO_TRIGGERED;
|
|
|
GaoYa = GuangShan = false;
|
|
|
GaoYa_cnt = GuangShan_cnt = 500;
|
|
|
}
|
|
|
-#if 0
|
|
|
- // 处理拍照状态机
|
|
|
- switch (photoState) {
|
|
|
- case PHOTO_TRIGGERED:
|
|
|
- device_status.photo_ws = 1;
|
|
|
- photoState = PHOTO_DELAY;
|
|
|
- photoDelayTicks = 50; // 1s
|
|
|
- break;
|
|
|
- case PHOTO_DELAY:
|
|
|
- if (--photoDelayTicks <= 0) {
|
|
|
- device_status.photo_ws = 0;
|
|
|
- photoState = PHOTO_IDLE;
|
|
|
- }
|
|
|
- break;
|
|
|
- }
|
|
|
-#endif
|
|
|
rt_thread_delay(20); // 保持20ms周期
|
|
|
}
|
|
|
}
|