Skip to content

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

✨ feat:上电全亮程序

parent 96c4c0e8
Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 92 deletions
YueJin_test_bench/source/Appliciation/Barcode_Scanner.c
View file @ ecee3ad9
......@@ -370,7 +370,7 @@ void BarCodeDataGet(void)
{
memcpy(barcode_Msg,&mDataBufPtr1[6],34);
memcpy(barcode_Msg1,&mDataBufPtr1[6],34);
copyover = 1;
// copyover = 1;
}
else
{
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ ecee3ad9
......@@ -11,30 +11,30 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(firstpowerflag == 2)
{
if(saomafinish == 3)
{
zhenduansendStep = 0;
zhenduanflag = 0;
MENU_CHECK_STEP_ADD();
}
}
// if(firstpowerflag == 2)
// {
// if(saomafinish == 3)
// {
// zhenduansendStep = 0;
// zhenduanflag = 0;
// MENU_CHECK_STEP_ADD();
// }
// }
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
if(firstpowerflag == 2)
{
if(AutoFlag == 1)
{
AutoFlag = 0;
}
else
{
AutoFlag = 1;
}
}
// if(firstpowerflag == 2)
// {
// if(AutoFlag == 1)
// {
// AutoFlag = 0;
// }
// else
// {
// AutoFlag = 1;
// }
// }
}
else
{
......@@ -44,10 +44,10 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent) //上一步
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(firstpowerflag == 2)
{
MENU_CHECK_STEP_SUB();
}
// if(firstpowerflag == 2)
// {
// MENU_CHECK_STEP_SUB();
// }
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
......@@ -55,15 +55,15 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent) //上一步
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
if ( (LED_Waring == 1) || (UDS_Warning_Voltage == 1))
{
;
}
else
{
Display_Sub( );
Display_TFT_Clear( );
}
// if ( (LED_Waring == 1) || (UDS_Warning_Voltage == 1))
// {
// ;
// }
// else
// {
// Display_Sub( );
// Display_TFT_Clear( );
// }
}
......@@ -76,13 +76,13 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
// upkeyflag = 1; //按键加
if(firstpowerflag == 2)
{
if(saomafinish == 1)
{
zhenduansendStep = 5;
}
}
// if(firstpowerflag == 2)
// {
// if(saomafinish == 1)
// {
// zhenduansendStep = 5;
// }
// }
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
......@@ -98,17 +98,17 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(saomafinish == 3)
{
Display_TFT_Clear();
GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
firstpowerflag = 0;
saomafinish = 0;
}
else if(saomafinish == 0)
{
zhenduanflag = 1;
}
// if(saomafinish == 3)
// {
// Display_TFT_Clear();
// GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
// firstpowerflag = 0;
// saomafinish = 0;
// }
// else if(saomafinish == 0)
// {
// zhenduanflag = 1;
// }
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
......@@ -124,16 +124,16 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(LINE_OUT_NEG_01 == 1U) //上下ACC电
{
LINE_OUT_NEG_01 = 0U;
Auto_ONOFF = 3;
}
else
{
LINE_OUT_NEG_01 = 1U;
Auto_ONOFF = 0;
}
// if(LINE_OUT_NEG_01 == 1U) //上下ACC电
// {
// LINE_OUT_NEG_01 = 0U;
// Auto_ONOFF = 3;
// }
// else
// {
// LINE_OUT_NEG_01 = 1U;
// Auto_ONOFF = 0;
// }
// downkeyflag = 1; //数字减
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
......@@ -166,27 +166,27 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
// Confirmkeycount == 0;
// mimayanzhengjieguo = 0;
// }
if(firstpowerflag == 2)
{
if(clearOdoFlag == 0)
{
clearOdoFlag = 1;
}
else
{
queren = 1;
}
}
// if(firstpowerflag == 2)
// {
// if(clearOdoFlag == 0)
// {
// clearOdoFlag = 1;
// }
// else
// {
// queren = 1;
// }
// }
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
if(Get_Display_Type( ) == 2)
{
MENU_CHECK_STEP_SUB( );
}
// if(Get_Display_Type( ) == 2)
// {
// MENU_CHECK_STEP_SUB( );
// }
}
else
{
......@@ -197,17 +197,17 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent) //自动下电模式
/*清零ODO*/
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(firstpowerflag == 2)
{
if(Auto_ONOFF != 0)
{
Auto_ONOFF = 0;
}
else
{
Auto_ONOFF = 1;
}
}
// if(firstpowerflag == 2)
// {
// if(Auto_ONOFF != 0)
// {
// Auto_ONOFF = 0;
// }
// else
// {
// Auto_ONOFF = 1;
// }
// }
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
......@@ -215,10 +215,10 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent) //自动下电模式
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
if(Get_Display_Type( ) == 2)
{
MENU_CHECK_STEP_ADD( );
}
// if(Get_Display_Type( ) == 2)
// {
// MENU_CHECK_STEP_ADD( );
// }
}
else
{
......
YueJin_test_bench/source/System/init.c
View file @ ecee3ad9
......@@ -124,6 +124,8 @@ void Sys_Startup_Init(void)
/*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2，打开上面两行的注释即可*/
firstpowerflag = 2;
saomafinish = 3;
MENU_CHECK_STEP = 10;
}
/***********************************************************************
......
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