Commit a37c4509 authored by 何锐's avatar 何锐

feat:更新需求

parent b87e4d9e
......@@ -573,7 +573,7 @@ void RotationSet(void)
if(MENU_CHECK_STEP == 2)
{
RotationAlarmMode = 1;
if(RotationSettime <= 10)
if(RotationSettime <= 30)
{
RotationSettime++;
ABC_OUT = 1;
......
......@@ -4572,6 +4572,7 @@ uint8_t ZTSVOK_B;
uint8_t ONEKEYLongTime;
uint8_t onekeydelay;
uint8_t Barrellock;
uint8_t ONEKEYSetNumber;
void ONE_KEY_Display(void)
{
uint16_t ZTSV_A = 0;
......@@ -4634,19 +4635,28 @@ void ONE_KEY_Display(void)
if(MENU_CHECK_STEP == 4) //一键启动重复上下电
{
if(ONEKEYFlag == 0)
if(ONEKEYSetNumber <= 2)
{
if(onekeydelay <= 10)
if(ONEKEYFlag == 0)
{
onekeydelay++;
}
else
{
onekeydelay = 0;
ONEKEYFlag = 1;
if(onekeydelay <= 10)
{
onekeydelay++;
}
else
{
onekeydelay = 0;
ONEKEYFlag = 1;
ONEKEYSetNumber++;
}
}
}
}
else
{
onekeydelay = 0;
ONEKEYSetNumber = 0;
}
ZTSV_A = ADC_Read_Signal(ADC_CH_ZTSA_VOLTAGE);
ZTSV_B = ADC_Read_Signal(ADC_CH_ZTSB_VOLTAGE);
......
......@@ -13,17 +13,17 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
RotationAlarmFlag = 0;
if(ABC_OUT == 1)
{
RotationAlarmMode = 0;
ABC_OUT = 0;
}
else
{
RotationAlarmMode = 1;
ABC_OUT = 1;
}
// RotationAlarmFlag = 0;
// if(ABC_OUT == 1)
// {
// RotationAlarmMode = 0;
// ABC_OUT = 0;
// }
// else
// {
// RotationAlarmMode = 1;
// ABC_OUT = 1;
// }
}
}
......@@ -52,20 +52,20 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent) //上下ACC电
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(RELAY_KEY_MCU == 1)
{
RELAY_KEY_MCU = 0;
}
else
{
RELAY_KEY_MCU = 1;
}
// if(RELAY_KEY_MCU == 1)
// {
// RELAY_KEY_MCU = 0;
// }
// else
// {
// RELAY_KEY_MCU = 1;
// }
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
Key_Mode = 3;
// Key_Mode = 3;
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
......@@ -79,14 +79,14 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) //长按一键启动
{
ONEKEYFlag = 1;
// ONEKEYFlag = 1;
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) //长按2秒
{
Display_TFT_Clear();
ONEKEYFlag = 2; //双击一键启动
ZTSVOK_A = 0;
ZTSVOK_B = 0;
// Display_TFT_Clear();
// ONEKEYFlag = 2; //双击一键启动
// ZTSVOK_A = 0;
// ZTSVOK_B = 0;
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS ) //长按5秒
{
......@@ -113,7 +113,8 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
Key_Mode = 1; //左键
// Key_Mode = 1; //左键
backflag = 1;
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment