Commit 8d8df035 authored by 何锐's avatar 何锐

feat:完成UUID上电读取

parent 98b525f4
...@@ -35,7 +35,7 @@ uint8_t timenum = 0; ...@@ -35,7 +35,7 @@ uint8_t timenum = 0;
uint8_t firstflag = 0; uint8_t firstflag = 0;
uint8_t RS485_data[64]; uint8_t RS485_data[64];
uint8_t checknumwrong = 3; uint8_t checknumwrong = 3;
uint8_t zhenduanflag = 0; uint8_t zhenduanflag = 1;
uint8_t clearOdoFlag = 0; uint8_t clearOdoFlag = 0;
uint8_t connectbleFlag = 0; uint8_t connectbleFlag = 0;
uint8_t Auto_ONOFF = 0; uint8_t Auto_ONOFF = 0;
......
...@@ -185,6 +185,18 @@ void CHECK_IPK_COUNT(void) ...@@ -185,6 +185,18 @@ void CHECK_IPK_COUNT(void)
// 0x11223344 不在线 // 0x11223344 不在线
// 0x55667788 在线 // 0x55667788 在线
uint8_t Datajudgment(void)
{
for(int i = 0; i<34; i++)
{
if(erweima[i] != uidread[i])
{
return 0;
}
}
return 1;
}
uint32_t Get_IPK_Status(void) uint32_t Get_IPK_Status(void)
{ {
return NO_IPK_EXIST_Status; return NO_IPK_EXIST_Status;
...@@ -211,6 +223,9 @@ extern uint8_t BCM_FLAG_2014 = 0; ...@@ -211,6 +223,9 @@ extern uint8_t BCM_FLAG_2014 = 0;
uint32_t loc_Type = 0; uint32_t loc_Type = 0;
uint8_t erweima[64] ; uint8_t erweima[64] ;
uint8_t UUIDbegin;
uint8_t uuidlock = 1;
uint16_t UUIDAccumulate;
void Total_Check(void) void Total_Check(void)
{ {
uint8_t cmperweima[34]; uint8_t cmperweima[34];
...@@ -252,7 +267,34 @@ uint8_t yibiaoshuju[34]; ...@@ -252,7 +267,34 @@ uint8_t yibiaoshuju[34];
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo12 ); TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_cuo12 );
} }
if(uuidlock == 1)
{
for(int i = 0; i < 32; i++)
{
UUIDAccumulate += uidread[i];
}
if(UUIDAccumulate != 0)
{
UUIDbegin = 1;
}
}
else
{
uidread[32] = 0xFF;
General_Number_Disp(uidread, 3, 180);
}
if(UUIDbegin == 1)
{
if(Datajudgment())
{
UUIDbegin = 0;
uuidlock = 0;
zhenduanflag = 0;
}
uidread[32] = 0xFF;
General_Number_Disp(uidread, 3, 180); General_Number_Disp(uidread, 3, 180);
}
break; break;
case 1: case 1:
......
...@@ -45,6 +45,7 @@ extern unsigned char KEYBUFFER [ 4 ]; ...@@ -45,6 +45,7 @@ extern unsigned char KEYBUFFER [ 4 ];
extern unsigned int CAN_Msg_Tx_Enable; extern unsigned int CAN_Msg_Tx_Enable;
extern uint8_t loc_Type_back; extern uint8_t loc_Type_back;
extern uint8_t LED_Waring ; extern uint8_t LED_Waring ;
extern uint8_t uuidlock;
extern uint8_t erweima[64]; extern uint8_t erweima[64];
void SET_IPK_NONE(void); void SET_IPK_NONE(void);
void Clear_IPK_NONE(void); void Clear_IPK_NONE(void);
......
...@@ -17,7 +17,7 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) ...@@ -17,7 +17,7 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
{ {
if(uuidmodel == 0) if(uuidmodel == 0)
{ {
if(firstpowerflag == 2) if((firstpowerflag == 2) && (uuidlock == 0))
{ {
MENU_CHECK_STEP_ADD( ); MENU_CHECK_STEP_ADD( );
} }
...@@ -178,10 +178,12 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent) ...@@ -178,10 +178,12 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(firstpowerflag == 2) if((firstpowerflag == 2) && (uuidlock == 0))
{ {
if(zhenduanflag != 1) if(zhenduanflag != 1)
{ {
memset(erweima, 0x00, 32);
memset(barcode_Msg, 0x00, 32);
zhenduanflag = 1; zhenduanflag = 1;
} }
else else
...@@ -291,7 +293,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent) ...@@ -291,7 +293,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
/*清零ODO*/ /*清零ODO*/
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(uuidmodel == 1) if((uuidmodel == 1) && (uuidlock == 0))
{ {
Display_TFT_Clear_UID4(); Display_TFT_Clear_UID4();
UUID_Write(); UUID_Write();
......
...@@ -124,8 +124,11 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -124,8 +124,11 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
if(writeflag == 1 || writeflag ==3) if(writeflag == 1 || writeflag ==3)
{ {
// R485_Send_0x47(); // R485_Send_0x47();
if(uuidlock == 0)
{
UUID_Write(); UUID_Write();
} }
}
else else
{ {
; ;
......
...@@ -118,11 +118,11 @@ void Sys_Startup_Init(void) ...@@ -118,11 +118,11 @@ void Sys_Startup_Init(void)
LINE_OUT_NEG_03 = 1; LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1; LINE_OUT_NEG_04 = 1;
// Display_TFT_Clear();
// GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
/*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2,打开上面两行的注释即可*/
firstpowerflag = 2; firstpowerflag = 2;
/*上电扫码校验功能屏蔽下面此条*/
uuidlock = 0;
zhenduanflag = 0;
} }
/*********************************************************************** /***********************************************************************
......
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