Skip to content

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

✨ feat:修改按键位置

parent 88692e08
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 114 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 00f9196a
...@@ -283,7 +283,7 @@ uint8_t yibiaoshuju[34]; ...@@ -283,7 +283,7 @@ uint8_t yibiaoshuju[34];
{ {
TFT_LCD_Draw_Bmp(200, 90+40-5, ( uint8_t * )gImage_cuo12 ); TFT_LCD_Draw_Bmp(200, 90+40-5, ( uint8_t * )gImage_cuo12 );
} }
uint8_t writesuccess[8] = {0x53,0x55,0x43,0x43,0x46,0x53,0x53,0xff}; uint8_t writesuccess[8] = {0x53,0x55,0x43,0x43,0x45,0x53,0x53,0xff};
General_Number_Disp(writesuccess, 3, 125); General_Number_Disp(writesuccess, 3, 125);
} }
else if(saomafinish == 2) else if(saomafinish == 2)
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 00f9196a
...@@ -3814,7 +3814,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -3814,7 +3814,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(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(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号 TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [7] = {2,5,0,8,2,8,0xff}; uint8_t mbuff [7] = {2,5,0,9,0,1,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 00f9196a
...@@ -44,12 +44,10 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent) //上一步 ...@@ -44,12 +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();
// } }
zhenduanflag = 1;
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -77,19 +75,14 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent) ...@@ -77,19 +75,14 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
// upkeyflag = 1; //按键加
// if(firstpowerflag == 2) if(firstpowerflag == 2)
// { {
// if(zhenduanflag != 2 && zhenduanflag != 3) if(zhenduanflag == 1)
// { {
// zhenduanflag = 2; zhenduansendStep = 5;
// } }
// else }
// {
// zhenduanflag = 0;
// }
// }
upkeyflag = 1; //按键加
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -105,35 +98,7 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent) ...@@ -105,35 +98,7 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
// if(firstpowerflag == 2) zhenduanflag = 1;
// {
// if(zhenduanflag != 1)
// {
// zhenduanflag = 1;
// }
// else
// {
// zhenduanflag = 0;
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1;
// LINE_OUT_NEG_04 = 1;
// zhenduansendStep = 0;
// // memset(barcode_Msg,0,sizeof(barcode_Msg));
// }
// RS485_TX_finish = 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;
}
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -149,21 +114,17 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent) ...@@ -149,21 +114,17 @@ 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_01 == 1U) //上下ACC电
// if(firstpowerflag == 2) {
// { LINE_OUT_NEG_01 = 0U;
// if(LINE_OUT_NEG_01 == 1U) Auto_ONOFF = 3;
// { }
// LINE_OUT_NEG_01 = 0U; else
// Auto_ONOFF = 3; {
// } LINE_OUT_NEG_01 = 1U;
// else Auto_ONOFF = 0;
// { }
// LINE_OUT_NEG_01 = 1U; // downkeyflag = 1; //数字减
// Auto_ONOFF == 0;
// }
// }
downkeyflag = 1; //按键减
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -179,39 +140,32 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent) ...@@ -179,39 +140,32 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
// if(Get_Display_Type( ) == 2) // if(MENU_CHECK_STEP == 14)
// { // {
// MENU_CHECK_STEP_SUB( ); // Confirmkeyflag = 1; //确认
// } // Confirmkeycount++;
// if(firstpowerflag == 2) // if(Confirmkeycount >= 5)
// {
// if(clearOdoFlag == 0)
// { // {
// clearOdoFlag = 1; // mimayanzhengjieguo = 1;
// Confirmkeycount = 0;
// MENU_CHECK_STEP_ADD();
// } // }
// RS485_TX_finish = 0;
// // else
// // {
// // clearOdoFlag = 0;
// // }
// // queren = 0;
// } // }
if(MENU_CHECK_STEP == 14) // else
// {
// Confirmkeycount == 0;
// mimayanzhengjieguo = 0;
// }
if(firstpowerflag == 2)
{ {
Confirmkeyflag = 1; //确认 if(clearOdoFlag == 0)
Confirmkeycount++;
if(Confirmkeycount >= 5)
{ {
mimayanzhengjieguo = 1; clearOdoFlag = 1;
Confirmkeycount = 0; }
MENU_CHECK_STEP_ADD(); else
{
queren = 1;
} }
}
else
{
Confirmkeycount == 0;
mimayanzhengjieguo = 0;
} }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
...@@ -265,14 +219,7 @@ void Key_Operation_SW6(Key_Event_en_t enKeyEvent) ...@@ -265,14 +219,7 @@ void Key_Operation_SW6(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(BlueTooth == 0)
{
BlueTooth = 1;
}
else
{
BlueTooth = 0;
}
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -404,14 +351,13 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent) ...@@ -404,14 +351,13 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent)
/*清零ODO*/ /*清零ODO*/
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(BlueTooth == 0)
if(firstpowerflag == 2)
{ {
// clearOdoFlag = 1; BlueTooth = 1;
if(zhenduanflag == 1) }
{ else
zhenduansendStep = 5; {
} BlueTooth = 0;
} }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 00f9196a
...@@ -342,14 +342,14 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -342,14 +342,14 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
if(clearOdoFlag == 1) if(clearOdoFlag == 1)
{ {
if(querendelay <= 140) // if(querendelay <= 140)
{ // {
querendelay++; // querendelay++;
} // }
else // else
{ // {
queren = 1; // queren = 1;
} // }
} }
// Freln_Duty_HZ_Service(); // Freln_Duty_HZ_Service();
......
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