Skip to content

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

✨ feat:修改UID格式

parent 4ac1c58c
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 43 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 34473e0e
...@@ -468,18 +468,18 @@ extern uint8_t Data_786_4[8]= {0x30,0x00,0x00,0xAA,0xAA,0xAA,0xAA,0xAA}; ...@@ -468,18 +468,18 @@ extern uint8_t Data_786_4[8]= {0x30,0x00,0x00,0xAA,0xAA,0xAA,0xAA,0xAA};
extern uint8_t Data_786_5[8]= {0x02,0x10,0x02,0xAA,0xAA,0xAA,0xAA,0xAA}; extern uint8_t Data_786_5[8]= {0x02,0x10,0x02,0xAA,0xAA,0xAA,0xAA,0xAA};
extern uint8_t Data_786_6[8]= {0x02,0x27,0x05,0xAA,0xAA,0xAA,0xAA,0xAA}; extern uint8_t Data_786_6[8]= {0x02,0x27,0x05,0xAA,0xAA,0xAA,0xAA,0xAA};
extern uint8_t Data_786_7[8]= {0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA}; extern uint8_t Data_786_7[8]= {0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA};
extern uint8_t Data_786_8[8]= {0x10,0x23,0x2E,0x10,0x88,0x84,0x89,0x87}; extern uint8_t Data_786_8[8]= {0x10,0x23,0x2E,0x10,0x88,0x32,0x30,0x30};
extern uint8_t Data_786_9[8]= {0x21,0x84,0x79,0x87,0x72,0x77,0x32,0x75}; extern uint8_t Data_786_9[8]= {0x21,0x30,0x30,0x30,0x30,0x30,0x30,0x30};
extern uint8_t Data_786_10[8]= {0x22,0x70,0x65,0x32,0x30,0x32,0x35,0x31}; extern uint8_t Data_786_10[8]= {0x22,0x30,0x31,0x32,0x30,0x32,0x35,0x30};
extern uint8_t Data_786_11[8]= {0x23,0x31,0x31,0x31,0x31,0x31,0x31,0x31}; extern uint8_t Data_786_11[8]= {0x23,0x36,0x31,0x39,0x30,0x30,0x30,0x30};
extern uint8_t Data_786_12[8]= {0x24,0x31,0x31,0x31,0x31,0x31,0x31,0x31}; extern uint8_t Data_786_12[8]= {0x24,0x30,0x30,0x30,0x30,0x30,0x30,0x31};
extern uint8_t Data_786_13[8]= {0x25,0x31,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA}; extern uint8_t Data_786_13[8]= {0x25,0x31,0xAA,0xAA,0xAA,0xAA,0xAA,0xAA};
uint8_t UIDStep; uint8_t UIDStep;
uint8_t uidWrite; uint8_t uidWrite;
uint8_t UIDGetstep = 0; uint8_t UIDGetstep = 0;
uint8_t u8getUIDmsg[8]; uint8_t u8getUIDmsg[8];
uint8_t UIDNumber[17] = {84,89,87,84,79,87,72,77,2,75,70,65,2,0,2,5,0xFF}; uint8_t UIDNumber[15] = {2,0,0,0,0,0,0,0,0,0,0,1,2,0,0xFF};
void get_seed_msg(void); void get_seed_msg(void);
void Can_Set_Buff_786(uint8_t CopyData []) void Can_Set_Buff_786(uint8_t CopyData [])
{ {
...@@ -595,7 +595,9 @@ void Can_Set_Buff_786(uint8_t CopyData []) ...@@ -595,7 +595,9 @@ void Can_Set_Buff_786(uint8_t CopyData [])
} }
break; break;
case 5: case 5:
Data_786_10[7] = 0x30 + UIDNumber2[0]; Data_786_10[5] = 0x30 + UIDNumber2[0];
Data_786_10[6] = 0x30 + UIDNumber2[1];
Data_786_10[7] = 0x30 + UIDNumber2[2];
for(uint8_t i = 0;i < 8;i++) for(uint8_t i = 0;i < 8;i++)
{ {
pCANMsg->Msg[i] = Data_786_10[i]; pCANMsg->Msg[i] = Data_786_10[i];
...@@ -603,13 +605,13 @@ void Can_Set_Buff_786(uint8_t CopyData []) ...@@ -603,13 +605,13 @@ void Can_Set_Buff_786(uint8_t CopyData [])
UIDStep++; UIDStep++;
break; break;
case 6: case 6:
Data_786_11[1] = 0x30 + UIDNumber2[1]; Data_786_11[1] = 0x30 + UIDNumber2[3];
Data_786_11[2] = 0x30 + UIDNumber2[2]; Data_786_11[2] = 0x30 + UIDNumber2[4];
Data_786_11[3] = 0x30 + UIDNumber2[3]; Data_786_11[3] = 0x30 + UIDNumber2[5];
Data_786_11[4] = 0x30 + UIDNumber2[4]; Data_786_11[4] = 0x30 + UIDNumber2[6];
Data_786_11[5] = 0x30 + UIDNumber2[5]; Data_786_11[5] = 0x30 + UIDNumber2[7];
Data_786_11[6] = 0x30 + UIDNumber2[6]; Data_786_11[6] = 0x30 + UIDNumber2[8];
Data_786_11[7] = 0x30 + UIDNumber2[7]; Data_786_11[7] = 0x30 + UIDNumber2[9];
for(uint8_t i = 0;i < 8;i++) for(uint8_t i = 0;i < 8;i++)
{ {
pCANMsg->Msg[i] = Data_786_11[i]; pCANMsg->Msg[i] = Data_786_11[i];
...@@ -617,13 +619,13 @@ void Can_Set_Buff_786(uint8_t CopyData []) ...@@ -617,13 +619,13 @@ void Can_Set_Buff_786(uint8_t CopyData [])
UIDStep++; UIDStep++;
break; break;
case 7: case 7:
Data_786_12[1] = 0x30 + UIDNumber2[8]; Data_786_12[1] = 0x30 + UIDNumber2[10];
Data_786_12[2] = 0x30 + UIDNumber2[9]; Data_786_12[2] = 0x30 + UIDNumber2[11];
Data_786_12[3] = 0x30 + UIDNumber2[10]; Data_786_12[3] = 0x30 + UIDNumber2[12];
Data_786_12[4] = 0x30 + UIDNumber2[11]; Data_786_12[4] = 0x30 + UIDNumber2[13];
Data_786_12[5] = 0x30 + UIDNumber2[12]; Data_786_12[5] = 0x30 + UIDNumber2[14];
Data_786_12[6] = 0x30 + UIDNumber2[13]; Data_786_12[6] = 0x30 + UIDNumber2[15];
Data_786_12[7] = 0x30 + UIDNumber2[14]; Data_786_12[7] = 0x30 + UIDNumber2[16];
for(uint8_t i = 0;i < 8;i++) for(uint8_t i = 0;i < 8;i++)
{ {
pCANMsg->Msg[i] = Data_786_12[i]; pCANMsg->Msg[i] = Data_786_12[i];
...@@ -631,7 +633,7 @@ void Can_Set_Buff_786(uint8_t CopyData []) ...@@ -631,7 +633,7 @@ void Can_Set_Buff_786(uint8_t CopyData [])
UIDStep++; UIDStep++;
break; break;
case 8: case 8:
Data_786_13[1] = 0x30 + UIDNumber2[15]; Data_786_13[1] = 0x30 + UIDNumber2[17];
for(uint8_t i = 0;i < 8;i++) for(uint8_t i = 0;i < 8;i++)
{ {
pCANMsg->Msg[i] = Data_786_13[i]; pCANMsg->Msg[i] = Data_786_13[i];
......
YueJin_test_bench/source/Appliciation/CAN_APP.h
View file @ 34473e0e
...@@ -260,7 +260,7 @@ typedef union ...@@ -260,7 +260,7 @@ typedef union
} Sig; } Sig;
} CANMsg207Union; } CANMsg207Union;
extern uint8_t UIDNumber[17]; extern uint8_t UIDNumber[15];
void CAN_MSG_COUNTER_PLUS(void); void CAN_MSG_COUNTER_PLUS(void);
uint8_t CrcCheckSum(uint8_t *data, uint8_t len); uint8_t CrcCheckSum(uint8_t *data, uint8_t len);
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 34473e0e
...@@ -4089,8 +4089,8 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4089,8 +4089,8 @@ void Display_Version_Info(uint32_t ON_OFF)
} }
uint8_t UUIDX = 150; uint8_t UUIDX = 170;
uint8_t UIDNumber2[17] = {0,6,1,2,0,0,0,0,0,0,0,0,0,0,0,1,0xFF}; uint8_t UIDNumber2[19] = {2,5,0,6,1,9,0,0,0,0,0,0,0,0,0,0,1,1,0xFF};
void UIDDisplay(void) void UIDDisplay(void)
{ {
General_Number_Disp(UIDNumber, 3, 100); //固定UID数字 General_Number_Disp(UIDNumber, 3, 100); //固定UID数字
......
YueJin_test_bench/source/Appliciation/Display_Info.h
View file @ 34473e0e
...@@ -119,7 +119,7 @@ extern uint8_t canData2[14]; ...@@ -119,7 +119,7 @@ extern uint8_t canData2[14];
extern uint8_t canData3[10]; extern uint8_t canData3[10];
extern uint8_t canData4[8]; extern uint8_t canData4[8];
extern uint8_t UUIDX; extern uint8_t UUIDX;
extern uint8_t UIDNumber2[17]; extern uint8_t UIDNumber2[19];
extern uint8_t can_car_return_Data[8]; extern uint8_t can_car_return_Data[8];
#define PCodeText_Space_size 2//故障文字 英文空格的像素数 #define PCodeText_Space_size 2//故障文字 英文空格的像素数
#endif #endif
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 34473e0e
...@@ -127,7 +127,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent) ...@@ -127,7 +127,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
{ {
} }
} }
uint8_t change = 15; uint8_t change = 17;
void Key_Operation_SW4(Key_Event_en_t enKeyEvent) void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
...@@ -171,8 +171,8 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) ...@@ -171,8 +171,8 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
} }
else else
{ {
change = 15; change = 17;
UUIDX = 150; UUIDX = 170;
} }
} }
} }
...@@ -187,20 +187,15 @@ void Key_Operation_SW6(Key_Event_en_t enKeyEvent) ...@@ -187,20 +187,15 @@ void Key_Operation_SW6(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
if(UIDMondel) memset(&All_Flag, 0, sizeof(All_Flag));
{ All_Flag.u8flag[6] = 1;
Check_Steps = 0;
Study_Flag = 0;
UIDMondel = 0;
Display_TFT_Clear(); Display_TFT_Clear();
if(change > 0) //General_Number_Disp(Flag_SW6_Dis, 200, 20);
{
change--;
UUIDX -= 10;
}
else
{
change = 15;
UUIDX = 150;
}
}
} }
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