Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VC66_7C
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
ISUZU
VC66_7C
Commits
f959d331
Commit
f959d331
authored
Jul 13, 2022
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整禅道问题
parent
ceb4335d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
5 deletions
+20
-5
Data_CoolantTemperature.c
...ion/APP/Data_CoolantTemperature/Data_CoolantTemperature.c
+16
-1
CAN_FUNC.c
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
+4
-4
No files found.
source/Application/APP/Data_CoolantTemperature/Data_CoolantTemperature.c
View file @
f959d331
...
...
@@ -2,6 +2,10 @@
#include "CAN_Communication_Matrix.h"
#include "GaugesInterface.h"
#include "GPIO.h"
#include "DisplaySch_user.h"
#include "DispSch.h"
//-------------------------------------------
//水温数据处理
//-------------------------------------------
...
...
@@ -170,6 +174,17 @@ uint8_t Coolant_Get_Valid(void)
uint8_t
Coolant_Get_CurSeg
(
void
)
{
uint8_t
u8Result
=
0u
;
u8Result
=
CoolantVariable
.
CurSeg
;
UElib_uint16_t
HMI_MENU_Sta
=
0u
;
HMI_MENU_Sta
=
Get_Cur_HMI
();
if
(
HMI_MENU_Sta
!=
Display_StartAnimation
)
{
u8Result
=
CoolantVariable
.
CurSeg
;
}
else
{
u8Result
=
0
;
}
return
u8Result
;
}
\ No newline at end of file
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @
f959d331
...
...
@@ -91,7 +91,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
Main_Air_Pressure
=
(
uint8_t
)((
Common_Get_WET_Data
()
-
500u
)
/
20u
);
/*气压状态*/
if
((
K_Line_Set
.
K_Line_LID42
==
0x0
0
u
)
||
(
K_Line_Set
.
K_Line_LID42
==
0x03u
))
if
((
K_Line_Set
.
K_Line_LID42
==
0x0
2
u
)
||
(
K_Line_Set
.
K_Line_LID42
==
0x03u
))
{
if
(
Common_Get_Air1_Data
()
!=
0u
)
{
...
...
@@ -111,7 +111,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
Service_Brake_Circuit2_AirPressure
=
0u
;
}
}
else
if
((
K_Line_Set
.
K_Line_LID42
==
0x0
1u
)
||
(
K_Line_Set
.
K_Line_LID42
==
0x02
u
))
else
if
((
K_Line_Set
.
K_Line_LID42
==
0x0
0u
)
||
(
K_Line_Set
.
K_Line_LID42
==
0x01
u
))
{
if
(
Common_Get_Air2_Data
()
!=
0u
)
{
...
...
@@ -466,7 +466,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
{
Water_Temp_Level
=
0
;
}
else
if
((
Coolant_Get_CurSeg
()
>=
11
)
&&
(
Coolant_Get_CurSeg
()
<=
12
)
&&
(
Temperature
>=
0x96u
)
)
else
if
((
Coolant_Get_CurSeg
()
>=
11
)
&&
(
Coolant_Get_CurSeg
()
<=
12
))
{
Water_Temp_Level
=
1
;
}
...
...
@@ -1459,7 +1459,7 @@ void Drive_Info_IC1_STATUS_Rx(void)
if
(
Data_Sig
==
0x40u
)
{
State_Flag
.
FState_ClearOilRx
=
=
1
;
State_Flag
.
FState_ClearOilRx
=
1
;
}
}
...
...
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