Commit 61cea658 authored by 何锐's avatar 何锐

feat:根据仪表更新硬件版本号格式

parent 73312f4b
......@@ -32,7 +32,7 @@ uint16_t decimal_candata[14];
uint8_t canData1[8];//暂存软件版本号数据用
uint8_t canData4[8];//暂存硬件版本号数据用
uint8_t canData2[14];
uint8_t canData3[10];
uint8_t canData3[20];
uint8_t can_car_Data[8];
......@@ -4669,7 +4669,7 @@ const uint16_t CurrentDigitNum15PosX_2[] = {108, 98};
uint8_t Detecting_Set_Version[5]={0x56, 0x31, 0x30, 0x32, 0xff};
void Display_Can_Receive_Data(uint16_t X,uint8_t Y)
{
if(canData3[9] == 0XFF && canData2[13] == 0XFF && All_Flag.u8flag[8] == 1)
if(canData3[19] == 0XFF && canData2[13] == 0XFF && All_Flag.u8flag[8] == 1)
{
General_Number_Disp(canData2, X+70, Y);
General_Number_Disp(canData3, X+70, Y +50);
......
......@@ -116,7 +116,7 @@ typedef struct {
} Learning_Card;
extern uint8_t canData1[8];
extern uint8_t canData2[14];
extern uint8_t canData3[10];
extern uint8_t canData3[20];
extern uint8_t canData4[8];
extern uint8_t UUIDX;
extern uint8_t UIDNumber2[19];
......
......@@ -145,7 +145,7 @@ extern uint16_t testtime;
extern uint8_t canData1[8];
extern uint8_t canData2[14];
extern uint8_t canData3[10];
extern uint8_t canData3[20];
extern uint8_t canData4[8];
extern uint32_t Quiescent_Current[5];
......
......@@ -134,7 +134,7 @@ extern uint8_t Diagnosis_banbenhao_flag;
extern uint8_t canData1[8];
extern uint8_t canData2[14];
extern uint8_t canData3[10];
extern uint8_t canData3[20];
typedef struct
{
......@@ -879,7 +879,25 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
canData3[6] = canData4[4];
canData3[7] = canData4[5];
canData3[8] = canData4[6];
canData3[9]=0XFF;
canData3[9] = canData4[7];
}
else if(pstCANFrame->unCANData.u8CANData[0] == 0x22)
{
memcpy(canData4,pstCANFrame->unCANData.u8CANData,pstCANFrame->u8CANLEN);
canData3[10] = canData4[1];
canData3[11] = canData4[2];
canData3[12] = canData4[3];
canData3[13] = canData4[4];
canData3[14] = canData4[5];
canData3[15] = canData4[6];
canData3[16] = canData4[7];
}
else if(pstCANFrame->unCANData.u8CANData[0] == 0x23)
{
memcpy(canData4,pstCANFrame->unCANData.u8CANData,pstCANFrame->u8CANLEN);
canData3[17] = canData4[1];
canData3[18] = canData4[2];
canData3[19] = 0XFF;
}
}
......
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