Commit 69310be1 authored by 李梓源's avatar 李梓源

第二步开始每步20s等待

parent 9cc199a3
...@@ -595,7 +595,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -595,7 +595,7 @@ void Function_Check_Ctrl(uint32_t cmd)
RELAY_VBAT_MCU = 1; RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1; RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1; RELAY_KEY_MCU = 1;
Aima_SLF(1u, 0x03, 0x1, 1u); // Aima_SLF(1u, 0x04, 0x1, 1u);
break; break;
......
...@@ -4491,6 +4491,14 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4491,6 +4491,14 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_Alarm_08_Word0X51_Y261); TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_Alarm_08_Word0X51_Y261);
} }
else else
{
// Display_TFT_Clear();
}
if(ZYS_B == 1)
{
TFT_LCD_Draw_Bmp(51,200,( uint8_t * )gImage_gImage_ABSX6_Y165);
}
else
{ {
// Display_TFT_Clear(); // Display_TFT_Clear();
} }
......
...@@ -9,9 +9,12 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) ...@@ -9,9 +9,12 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS && CHECK_Ctrl_delay >= 200)
{
MENU_CHECK_STEP_ADD( ); MENU_CHECK_STEP_ADD( );
CHECK_Ctrl_delay = 0;
Check_Flag = 1;
}
} }
} }
void Key_Operation_SW4(Key_Event_en_t enKeyEvent) void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
......
...@@ -324,6 +324,8 @@ uint8_t flashtime = 0; ...@@ -324,6 +324,8 @@ uint8_t flashtime = 0;
uint8_t showtime = 0; uint8_t showtime = 0;
uint8_t ACCONOFF_delay_3s; uint8_t ACCONOFF_delay_3s;
uint16_t ONE_KEY_ONOFF; uint16_t ONE_KEY_ONOFF;
uint16_t CHECK_Ctrl_delay = 200;
uint8_t Check_Flag;
void Sys_Run_Mode_100ms_Tasks_Group(void) void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
// static uint32_t loc_timer = 0; // static uint32_t loc_timer = 0;
...@@ -335,6 +337,20 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -335,6 +337,20 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
// Recv_Byte1(); // Recv_Byte1();
// } // }
Display_PageNum(); Display_PageNum();
if(Check_Flag == 1)
{
if(CHECK_Ctrl_delay < 200)
{
CHECK_Ctrl_delay++;
}
else
{
Check_Flag = 0;
}
}
if(MENU_CHECK_STEP == 9 ) if(MENU_CHECK_STEP == 9 )
{ {
if(ACCONOFF_delay_3s < 200) if(ACCONOFF_delay_3s < 200)
......
...@@ -11,6 +11,8 @@ extern uint8_t startONfalg; ...@@ -11,6 +11,8 @@ extern uint8_t startONfalg;
extern uint32_t startIGONtime; extern uint32_t startIGONtime;
extern uint8_t ACCONOFF_delay_3s; extern uint8_t ACCONOFF_delay_3s;
extern uint16_t ONE_KEY_ONOFF; extern uint16_t ONE_KEY_ONOFF;
extern uint16_t CHECK_Ctrl_delay;
extern uint8_t Check_Flag;
void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void); void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void);
void Sys_Run_Mode_2ms_Tasks_Group(void); void Sys_Run_Mode_2ms_Tasks_Group(void);
void Sys_Run_Mode_5ms_Tasks_Group(void); void Sys_Run_Mode_5ms_Tasks_Group(void);
......
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