Commit 964c1cad authored by 陈家乐's avatar 陈家乐

🐞 fix:48976 外发0x450胎压信号,仪表上电偶发前几帧外发0

parent 70584805
...@@ -36,7 +36,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] = ...@@ -36,7 +36,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
1000ul, 1000ul,
0x341ul, 0x341ul,
(( void * )0), (( void * )0),
(( void * )0), (Can_341_Receive),
(( void * )0), (( void * )0),
}, },
{ {
......
...@@ -314,6 +314,7 @@ uint8_t COM_APP_Process(st_CAN_Msg *Msg) ...@@ -314,6 +314,7 @@ uint8_t COM_APP_Process(st_CAN_Msg *Msg)
return 0; return 0;
} }
extern uint8_t Can_341_Flg;
void Can_Write(st_CAN_Msg *Msg) void Can_Write(st_CAN_Msg *Msg)
{ {
uint32_t i = 0; uint32_t i = 0;
...@@ -339,7 +340,12 @@ void Can_Write(st_CAN_Msg *Msg) ...@@ -339,7 +340,12 @@ void Can_Write(st_CAN_Msg *Msg)
CAN_Transmit(CAN0MSG12, &CAN_SendMsg); CAN_Transmit(CAN0MSG12, &CAN_SendMsg);
break; break;
case 0x450: case 0x450:
if(Can_341_Flg == 1)
{
CAN_Transmit(CAN0MSG13, &CAN_SendMsg); CAN_Transmit(CAN0MSG13, &CAN_SendMsg);
}
break; break;
case 0x220: case 0x220:
CAN_Transmit(CAN0MSG10, &CAN_SendMsg); CAN_Transmit(CAN0MSG10, &CAN_SendMsg);
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
_TPMS_Display TPMS; _TPMS_Display TPMS;
uint32_t LearnTime_Count = 0; uint32_t LearnTime_Count = 0;
uint32_t LearnTime_Count1 = 0; uint32_t LearnTime_Count1 = 0;
uint8_t Can_341_Flg = 0;
void Data_TPMS_KL30_Init ( void ) void Data_TPMS_KL30_Init ( void )
{ {
uint8_t TPMS_L[2] = {0,0}; uint8_t TPMS_L[2] = {0,0};
...@@ -27,6 +28,8 @@ void Data_TPMS_KL30_Init ( void ) ...@@ -27,6 +28,8 @@ void Data_TPMS_KL30_Init ( void )
TPMS.TPMS_LOST = 0; TPMS.TPMS_LOST = 0;
LearnTime_Count = 6001; LearnTime_Count = 6001;
LearnTime_Count1 = 6001; LearnTime_Count1 = 6001;
Can_341_Flg = 0;
} }
void Data_TPMS_KL15_WAKE_UP_Init ( void ) void Data_TPMS_KL15_WAKE_UP_Init ( void )
{ {
...@@ -44,6 +47,13 @@ void Data_TPMS_KL15_WAKE_UP_Init ( void ) ...@@ -44,6 +47,13 @@ void Data_TPMS_KL15_WAKE_UP_Init ( void )
TPMS.TPMS_LOST = 0; TPMS.TPMS_LOST = 0;
LearnTime_Count = 6001; LearnTime_Count = 6001;
LearnTime_Count1 = 6001; LearnTime_Count1 = 6001;
Can_341_Flg = 0;
}
void Can_341_Receive(void)
{
Can_341_Flg = 1;
} }
void Data_TPMS_Processing_Service ( void ) void Data_TPMS_Processing_Service ( void )
......
...@@ -41,4 +41,6 @@ void Data_TPMS_KL15_WAKE_UP_Init ( void ); ...@@ -41,4 +41,6 @@ void Data_TPMS_KL15_WAKE_UP_Init ( void );
uint8_t Get_Front_FirstLearn_Flag (void); uint8_t Get_Front_FirstLearn_Flag (void);
uint8_t Get_Rear_FirstLearn_Flag (void); uint8_t Get_Rear_FirstLearn_Flag (void);
uint8_t Get_TPMS_CAN_LOST (void); uint8_t Get_TPMS_CAN_LOST (void);
void Can_341_Receive(void);
#endif #endif
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