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
5841c36a
Commit
5841c36a
authored
Aug 17, 2024
by
王雅楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:新增故障信息无效状态
parent
da6fcff0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
9 deletions
+37
-9
AMT630H_Datas.c
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+21
-5
Telltales_user.c
Firmware/Source/Component/Telltales/Telltales_user.c
+16
-4
No files found.
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @
5841c36a
...
...
@@ -69,6 +69,7 @@ void AMT630H_GUI_Fault_Information(void)
{
if
(
g_u8Display_Mode
==
ModeDAY
)
{
if
(
g_u8Language
==
CH
)
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0163_27_396
);
...
...
@@ -105,6 +106,8 @@ void AMT630H_GUI_Fault_Information(void)
}
else
if
(
g_u8Display_Mode
==
ModeNIGHT
)
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0900_610_229
);
//夜间 历史故障P
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0900_610_164
);
//夜间 当前故障P
if
(
g_u8Language
==
CH
)
{
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0350_27_396
);
...
...
@@ -182,8 +185,8 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
{
if
(
g_u8Display_Mode
==
ModeDAY
)
{
//
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 164);//当前故障码的P
//
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 229);//历史故障码的P
SetPagePicFree
(
GRAPHICS_PAGE_0
,
Pic_0876_639_293
,
610
,
164
);
//当前故障码的P
SetPagePicFree
(
GRAPHICS_PAGE_0
,
Pic_0876_639_293
,
610
,
229
);
//历史故障码的P
/*当前故障码前两位显示*/
DisplayNumPara
.
NumList
=
NumbeList_FaultCode_day
;
DisplayNumPara
.
x
=
639
;
...
...
@@ -219,8 +222,8 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
}
else
if
(
g_u8Display_Mode
==
ModeNIGHT
)
{
//
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 175);//当前故障码的P
//
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 240);//历史故障码的P
SetPagePicFree
(
GRAPHICS_PAGE_0
,
Pic_0912_639_293
,
610
,
175
);
//当前故障码的P
SetPagePicFree
(
GRAPHICS_PAGE_0
,
Pic_0912_639_293
,
610
,
240
);
//历史故障码的P
/*当前故障码前两位显示*/
DisplayNumPara
.
NumList
=
NumbeList_FaultCode_night
;
DisplayNumPara
.
x
=
639
;
...
...
@@ -257,7 +260,20 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
}
else
{
/*显示-----*/
;
if
(
g_u8Display_Mode
==
ModeDAY
)
{
SetPagePicFree
(
GRAPHICS_PAGE_0
,
Pic_0926_619_240
,
610
,
175
);
SetPagePicFree
(
GRAPHICS_PAGE_0
,
Pic_0926_619_240
,
610
,
240
);
}
else
if
(
g_u8Display_Mode
==
ModeNIGHT
)
{
SetPagePicFree
(
GRAPHICS_PAGE_0
,
Pic_0927_619_175
,
610
,
175
);
SetPagePicFree
(
GRAPHICS_PAGE_0
,
Pic_0927_619_175
,
610
,
240
);
}
else
{
;
}
}
}
/**
...
...
Firmware/Source/Component/Telltales/Telltales_user.c
View file @
5841c36a
...
...
@@ -234,22 +234,34 @@ static Tellib_uint16_t LED_TCS_Judgement(void)
{
LED_STATE
=
1u
;
/*TCS灯亮*/
}
else
else
if
(
Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp
()
==
0x0
)
{
LED_STATE
=
0u
;
/*都不亮*/
}
else
{
LED_STATE
=
0u
;
}
}
else
else
if
(
Get_CAN_CH0_ID_37B_Sig_TCS_Work_Mode
==
0x0
)
{
if
(
Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp
()
==
0x1
)
{
LED_STATE
=
2u
;
/*TCS/亮*/
}
else
else
if
(
Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp
()
==
0x0
)
{
;
LED_STATE
=
0u
;
}
else
{
LED_STATE
=
0u
;
}
}
else
{
;
}
}
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