diff --git a/APP/user/MotorCtrl.c b/APP/user/MotorCtrl.c index 29e864d..69bb9b2 100644 --- a/APP/user/MotorCtrl.c +++ b/APP/user/MotorCtrl.c @@ -7,7 +7,7 @@ static uint8_t amCtrl_state = 0,am_state_machine = 0; static uint16_t am_state_machine_counter = 0; - +static uint8_t amCtrl_YTstate; static void amCtrl_Act1(void); static void amCtrl_Act2(void); static void amCtrl_Act3(void); @@ -24,6 +24,7 @@ void amCtrl_SetState(uint8_t state) amCtrl_state = state; am_state_machine = 0; am_state_machine_counter = 0; + amCtrl_YTstate = 0; } void amCtrl_SetYTState(QD_STATE_type qd1,QD_STATE_type qd2) @@ -74,6 +75,11 @@ void amCtrl_SetYTState(QD_STATE_type qd1,QD_STATE_type qd2) if (qd1 == QD_NONE_ACT && qd2 == QD_NONE_ACT) { setPumpState(PUMP_OFF); + amCtrl_YTstate = 0; + } + else + { + amCtrl_YTstate = 1; } } @@ -82,7 +88,10 @@ void amCtrl_Task(void)//50ms { if (amCtrl_state == 0) { - setPumpState(PUMP_OFF); + if (amCtrl_YTstate == 0) + { + setPumpState(PUMP_OFF); + } setValveState(VALVE3,VALVE_OFF); setValveState(VALVE4,VALVE_OFF); setValveState(VALVE5,VALVE_OFF); diff --git a/APP/user/appTask.c b/APP/user/appTask.c index 2ac6908..173d469 100644 --- a/APP/user/appTask.c +++ b/APP/user/appTask.c @@ -310,6 +310,23 @@ void KeyPro(void) { amCtrl_SetYTState(QD_CQ,QD_FQ); } + if (getKeyReleaseFlag(KEYID_K14) == KEY_PRESSED) + { + amCtrl_SetYTState(QD_NONE_ACT,QD_NONE_ACT); + } + if (getKeyReleaseFlag(KEYID_K9) == KEY_PRESSED) + { + amCtrl_SetYTState(QD_NONE_ACT,QD_NONE_ACT); + } + if (getKeyReleaseFlag(KEYID_K10) == KEY_PRESSED) + { + amCtrl_SetYTState(QD_NONE_ACT,QD_NONE_ACT); + } + if (getKeyReleaseFlag(KEYID_K11) == KEY_PRESSED) + { + amCtrl_SetYTState(QD_NONE_ACT,QD_NONE_ACT); + } + #endif }