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
baizhengyuan
TianYing_ty100
Commits
c33fb4cc
Commit
c33fb4cc
authored
Jul 10, 2024
by
李俭双
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'CHENJIALE' into 'dev'
Chenjiale See merge request
ty/tianying_ty100!47
parents
d3606946
95f45931
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
5 deletions
+13
-5
GUI_Display.c
Firmware/Source/Application/GUI_Display/GUI_Display.c
+1
-1
SEG_DISPLAY.c
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
+1
-1
Telltales_user.c
Firmware/Source/Component/Telltales/Telltales_user.c
+11
-3
软件变更记录(天鹰项目139).xlsx
Firmware/utility/程序释放/软件变更记录(天鹰项目139).xlsx
+0
-0
No files found.
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @
c33fb4cc
...
...
@@ -74,7 +74,7 @@ void Gauge_Service(void)
Check_SEG_Display
();
for
(
k
=
0
;
k
<
LampCh0_MAX
;
k
++
)
{
if
(
k
==
24
)
if
(
k
==
24
||
k
==
21
||
k
==
13
||
k
==
26
)
{
k
++
;
}
...
...
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @
c33fb4cc
...
...
@@ -2260,7 +2260,7 @@ void SEG_SET_TPMS_DISPLAY(uint8_t m_Flag, uint16_t m_NUM1, uint16_t m_NUM2, uint
}
else
{
IC2_SEG109
=
IC_SEG_O
N
;
IC2_SEG109
=
IC_SEG_O
FF
;
IC2_SEG110
=
IC_SEG_ON
;
IC2_SEG118
=
IC_SEG_ON
;
IC2_SEG138
=
IC_SEG_ON
;
...
...
Firmware/Source/Component/Telltales/Telltales_user.c
View file @
c33fb4cc
...
...
@@ -286,14 +286,18 @@ static void LED_Fuel_Execution(Tellib_uint16_t led_status)
static
Tellib_uint16_t
LED_Coolant_Judgement
(
void
)
{
Tellib_uint16_t
LED_STATE
=
0u
;
if
(
GET_DataCollantTempWarnflg
()
==
2
)
if
(
ClearODO_Flag
==
1
)
{
LED_STATE
=
2
;
LED_STATE
=
1
;
}
else
if
(
GET_DataCollantTempWarnflg
()
==
1
)
{
LED_STATE
=
3
;
}
else
if
(
GET_DataCollantTempWarnflg
()
==
2
)
{
LED_STATE
=
2
;
}
else
{
LED_STATE
=
4
;
...
...
@@ -621,7 +625,11 @@ static void LED_Lateral_Strut_Execution(Tellib_uint16_t led_status)
static
Tellib_uint16_t
LED_Tire_Pressure_Judgement
(
void
)
{
Tellib_uint16_t
LED_STATE
=
0u
;
if
((
Get_Front_FirstLearn_Flag
()
==
2
)
||
(
Get_Rear_FirstLearn_Flag
()
==
2
))
if
(
ClearODO_Flag
==
1
)
{
LED_STATE
=
1
;
}
else
if
((
Get_Front_FirstLearn_Flag
()
==
2
)
||
(
Get_Rear_FirstLearn_Flag
()
==
2
))
{
if
(
Get_Led_TPMS_Waring
()
==
1
)
{
...
...
Firmware/utility/程序释放/软件变更记录(天鹰项目139).xlsx
View file @
c33fb4cc
No preview for this file type
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