|
|
@@ -446,9 +446,12 @@ void PulseGetCount(void *p_arg) |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @brief 任务4,EXT |
|
|
|
* @brief 任务5,EXT |
|
|
|
* @return 无 |
|
|
|
*/ |
|
|
|
|
|
|
|
/* 最新思路:不采用进入中断的方式,直接停止现在进行的定时器(10【产生脉冲】) |
|
|
|
重新设置定时器2【脉冲计数】的CNT和ARR为下一个脉冲的(段切换) */ |
|
|
|
void EXTSet(void *p_arg) |
|
|
|
{ |
|
|
|
p_arg = p_arg; |
|
|
@@ -463,6 +466,7 @@ void EXTSet(void *p_arg) |
|
|
|
if(HAL_GPIO_ReadPin(GPIOB, X4_Pin) == GPIO_PIN_SET) |
|
|
|
{ |
|
|
|
X4_Sta = 1; |
|
|
|
while(HAL_GPIO_ReadPin(GPIOB, X4_Pin) == GPIO_PIN_SET); |
|
|
|
} |
|
|
|
} |
|
|
|
if(HAL_GPIO_ReadPin(GPIOG, X5_Pin) == GPIO_PIN_SET) |
|
|
@@ -471,6 +475,7 @@ void EXTSet(void *p_arg) |
|
|
|
if(HAL_GPIO_ReadPin(GPIOG, X5_Pin) == GPIO_PIN_SET) |
|
|
|
{ |
|
|
|
X5_Sta = 1; |
|
|
|
while(HAL_GPIO_ReadPin(GPIOG, X5_Pin) == GPIO_PIN_SET); |
|
|
|
} |
|
|
|
} |
|
|
|
if(X4_Sta == 1 && Options.EXT == 0) |
|
|
|