Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
TianYing_ty100
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TY
TianYing_ty100
Commits
e9900263
Commit
e9900263
authored
Jul 16, 2024
by
陈家乐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:49527 胎压学习成功之后,回到学习中,持续一分钟后,胎压显示回到上次胎压学习成功时的数值显示
parent
33fc13e2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
62 deletions
+63
-62
Can_User.c
Firmware/Source/Application/CAN_User/Can_User.c
+1
-1
Data_TPMS.c
Firmware/Source/Application/Data_TPMS/Data_TPMS.c
+62
-61
No files found.
Firmware/Source/Application/CAN_User/Can_User.c
View file @
e9900263
...
...
@@ -341,7 +341,7 @@ void Can_Write(st_CAN_Msg *Msg)
break
;
case
0x450
:
if
(
Can_341_Flg
==
1
)
if
(
Can_341_Flg
==
1
||
Common_GetIgnOnTime
()
>
2000
)
{
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 )
if
(
TPMS
.
TPMS_Front_Learn
==
0x0
)
{
//if(LearnTime_Count <= 6000)
//{
// LearnTime_Count++;
if
(
LearnTime_Count
<=
6000
)
{
LearnTime_Count
++
;
TPMS
.
TPMS_Front_Learn
=
Unstudied
;
//LearnTime_Count = 0;
}
else
{
if
(
TPMS
.
TPMS_Front_Timeclean
==
1
)
{
LearnTime_Count
=
0
;
//}
//else
//{
// if(TPMS.TPMS_Front_Timeclean == 1)
// {
// LearnTime_Count = 0;
// }
// 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)
// {
// TPMS.TPMS_Front_Learn = LearningFailure;
// }
// else
// {
// TPMS.TPMS_Front_Learn = MenuData.TPMS_Front_Learn;
// }
//
// }
// else
// {
// TPMS.TPMS_Front_Learn = MenuData.TPMS_Front_Learn;
// }
//}
}
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
)
{
TPMS
.
TPMS_Front_Learn
=
LearningFailure
;
}
else
{
TPMS
.
TPMS_Front_Learn
=
MenuData
.
TPMS_Front_Learn
;
}
}
else
{
TPMS
.
TPMS_Front_Learn
=
MenuData
.
TPMS_Front_Learn
;
}
}
}
else
if
(
TPMS
.
TPMS_Front_Learn
==
0x1
)
{
//
if(TPMS.TPMS_Front_Timeclean == 0)
//
{
//
LearnTime_Count = 0;
//
}
//
TPMS.TPMS_Front_Timeclean = 1;
if
(
TPMS
.
TPMS_Front_Timeclean
==
0
)
{
LearnTime_Count
=
0
;
}
TPMS
.
TPMS_Front_Timeclean
=
1
;
if
(
LearnTime_Count
<=
6000
)
{
LearnTime_Count
++
;
...
...
@@ -167,34 +168,34 @@ void Data_TPMS_Processing_Service ( void )
if
(
TPMS
.
TPMS_Rear_Learn
==
0x0
)
{
//
if(LearnTime_Count1 <= 6000)
//
{
if
(
LearnTime_Count1
<=
6000
)
{
LearnTime_Count1
=
0
;
TPMS
.
TPMS_Rear_Learn
=
Unstudied
;
//
}
//
else
//
{
//
if(TPMS.TPMS_Rear_Timeclean == 1)
//
{
//
LearnTime_Count1 = 0;
//
}
//
TPMS.TPMS_Rear_Timeclean = 0;
//
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)
//
{
//
TPMS.TPMS_Rear_Learn = LearningFailure;
//
}
//
else
//
{
//
TPMS.TPMS_Rear_Learn = MenuData.TPMS_Rear_Learn;
//
}
//
}
//
else
//
{
//
TPMS.TPMS_Rear_Learn = MenuData.TPMS_Rear_Learn;
//
}
//
}
}
else
{
if
(
TPMS
.
TPMS_Rear_Timeclean
==
1
)
{
LearnTime_Count1
=
0
;
}
TPMS
.
TPMS_Rear_Timeclean
=
0
;
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
)
{
TPMS
.
TPMS_Rear_Learn
=
LearningFailure
;
}
else
{
TPMS
.
TPMS_Rear_Learn
=
MenuData
.
TPMS_Rear_Learn
;
}
}
else
{
TPMS
.
TPMS_Rear_Learn
=
MenuData
.
TPMS_Rear_Learn
;
}
}
}
else
if
(
TPMS
.
TPMS_Rear_Learn
==
0x1
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment