Skip to content

J
jiancetai
Commit a7611486 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:全亮程序

parent 27406b02
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 73 deletions
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ a7611486
...@@ -11,30 +11,30 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步 ...@@ -11,30 +11,30 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(firstpowerflag == 2) // if(firstpowerflag == 2)
{ // {
if(saomafinish == 3) // if(saomafinish == 3)
{ // {
MENU_CHECK_STEP_ADD( ); // MENU_CHECK_STEP_ADD( );
zhenduansendStep = 0; // zhenduansendStep = 0;
zhenduanflag = Data_Mode_Dot; // zhenduanflag = Data_Mode_Dot;
} // }
} // }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
if(firstpowerflag == 2) // if(firstpowerflag == 2)
{ // {
if(AutoFlag == 1) // if(AutoFlag == 1)
{ // {
AutoFlag = 0; // AutoFlag = 0;
} // }
else // else
{ // {
AutoFlag = 1; // AutoFlag = 1;
} // }
} // }
} }
else else
{ {
...@@ -44,10 +44,10 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent) //上一步 ...@@ -44,10 +44,10 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent) //上一步
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(firstpowerflag == 2) // if(firstpowerflag == 2)
{ // {
MENU_CHECK_STEP_SUB(); // MENU_CHECK_STEP_SUB();
} // }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -55,15 +55,15 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent) //上一步 ...@@ -55,15 +55,15 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent) //上一步
} }
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{ {
if ( (LED_Waring == 1) || (UDS_Warning_Voltage == 1)) // if ( (LED_Waring == 1) || (UDS_Warning_Voltage == 1))
{ // {
; // ;
} // }
else // else
{ // {
Display_Sub( ); // Display_Sub( );
Display_TFT_Clear( ); // Display_TFT_Clear( );
} // }
} }
...@@ -75,13 +75,13 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent) ...@@ -75,13 +75,13 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(firstpowerflag == 2) // if(firstpowerflag == 2)
{ // {
if(zhenduanflag == Data_Mode_Write) // if(zhenduanflag == Data_Mode_Write)
{ // {
zhenduansendStep = 5; // zhenduansendStep = 5;
} // }
} // }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -97,7 +97,7 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent) ...@@ -97,7 +97,7 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
zhenduanflag = Data_Mode_Write; // zhenduanflag = Data_Mode_Write;
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -113,7 +113,7 @@ void Key_Operation_SW9(Key_Event_en_t enKeyEvent) //下移位 ...@@ -113,7 +113,7 @@ void Key_Operation_SW9(Key_Event_en_t enKeyEvent) //下移位
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
downkeyflag = 1; // downkeyflag = 1;
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -129,21 +129,21 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent) ...@@ -129,21 +129,21 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(LINE_OUT_NEG_04 == 1U) //上下ACC电 // if(LINE_OUT_NEG_04 == 1U) //上下ACC电
{ // {
LINE_OUT_NEG_04 = 0U; // LINE_OUT_NEG_04 = 0U;
Auto_ONOFF = 3; // Auto_ONOFF = 3;
} // }
else // else
{ // {
LINE_OUT_NEG_04 = 1U; // LINE_OUT_NEG_04 = 1U;
Auto_ONOFF = 0; // Auto_ONOFF = 0;
} // }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
Auto_ONOFF = 1; //自动断电 // Auto_ONOFF = 1; //自动断电
LINE_OUT_NEG_04 = 0U; // LINE_OUT_NEG_04 = 0U;
} }
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{ {
...@@ -156,27 +156,27 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent) ...@@ -156,27 +156,27 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(firstpowerflag == 2) // if(firstpowerflag == 2)
{ // {
if(clearOdoFlag == 0) // if(clearOdoFlag == 0)
{ // {
clearOdoFlag = 1; // clearOdoFlag = 1;
} // }
else // else
{ // {
queren = 1; // queren = 1;
} // }
} // }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
} }
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{ {
if(Get_Display_Type( ) == 2) // if(Get_Display_Type( ) == 2)
{ // {
MENU_CHECK_STEP_SUB( ); // MENU_CHECK_STEP_SUB( );
} // }
} }
else else
{ {
...@@ -186,7 +186,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent) //上移位 ...@@ -186,7 +186,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent) //上移位
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
upkeyflag = 1; // upkeyflag = 1;
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -206,7 +206,7 @@ void Key_Operation_SW6(Key_Event_en_t enKeyEvent) ...@@ -206,7 +206,7 @@ void Key_Operation_SW6(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
Confirmkeyflag = 1; // Confirmkeyflag = 1;
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
......
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.c
View file @ a7611486
...@@ -385,8 +385,8 @@ uint32_t R485_Send_0xD2(void) ...@@ -385,8 +385,8 @@ uint32_t R485_Send_0xD2(void)
break; break;
case 13: case 13:
R485_IDD2h.Sig.ICMCalculatesVehicleSpeed_L = 0xDE; R485_IDD2h.Sig.ICMCalculatesVehicleSpeed_L = 0x00;
R485_IDD2h.Sig.ICMCalculatesVehicleSpeed_H = 0x02; //车速99 R485_IDD2h.Sig.ICMCalculatesVehicleSpeed_H = 0x00; //车速99
R485_IDD2h.Sig.CruiseModeFeedback = 0x01; //巡航灯 R485_IDD2h.Sig.CruiseModeFeedback = 0x01; //巡航灯
......
YueJin_test_bench/source/System/init.c
View file @ a7611486
...@@ -131,6 +131,8 @@ void Sys_Startup_Init(void) ...@@ -131,6 +131,8 @@ void Sys_Startup_Init(void)
/*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2，saomafinish = 3;打开上面两行的注释即可*/ /*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2，saomafinish = 3;打开上面两行的注释即可*/
firstpowerflag = 2; firstpowerflag = 2;
saomafinish = 3; saomafinish = 3;
MENU_CHECK_STEP = 13;
} }
/*********************************************************************** /***********************************************************************
......
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