Skip to content

TianYing_ty100
TianYing_ty100
Commit e9900263 authored by 陈家乐's avatar 陈家乐
Browse files
Options

🐞 fix:49527 胎压学习成功之后，回到学习中，持续一分钟后，胎压显示回到上次胎压学习成功时的数值显示

parent 33fc13e2
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 62 deletions
Firmware/Source/Application/CAN_User/Can_User.c
View file @ e9900263
...@@ -341,7 +341,7 @@ void Can_Write(st_CAN_Msg *Msg) ...@@ -341,7 +341,7 @@ void Can_Write(st_CAN_Msg *Msg)
break; break;
case 0x450: case 0x450:
if(Can_341_Flg == 1) if(Can_341_Flg == 1 || Common_GetIgnOnTime() > 2000)
{ {
CAN_Transmit(CAN0MSG13, &CAN_SendMsg); CAN_Transmit(CAN0MSG13, &CAN_SendMsg);
} }
......
Firmware/Source/Application/Data_TPMS/Data_TPMS.c
View file @ e9900263
...@@ -78,44 +78,45 @@ void Data_TPMS_Processing_Service ( void ) ...@@ -78,44 +78,45 @@ void Data_TPMS_Processing_Service ( void )
if(TPMS.TPMS_Front_Learn == 0x0) if(TPMS.TPMS_Front_Learn == 0x0)
{ {
//if(LearnTime_Count <= 6000) if(LearnTime_Count <= 6000)
//{ {
// LearnTime_Count++; LearnTime_Count++;
TPMS.TPMS_Front_Learn = Unstudied;
LearnTime_Count = 0; TPMS.TPMS_Front_Learn = Unstudied;
//} //LearnTime_Count = 0;
//else }
//{ else
// if(TPMS.TPMS_Front_Timeclean == 1) {
// { if(TPMS.TPMS_Front_Timeclean == 1)
// LearnTime_Count = 0; {
// } LearnTime_Count = 0;
// TPMS.TPMS_Front_Timeclean = 0; }
// if ((MenuData.TPMS_Front_Learn != 0x2) && (MenuData.TPMS_Front_Learn != 0x3) ) TPMS.TPMS_Front_Timeclean = 0;
// { if ((MenuData.TPMS_Front_Learn != 0x2) && (MenuData.TPMS_Front_Learn != 0x3) )
// if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x341_Msg_Count) != CAN_SIG_LOST) {
// { if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x341_Msg_Count) != CAN_SIG_LOST)
// TPMS.TPMS_Front_Learn = LearningFailure; {
// } TPMS.TPMS_Front_Learn = LearningFailure;
// else }
// { else
// TPMS.TPMS_Front_Learn = MenuData.TPMS_Front_Learn; {
// } TPMS.TPMS_Front_Learn = MenuData.TPMS_Front_Learn;
// }
// }
// else }
// { else
// TPMS.TPMS_Front_Learn = MenuData.TPMS_Front_Learn; {
// } TPMS.TPMS_Front_Learn = MenuData.TPMS_Front_Learn;
//} }
}
} }
else if(TPMS.TPMS_Front_Learn == 0x1) else if(TPMS.TPMS_Front_Learn == 0x1)
{ {
//if(TPMS.TPMS_Front_Timeclean == 0) if(TPMS.TPMS_Front_Timeclean == 0)
//{ {
// LearnTime_Count = 0; LearnTime_Count = 0;
//} }
//TPMS.TPMS_Front_Timeclean = 1; TPMS.TPMS_Front_Timeclean = 1;
if(LearnTime_Count <= 6000) if(LearnTime_Count <= 6000)
{ {
LearnTime_Count++; LearnTime_Count++;
...@@ -167,34 +168,34 @@ void Data_TPMS_Processing_Service ( void ) ...@@ -167,34 +168,34 @@ void Data_TPMS_Processing_Service ( void )
if(TPMS.TPMS_Rear_Learn == 0x0) if(TPMS.TPMS_Rear_Learn == 0x0)
{ {
//if(LearnTime_Count1 <= 6000) if(LearnTime_Count1 <= 6000)
//{ {
LearnTime_Count1 = 0; LearnTime_Count1 = 0;
TPMS.TPMS_Rear_Learn = Unstudied; TPMS.TPMS_Rear_Learn = Unstudied;
//} }
//else else
//{ {
// if(TPMS.TPMS_Rear_Timeclean == 1) if(TPMS.TPMS_Rear_Timeclean == 1)
// { {
// LearnTime_Count1 = 0; LearnTime_Count1 = 0;
// } }
// TPMS.TPMS_Rear_Timeclean = 0; TPMS.TPMS_Rear_Timeclean = 0;
// if ((MenuData.TPMS_Rear_Learn != 0x2) && (MenuData.TPMS_Rear_Learn != 0x3) ) if ((MenuData.TPMS_Rear_Learn != 0x2) && (MenuData.TPMS_Rear_Learn != 0x3) )
// { {
// if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x341_Msg_Count) != CAN_SIG_LOST) if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x341_Msg_Count) != CAN_SIG_LOST)
// { {
// TPMS.TPMS_Rear_Learn = LearningFailure; TPMS.TPMS_Rear_Learn = LearningFailure;
// } }
// else else
// { {
// TPMS.TPMS_Rear_Learn = MenuData.TPMS_Rear_Learn; TPMS.TPMS_Rear_Learn = MenuData.TPMS_Rear_Learn;
// } }
// } }
// else else
// { {
// TPMS.TPMS_Rear_Learn = MenuData.TPMS_Rear_Learn; TPMS.TPMS_Rear_Learn = MenuData.TPMS_Rear_Learn;
// } }
//} }
} }
else if(TPMS.TPMS_Rear_Learn == 0x1) else if(TPMS.TPMS_Rear_Learn == 0x1)
{ {
......
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