Commit 075f11e1 authored by 何锐's avatar 何锐

feat:仪表上电进入版本号界面

parent e5357fe4
......@@ -824,12 +824,16 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_03 = 1;
}
RightturnSignal = 0;
LeftturnSignal = 0;
Bluetoothlight = 0;
Positionlight = 0;
highbeam = 0;
Lowbeam = 0;
if(Version_number_begin == 1)
{
RightturnSignal = 0;
LeftturnSignal = 0;
Bluetoothlight = 0;
Positionlight = 0;
highbeam = 0;
Lowbeam = 0;
}
break;
}
......
......@@ -4923,7 +4923,7 @@ void Display_Version_Info(uint32_t ON_OFF)
// TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [7] = {2,5,1,2,1,9,0xff};
uint8_t mbuff [7] = {2,5,1,2,2,0,0xff};
General_Number_Disp(mbuff, 160, 290);
}
......
......@@ -76,6 +76,7 @@ extern Key_Real_Status_en_t enKeyRightRealStatus;
/*------------------------------------------------------------------------------------*/
extern uint8_t KeyStep;
extern uint8_t Version_number_begin;
extern void Key_Init(void);
extern void Key_Service(void); /*10ms*/
......@@ -84,6 +85,7 @@ extern void upkeyserve(void);
extern void downkeyserve(void);
extern void PasswordUnlock(void);
extern void OpenOTASercice(void);
extern void EnterVersionNumber(void);
extern Key_Set_en_t Key_Parameter_Set_Short_Press_Time(uint16_t u16Time);
extern Key_Set_en_t Key_Parameter_Set_Long_Press_Time(uint16_t u16Time);
extern Key_Set_en_t Key_Parameter_Set_Super_Long_Press_Time(uint32_t u32Time);
......
......@@ -393,6 +393,49 @@ void OpenOTASercice(void)
}
}
uint8_t Version_number_key_time;
uint8_t Version_number_begin;
uint16_t enterdelaytime;
void EnterVersionNumber(void)
{
LeftturnSignal = 1;
RightturnSignal = 1;
Lowbeam = 1;
if(enterdelaytime <= 600) //等待开机动画
{
enterdelaytime++;
}
else
{
if(Version_number_key_time <= 200)
{
Version_number_key_time++;
}
else
{
Press_to_down = 0;
Version_number_begin = 1;
}
if(Version_number_key_time <= 60)
{
Press_to_down = ((Version_number_key_time / 10) % 2) == 0 ? 1 : 0;
}
else if(Version_number_key_time < 80)
{
queren = ((Version_number_key_time / 10) % 2) == 0 ? 1 : 0;
}
else if(Version_number_key_time <= 100)
{
Press_to_up = ((Version_number_key_time / 10) % 2) == 0 ? 1 : 0;
}
else if(Version_number_key_time <= 200)
{
Press_to_down = 1;
}
}
}
/*-------------------------------------------------*/
Key_Real_Status_en_t Key_Real_sw5(void)
{
......
......@@ -77,7 +77,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{
Key_Service();
OpenOTASercice();
if((clearOdoFlag == 0) && (OTAMode != 1) && (OTAMode != 2))
if((clearOdoFlag == 0) && (OTAMode != 1) && (OTAMode != 2) && (Version_number_begin != 0))
{
confirmkeyserve();
upkeyserve();
......@@ -86,6 +86,10 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
backsend();
TX_RX_485_service();
if(Version_number_begin == 0)
{
EnterVersionNumber();
}
}
/*==============================================================================
20ms����ִ������ ��0��
......@@ -133,7 +137,6 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
TimeDelay_3s();
PasswordUnlock();
BTEnableDelayPowerReset();
static uint32_t loc_timer = 0;
loc_timer++;
if ( loc_timer >= 3 )
......
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