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
33fc13e2
Commit
33fc13e2
authored
Jul 16, 2024
by
陈家乐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:修改胎压显示,当识别到正确的胎压ID,按实际接收的胎压值常亮显示
parent
0dcd2258
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
7 deletions
+37
-7
Data_TPMS.c
Firmware/Source/Application/Data_TPMS/Data_TPMS.c
+15
-4
Data_TPMS.h
Firmware/Source/Application/Data_TPMS/Data_TPMS.h
+5
-0
SEG_DISPLAY.c
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
+17
-3
No files found.
Firmware/Source/Application/Data_TPMS/Data_TPMS.c
View file @
33fc13e2
...
@@ -145,11 +145,12 @@ void Data_TPMS_Processing_Service ( void )
...
@@ -145,11 +145,12 @@ void Data_TPMS_Processing_Service ( void )
LearnTime_Count
=
0
;
LearnTime_Count
=
0
;
if
((
Get_CAN_CH0_ID_373_Sig_Front_id
()
!=
0
)
&&
(
Get_CAN_CH0_ID_373_Sig_Front_id
()
!=
0xFFFFFFFF
))
if
((
Get_CAN_CH0_ID_373_Sig_Front_id
()
!=
0
)
&&
(
Get_CAN_CH0_ID_373_Sig_Front_id
()
!=
0xFFFFFFFF
))
{
{
TPMS
.
TPMS_Front_Learn
=
LearningCompletion
;
TPMS
.
TPMS_Front_ID_Value
=
1
;
//TPMS.TPMS_Front_Learn = LearningCompletion;
}
}
else
else
{
{
;
TPMS
.
TPMS_Front_ID_Value
=
0
;
}
}
}
}
...
@@ -231,11 +232,12 @@ void Data_TPMS_Processing_Service ( void )
...
@@ -231,11 +232,12 @@ void Data_TPMS_Processing_Service ( void )
LearnTime_Count1
=
0
;
LearnTime_Count1
=
0
;
if
((
Get_CAN_CH0_ID_373_Sig_Rear_id
()
!=
0
)
&&
(
Get_CAN_CH0_ID_373_Sig_Rear_id
()
!=
0xFFFFFFFF
))
if
((
Get_CAN_CH0_ID_373_Sig_Rear_id
()
!=
0
)
&&
(
Get_CAN_CH0_ID_373_Sig_Rear_id
()
!=
0xFFFFFFFF
))
{
{
TPMS
.
TPMS_Rear_Learn
=
LearningCompletion
;
TPMS
.
TPMS_Rear_ID_Value
=
1
;
//TPMS.TPMS_Rear_Learn = LearningCompletion;
}
}
else
else
{
{
;
TPMS
.
TPMS_Rear_ID_Value
=
0
;
}
}
}
}
...
@@ -471,6 +473,15 @@ uint8_t Get_Rear_TPMS_Sig_Vaild (void)
...
@@ -471,6 +473,15 @@ uint8_t Get_Rear_TPMS_Sig_Vaild (void)
{
{
return
TPMS
.
Rear_TPMS_Valid
;
return
TPMS
.
Rear_TPMS_Valid
;
}
}
uint8_t
Get_Front_TPMS_ID_Vaild
(
void
)
{
return
TPMS
.
TPMS_Front_ID_Value
;
}
uint8_t
Get_Rear_TPMS_ID_Vaild
(
void
)
{
return
TPMS
.
TPMS_Rear_ID_Value
;
}
//10倍
//10倍
uint16_t
Get_Front_TPMS_Sig_Value
(
void
)
uint16_t
Get_Front_TPMS_Sig_Value
(
void
)
{
{
...
...
Firmware/Source/Application/Data_TPMS/Data_TPMS.h
View file @
33fc13e2
...
@@ -18,6 +18,9 @@ typedef struct __attribute__((aligned(4)))
...
@@ -18,6 +18,9 @@ typedef struct __attribute__((aligned(4)))
uint8_t
TPMS_Front_Timeclean
;
uint8_t
TPMS_Front_Timeclean
;
uint8_t
TPMS_Rear_Timeclean
;
uint8_t
TPMS_Rear_Timeclean
;
uint8_t
TPMS_Front_ID_Value
;
uint8_t
TPMS_Rear_ID_Value
;
}
_TPMS_Display
;
}
_TPMS_Display
;
typedef
enum
typedef
enum
...
@@ -33,6 +36,8 @@ uint32_t Data_Bar_To_Psi (uint32_t bar);
...
@@ -33,6 +36,8 @@ uint32_t Data_Bar_To_Psi (uint32_t bar);
uint8_t
Get_Led_TPMS_Waring
(
void
);
uint8_t
Get_Led_TPMS_Waring
(
void
);
uint8_t
Get_Front_TPMS_Sig_Vaild
(
void
);
uint8_t
Get_Front_TPMS_Sig_Vaild
(
void
);
uint8_t
Get_Rear_TPMS_Sig_Vaild
(
void
);
uint8_t
Get_Rear_TPMS_Sig_Vaild
(
void
);
uint8_t
Get_Front_TPMS_ID_Vaild
(
void
);
uint8_t
Get_Rear_TPMS_ID_Vaild
(
void
);
uint16_t
Get_Front_TPMS_Sig_Value
(
void
);
uint16_t
Get_Front_TPMS_Sig_Value
(
void
);
uint16_t
Get_Rear_TPMS_Sig_Value
(
void
);
uint16_t
Get_Rear_TPMS_Sig_Value
(
void
);
uint16_t
Get_Rear_TPMS_TX
(
void
);
uint16_t
Get_Rear_TPMS_TX
(
void
);
...
...
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @
33fc13e2
...
@@ -2251,9 +2251,23 @@ void SEG_SET_TPMS_DISPLAY(uint8_t m_Flag, uint16_t m_NUM1, uint16_t m_NUM2, uint
...
@@ -2251,9 +2251,23 @@ void SEG_SET_TPMS_DISPLAY(uint8_t m_Flag, uint16_t m_NUM1, uint16_t m_NUM2, uint
}
}
else
else
{
{
SEG_SET_FRONT_TPMS_NUM
(
Get_Front_FirstLearn_Flag
(),
m_NUM1
,
m_valid1
);
if
(
Get_Front_TPMS_ID_Vaild
()
==
1
)
SEG_SET_Rear_TPMS_NUM
(
Get_Rear_FirstLearn_Flag
(),
m_NUM2
,
m_valid2
);
{
SEG_SET_FRONT_TPMS_NUM
(
Get_Front_FirstLearn_Flag
(),
m_NUM1
,
m_valid1
);
}
else
{
SEG_SET_FRONT_TPMS_NUM
(
LearningFailure
,
m_NUM1
,
m_valid1
);
}
if
(
Get_Rear_TPMS_ID_Vaild
()
==
1
)
{
SEG_SET_Rear_TPMS_NUM
(
Get_Rear_FirstLearn_Flag
(),
m_NUM2
,
m_valid2
);
}
else
{
SEG_SET_Rear_TPMS_NUM
(
LearningFailure
,
m_NUM2
,
m_valid2
);
}
}
}
...
...
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