Commit dcb0a276 authored by 何锐's avatar 何锐

feat:扫码失败下电

parent d00fb14f
......@@ -336,6 +336,10 @@ uint8_t yibiaoshuju[34];
else
{
General_Number_Disp(writefail, 3, 250);
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0;
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0;
}
}
break;
......@@ -816,13 +820,13 @@ void Function_Check_Ctrl(uint32_t cmd)
{
case 0:
{
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
// if(Auto_ONOFF == 0)
// {
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_04 = 1;
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1;
// }
if(Version_number_begin == 1)
{
......
......@@ -4828,9 +4828,9 @@ void Display_Version_Info(uint32_t ON_OFF)
}
else if((wuliao[12] == 0x33) || (wuliao[12] == 0x34)) //5寸
{
nowpuran = 41;
now7926 = 41;
now7106 = 41;
nowpuran = 37;
now7926 = 40;
now7106 = 37;
up_key_press_number = 2;
}
......@@ -4925,7 +4925,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,6,0,1,0,5,0xff};
uint8_t mbuff [7] = {2,6,0,1,0,6,0xff};
General_Number_Disp(mbuff, 160, 290);
}
......
......@@ -582,6 +582,8 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent)
{
/*清零ODO*/
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if((saomafinish == 3) || (saomafinish == 4))
{
if(BlueTooth == 0)
{
......@@ -594,6 +596,7 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent)
BlueTooth = 0;
}
}
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
}
......
......@@ -126,12 +126,12 @@ void Sys_Startup_Init(void)
EN_5V_CUT_ENABLE = 1;
Display_TFT_Clear();
GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
// Display_TFT_Clear();
// GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
/*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2,saomafinish = 3;打开上面两行的注释即可*/
// firstpowerflag = 2;
// saomafinish = 4;
firstpowerflag = 2;
saomafinish = 4;
}
/***********************************************************************
......
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