Commit d0ae6c86 authored by baizhengyuan's avatar baizhengyuan

🐞 fix:debug

parent bc7e0a4c
...@@ -19,6 +19,7 @@ static uint8_t mDataBufPtr[1024] = {0}; ...@@ -19,6 +19,7 @@ static uint8_t mDataBufPtr[1024] = {0};
static uint32_t mDataBufLen = 0; static uint32_t mDataBufLen = 0;
static uint8_t mDataBufPtr1[1024] = {0}; static uint8_t mDataBufPtr1[1024] = {0};
static uint32_t mDataBufLen1 = 0; static uint32_t mDataBufLen1 = 0;
uint8_t can_judge[100] = {0};
uint8_t BarCode[256] = {0}; uint8_t BarCode[256] = {0};
uint8_t BarCode1[256] = {0}; uint8_t BarCode1[256] = {0};
uint32_t readNum = 0; uint32_t readNum = 0;
...@@ -40,6 +41,7 @@ uint8_t clearOdoFlag = 0; ...@@ -40,6 +41,7 @@ uint8_t clearOdoFlag = 0;
uint8_t connectbleFlag = 0; uint8_t connectbleFlag = 0;
uint8_t Auto_ONOFF = 0; uint8_t Auto_ONOFF = 0;
uint32_t key_value; uint32_t key_value;
uint32_t key_value_all;
uint8_t key_array[4]; uint8_t key_array[4];
uint8_t seed_value[4]; uint8_t seed_value[4];
uint8_t zhenduansendStep = 0; uint8_t zhenduansendStep = 0;
......
...@@ -12,6 +12,7 @@ void Recv_Byte1(void); ...@@ -12,6 +12,7 @@ void Recv_Byte1(void);
void Recv_Byte2(void); void Recv_Byte2(void);
extern uint8_t GetDataCompare(void); extern uint8_t GetDataCompare(void);
extern uint32_t readNum; extern uint32_t readNum;
extern uint8_t can_judge[100];
extern uint8_t BarCode[256]; extern uint8_t BarCode[256];
extern uint32_t readNum1; extern uint32_t readNum1;
extern uint8_t BarCode1[256]; extern uint8_t BarCode1[256];
...@@ -21,7 +22,7 @@ extern uint8_t lastdata[4]; ...@@ -21,7 +22,7 @@ extern uint8_t lastdata[4];
extern uint8_t checkresult; extern uint8_t checkresult;
extern uint8_t firstflag; extern uint8_t firstflag;
extern uint8_t zhenduanflag; extern uint8_t zhenduanflag;
extern uint32_t key_value; extern uint32_t key_value_all;
extern uint8_t key_array[4]; extern uint8_t key_array[4];
extern uint8_t seed_value[4]; extern uint8_t seed_value[4];
extern uint8_t zhenduansendStep; extern uint8_t zhenduansendStep;
......
...@@ -134,6 +134,17 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY [ CAN_CH0_ID_TOTAL_MAX ] = ...@@ -134,6 +134,17 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY [ CAN_CH0_ID_TOTAL_MAX ] =
(( void * )0), (( void * )0),
}, },
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x794ul,//诊断接受ID
(( void * )0),
(( void * )0),
(( void * )0),
},
}; };
...@@ -312,6 +323,9 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID) ...@@ -312,6 +323,9 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case CAN_CH0_ID_gm_esp_ee_Msg: case CAN_CH0_ID_gm_esp_ee_Msg:
u8Result = CAN_CH0_ID_gm_esp_ee_Msg_Count; u8Result = CAN_CH0_ID_gm_esp_ee_Msg_Count;
break; break;
case CAN_CH0_ID_UDS_REC_Msg:
u8Result = CAN_CH0_ID_UDS_REC_Msg_Count;
break;
default : default :
u8Result = CAN_CH0_ID_TOTAL_MAX; u8Result = CAN_CH0_ID_TOTAL_MAX;
break; break;
......
...@@ -20,6 +20,8 @@ typedef enum ...@@ -20,6 +20,8 @@ typedef enum
CAN_CH0_ID_esp32_soft_Msg_Count, CAN_CH0_ID_esp32_soft_Msg_Count,
CAN_CH0_ID_gm_esp_ee_Msg_Count, CAN_CH0_ID_gm_esp_ee_Msg_Count,
CAN_CH0_ID_UDS_REC_Msg_Count,
CAN_CH0_ID_TOTAL_MAX, CAN_CH0_ID_TOTAL_MAX,
} CAN_MSG_ID_t; } CAN_MSG_ID_t;
...@@ -47,6 +49,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ; ...@@ -47,6 +49,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define CAN_CH0_ID_esp32_soft_Msg 0x0C70FFD4ul #define CAN_CH0_ID_esp32_soft_Msg 0x0C70FFD4ul
#define CAN_CH0_ID_gm_esp_ee_Msg 0x0C87FFD4ul #define CAN_CH0_ID_gm_esp_ee_Msg 0x0C87FFD4ul
#define CAN_CH0_ID_UDS_REC_Msg 0x794ul
extern uint32_t Get_ID_ODO(void); extern uint32_t Get_ID_ODO(void);
......
...@@ -24,10 +24,12 @@ void Sys_Exact_100ms_Tasks(void); ...@@ -24,10 +24,12 @@ void Sys_Exact_100ms_Tasks(void);
void Sys_Enter_Sleep_Mode(void); void Sys_Enter_Sleep_Mode(void);
uint16_t Sys_Get_ms_Rolling_Counter(void); uint16_t Sys_Get_ms_Rolling_Counter(void);
void get_key_value(void);
void init_CAN_Frame(CAN_Frame_st_t* msg, uint32_t can_id, uint8_t can_len, uint8_t can_frame_ide, const uint8_t* data); void init_CAN_Frame(CAN_Frame_st_t* msg, uint32_t can_id, uint8_t can_len, uint8_t can_frame_ide, const uint8_t* data);
void can_mid(CAN_Frame_st_t Msg); void can_mid(CAN_Frame_st_t Msg);
void can_submit(void); void can_submit(void);
void sendCANMessage(uint8_t *data20, uint8_t *barcode_Msg, uint8_t msgType, uint8_t offset, uint8_t length); void Can_Send_0x714(void);
uint32_t Can_Send_0x794(void); void Can_Send_0x714_CHECK(void);
#endif #endif
\ No newline at end of file
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