代码暂存 气压传感器逻辑判断优化
This commit is contained in:
parent
1bf077c4ea
commit
bf287c5b8a
|
@ -103,9 +103,7 @@ int main(void)
|
||||||
MultiTimerInstall((PlatformTicksFunction_t)BSP_Get_Tick);
|
MultiTimerInstall((PlatformTicksFunction_t)BSP_Get_Tick);
|
||||||
BSP_KEY_Init(app_task_handler);
|
BSP_KEY_Init(app_task_handler);
|
||||||
|
|
||||||
BSP_MOTOR_Init();
|
// BSP_MOTOR_Init();
|
||||||
VALVE_OPEN();
|
|
||||||
DelayMs(1000);
|
|
||||||
BSP_VAVLE_Init();
|
BSP_VAVLE_Init();
|
||||||
|
|
||||||
BSP_LED_Init();
|
BSP_LED_Init();
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
1.灯光需按说明显示
|
1.电机停止需判断COIL_ADC优化
|
||||||
2.低电压
|
2.低电压判断
|
||||||
3.初始阀门状态确定
|
3.暂时屏蔽4G
|
||||||
4.按键偶现反转现象
|
|
||||||
5.暂时屏蔽4G
|
|
|
@ -734,28 +734,28 @@ uint16_t Check_ProcessEvent(uint8_t task_id, uint16_t events)
|
||||||
if(!fault_state)
|
if(!fault_state)
|
||||||
{
|
{
|
||||||
//超压检测
|
//超压检测
|
||||||
if(P[0] - P[2] >= 80) //8000
|
if(P[0] - P[2] >= 8000)
|
||||||
{
|
{
|
||||||
VALVE_CLOSE();
|
VALVE_CLOSE();
|
||||||
fault_state = 1;
|
fault_state = 1;
|
||||||
tmos_start_task(check_task_id, MOTOR_STOP_EVT, MS1_TO_SYSTEM_TIME(1500)); //1000
|
tmos_start_task(check_task_id, MOTOR_STOP_EVT, MS1_TO_SYSTEM_TIME(1000));
|
||||||
logDebug("motor high close");
|
logDebug("Over pressure state !");
|
||||||
}
|
}
|
||||||
//欠压检测
|
//欠压检测
|
||||||
if(P[0] - P[2] <= 80) //800
|
if((P[0] - P[2] > 100) && (P[0] - P[2] <= 800))
|
||||||
{
|
{
|
||||||
// VALVE_CLOSE();
|
VALVE_CLOSE();
|
||||||
fault_state = 2;
|
fault_state = 2;
|
||||||
tmos_start_task(check_task_id, MOTOR_STOP_EVT, MS1_TO_SYSTEM_TIME(1500)); //1000
|
tmos_start_task(check_task_id, MOTOR_STOP_EVT, MS1_TO_SYSTEM_TIME(1000));
|
||||||
logDebug("motor low close");
|
logDebug("Under voltage status !");
|
||||||
}
|
}
|
||||||
//过流检测
|
//过流检测
|
||||||
if( P[0] - P[1] >= 7) //700
|
if( P[0] - P[1] >= 700)
|
||||||
{
|
{
|
||||||
VALVE_CLOSE();
|
VALVE_CLOSE();
|
||||||
fault_state = 3;
|
fault_state = 3;
|
||||||
tmos_start_task(check_task_id, MOTOR_STOP_EVT, MS1_TO_SYSTEM_TIME(1500)); //1000
|
tmos_start_task(check_task_id, MOTOR_STOP_EVT, MS1_TO_SYSTEM_TIME(1000));
|
||||||
logDebug("motor ver close");
|
logDebug("Over current status !");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// logDebug("motor_flag_end = %d",motor_flag);
|
// logDebug("motor_flag_end = %d",motor_flag);
|
||||||
|
|
|
@ -19,7 +19,7 @@ void BSP_MOTOR_Init(void)
|
||||||
GPIOB_ResetBits(COIL_B);
|
GPIOB_ResetBits(COIL_B);
|
||||||
GPIOB_ModeCfg(COIL_B, GPIO_ModeOut_PP_5mA);
|
GPIOB_ModeCfg(COIL_B, GPIO_ModeOut_PP_5mA);
|
||||||
|
|
||||||
//VALVE_CLOSE();
|
VALVE_CLOSE();
|
||||||
}
|
}
|
||||||
void VALVE_OPEN(void)
|
void VALVE_OPEN(void)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue