huahua/M20
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加释放按键

Browse Source
This commit is contained in:
sunbeam 2024-05-26 21:09:14 +08:00
parent 85e8ddff84
commit 19c53ca7de
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
APP/user/MotorCtrl.c
View File

@ -7,7 +7,7 @@
static uint8_t amCtrl_state = 0,am_state_machine = 0; static uint8_t amCtrl_state = 0,am_state_machine = 0;
static uint16_t am_state_machine_counter = 0; static uint16_t am_state_machine_counter = 0;
static uint8_t amCtrl_YTstate;
static void amCtrl_Act1(void); static void amCtrl_Act1(void);
static void amCtrl_Act2(void); static void amCtrl_Act2(void);
static void amCtrl_Act3(void); static void amCtrl_Act3(void);
@ -24,6 +24,7 @@ void amCtrl_SetState(uint8_t state)
amCtrl_state = state; amCtrl_state = state;
am_state_machine = 0; am_state_machine = 0;
am_state_machine_counter = 0; am_state_machine_counter = 0;
amCtrl_YTstate = 0;
} }
void amCtrl_SetYTState(QD_STATE_type qd1,QD_STATE_type qd2) 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) if (qd1 == QD_NONE_ACT && qd2 == QD_NONE_ACT)
{ {
setPumpState(PUMP_OFF); setPumpState(PUMP_OFF);
amCtrl_YTstate = 0;
}
else
{
amCtrl_YTstate = 1;
} }
} }
@ -81,8 +87,11 @@ void amCtrl_SetYTState(QD_STATE_type qd1,QD_STATE_type qd2)
void amCtrl_Task(void)//50ms void amCtrl_Task(void)//50ms
{ {
if (amCtrl_state == 0) if (amCtrl_state == 0)
{
if (amCtrl_YTstate == 0)
{ {
setPumpState(PUMP_OFF); setPumpState(PUMP_OFF);
}
setValveState(VALVE3,VALVE_OFF); setValveState(VALVE3,VALVE_OFF);
setValveState(VALVE4,VALVE_OFF); setValveState(VALVE4,VALVE_OFF);
setValveState(VALVE5,VALVE_OFF); setValveState(VALVE5,VALVE_OFF);

17
APP/user/appTask.c
View File

@ -310,6 +310,23 @@ void KeyPro(void)
{ {
amCtrl_SetYTState(QD_CQ,QD_FQ); 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 #endif
} }