Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
haoJin750TFT
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
时昊
haoJin750TFT
Commits
8845ad61
Commit
8845ad61
authored
Aug 20, 2024
by
王雅楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:暂存水温灯CAN
parent
1e26d5f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
6 deletions
+38
-6
AMT630H_Datas.c
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+8
-1
Telltales_user.c
Firmware/Source/Component/Telltales/Telltales_user.c
+30
-5
No files found.
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @
8845ad61
...
@@ -2845,7 +2845,14 @@ static void AMT630H_GUI_Light()
...
@@ -2845,7 +2845,14 @@ static void AMT630H_GUI_Light()
}
}
if
(
Get_TelltalesLedSts
(
em_LED_Coolant_Temperature
))
if
(
Get_TelltalesLedSts
(
em_LED_Coolant_Temperature
))
{
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0741_616_20
);
if
(
FLASH_SYNC_1Hz
)
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0741_616_20
);
/*水温灯报警闪烁1HZ*/
}
else
{
;
}
}
}
if
(
Get_TelltalesLedSts
(
em_LED_WIFI
))
if
(
Get_TelltalesLedSts
(
em_LED_WIFI
))
{
{
...
...
Firmware/Source/Component/Telltales/Telltales_user.c
View file @
8845ad61
...
@@ -5,6 +5,10 @@
...
@@ -5,6 +5,10 @@
#include "Line_In\Line_In_user.h"
#include "Line_In\Line_In_user.h"
#include "Components.h"
#include "Components.h"
uint8_t
ECU_Engine_Temperature_flag
=
0
;
static
Tellib_uint16_t
LED_Turn_Left_Judgement
(
void
);
static
Tellib_uint16_t
LED_Turn_Left_Judgement
(
void
);
static
void
LED_Turn_Left_Execution
(
Tellib_uint16_t
led_status
);
static
void
LED_Turn_Left_Execution
(
Tellib_uint16_t
led_status
);
static
Tellib_uint16_t
LED_Turn_Right_Judgement
(
void
);
static
Tellib_uint16_t
LED_Turn_Right_Judgement
(
void
);
...
@@ -343,18 +347,21 @@ static void LED_Fuel_Level_Low_Execution(Tellib_uint16_t led_status)
...
@@ -343,18 +347,21 @@ static void LED_Fuel_Level_Low_Execution(Tellib_uint16_t led_status)
}
}
uint32_t
test_ECU_Engine_Temperature
=
0
;
/*信号来源:ECU_101 +硬线-P11 阻值 CAN>硬线*/
/*信号来源:ECU_101 +硬线-P11 阻值 CAN>硬线*/
static
Tellib_uint16_t
LED_Coolant_Temperature_Judgement
(
void
)
static
Tellib_uint16_t
LED_Coolant_Temperature_Judgement
(
void
)
{
{
Tellib_uint16_t
LED_STATE
=
0u
;
Tellib_uint16_t
LED_STATE
=
0u
;
if
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
CAN_CH0_ID_CH0_101_Msg_Count
)
==
CAN_SIG_LOST
)
if
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
CAN_CH0_ID_CH0_101_Msg_Count
)
==
CAN_SIG_LOST
)
{
{
LED_STATE
=
0u
;
if
(
Line_In_Get_Status
(
LINE_IN_Coolant_Temperature
))
if
(
Line_In_Get_Status
(
LINE_IN_Coolant_Temperature
))
{
{
LED_STATE
=
1u
;
LED_STATE
=
1u
;
}
}
else
if
(
Line_In_Get_Status
(
LINE_IN_Coolant_Temperature
)
==
0
)
{
LED_STATE
=
0u
;
}
else
else
{
{
LED_STATE
=
0u
;
LED_STATE
=
0u
;
...
@@ -362,14 +369,32 @@ static Tellib_uint16_t LED_Coolant_Temperature_Judgement(void)
...
@@ -362,14 +369,32 @@ static Tellib_uint16_t LED_Coolant_Temperature_Judgement(void)
}
}
else
else
{
{
if
(
Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature_State
()
==
0x01UL
)
test_ECU_Engine_Temperature
=
Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature
();
if
(
Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature
()
>=
120
)
{
{
LED_STATE
=
1u
;
ECU_Engine_Temperature_flag
=
1
;
LED_STATE
=
1u
;
}
}
else
else
if
(
Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature
()
<=
118
)
{
{
ECU_Engine_Temperature_flag
=
0
;
LED_STATE
=
0u
;
LED_STATE
=
0u
;
}
}
else
{
if
(
ECU_Engine_Temperature_flag
==
1
)
{
LED_STATE
=
1u
;
}
else
if
(
ECU_Engine_Temperature_flag
==
0
)
{
LED_STATE
=
0u
;
}
else
{
;
}
}
}
}
return
LED_STATE
;
return
LED_STATE
;
}
}
...
...
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