Commit 0c8aa074 authored by 何锐's avatar 何锐

feat:修改对应按键

parent 61cea658
...@@ -199,6 +199,19 @@ void Key_Operation_SW6(Key_Event_en_t enKeyEvent) ...@@ -199,6 +199,19 @@ void Key_Operation_SW6(Key_Event_en_t enKeyEvent)
UIDMondel = 0; UIDMondel = 0;
Display_TFT_Clear(); Display_TFT_Clear();
if(Check_Control_Mode == 1)
{
Check_Control_Mode = 2;
}
else if (Check_Control_Mode == 2)
{
Check_Control_Mode = 1;
}
else
{
Check_Control_Mode = 2;
}
//General_Number_Disp(Flag_SW6_Dis, 200, 20); //General_Number_Disp(Flag_SW6_Dis, 200, 20);
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
...@@ -277,18 +290,6 @@ void Key_Operation_SW9(Key_Event_en_t enKeyEvent) ...@@ -277,18 +290,6 @@ void Key_Operation_SW9(Key_Event_en_t enKeyEvent)
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
UIDMondel = 0; UIDMondel = 0;
if(Check_Control_Mode == 1)
{
Check_Control_Mode = 2;
}
else if (Check_Control_Mode == 2)
{
Check_Control_Mode = 1;
}
else
{
Check_Control_Mode = 2;
}
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
...@@ -468,6 +469,11 @@ void User_CheckMode_Service(uint8_t CbkCycle) ...@@ -468,6 +469,11 @@ void User_CheckMode_Service(uint8_t CbkCycle)
{ {
Check_Control_Time = 0; Check_Control_Time = 0;
Check_Steps++; Check_Steps++;
if(Check_Control_Mode == 1)
{
Display_flag(Check_Steps);
}
} }
if(Check_Steps > Check_Couont) if(Check_Steps > Check_Couont)
{ {
......
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