Commit 4d749bfa authored by 何锐's avatar 何锐

feat:上电扫码版程序

parent 00f9196a
...@@ -302,7 +302,7 @@ uint8_t yibiaoshuju[34]; ...@@ -302,7 +302,7 @@ uint8_t yibiaoshuju[34];
} }
uint8_t writesuccess[8] = {0x53,0x55,0x43,0x43,0x45,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);
mimaread[34] = 0xFF; mimaread[34] = 0xFF;
General_Number_Disp(mimaread, 3, 200); General_Number_Disp(mimaread, 3, 200);
......
...@@ -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,9,0,1,0xff}; uint8_t mbuff [7] = {2,5,0,9,0,8,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
...@@ -15,9 +15,14 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步 ...@@ -15,9 +15,14 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步
{ {
if(saomafinish == 3) if(saomafinish == 3)
{ {
MENU_CHECK_STEP_ADD( );
zhenduansendStep = 0; zhenduansendStep = 0;
zhenduanflag = 0; zhenduanflag = 0;
MENU_CHECK_STEP = 0;
saomafinish = 4;
}
else if(saomafinish == 4)
{
MENU_CHECK_STEP_ADD();
} }
} }
} }
...@@ -78,10 +83,14 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent) ...@@ -78,10 +83,14 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
// upkeyflag = 1; //按键加 // upkeyflag = 1; //按键加
if(firstpowerflag == 2) if(firstpowerflag == 2)
{ {
if(zhenduanflag == 1) // if(zhenduanflag == 1)
// {
if(saomafinish == 0)
{ {
zhenduansendStep = 5; zhenduansendStep = 5;
zhenduanflag = 1;
} }
// }
} }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
...@@ -98,7 +107,7 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent) ...@@ -98,7 +107,7 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
zhenduanflag = 1; // zhenduanflag = 1;
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
......
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