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
89de3cf0
Commit
89de3cf0
authored
Dec 14, 2021
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加显示图片,FV00.06
parent
6627d6bf
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
869 additions
and
800 deletions
+869
-800
CAN_FUNC.c
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
+38
-15
GUI.c
source/Application/Graphic/GUI/GUI.c
+38
-4
images.c
source/Driver/Graphic/images.c
+787
-781
images.h
source/Driver/Graphic/images.h
+6
-0
No files found.
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @
89de3cf0
...
...
@@ -603,7 +603,7 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
{
uint8_t
Trip_Type
=
0u
;
if
(
State_Flag
.
FState_ClearOilTx
==
1
)
if
(
State_Flag
.
FState_ClearOilTx
==
0x01u
)
{
if
(
Trip_Type
==
TRAPA
)
{
...
...
@@ -627,11 +627,9 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
CopyData
[
6
]
=
0xFF
;
CopyData
[
7
]
=
0xFF
;
}
User_BCM_Flag
=
1u
;
/*从头轮询*/
State_Flag
.
FState_ClearOilTx
=
0u
;
//Can_Msg_Tx_Overwrite(MSGID_18EF1817, 1, 100 * 1000);
User_BCM_Flag
=
1u
;
/*从头轮询*/
State_Flag
.
FState_ClearOilTx
=
0x00u
;
}
else
{
...
...
@@ -761,14 +759,31 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
default:
break
;
}
}
}
//Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0XFFFF, 100 * 1000);
void
Id18ef1817_Send_Service
(
void
)
{
if
(
State_Flag
.
FState_COilTimeOut
==
1u
)
{
Can_Msg_Tx_Overwrite
(
MSGID_18EF1817
,
1u
,
100
*
1000
);
}
else
{
if
((
State_Flag
.
FState_ClearOilRx
==
0u
)
&&
(
State_Flag
.
FState_COilTimeOut
!=
FState_COilTimeOutNum
))
{
Can_Msg_Tx_Overwrite
(
MSGID_18EF1817
,
0u
,
100
*
1000
);
}
else
{
Can_Msg_Tx_Overwrite
(
MSGID_18EF1817
,
0xFFFFu
,
100
*
1000
);
}
}
}
/*-------------------------------------------------------------------------
* Function Name : Drive_Info_IC1_STATUS_Rx
* Description : 18EF1718 报文循环接收处理
* Description : 18EF1718 报文循环接收处理
100ms任务中执行
* Input : None
* Output : None
* Return : None
...
...
@@ -870,14 +885,22 @@ void Drive_Info_IC1_STATUS_Rx(void)
break
;
}
// if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum)
//{
// State_Flag.FState_COilTimeOut++;
// }
// if (Data_Sig == 0x40u)
//{
// State_Flag.FState_ClearOilRx == 1;
// }
#if 0
if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum)
{
State_Flag.FState_COilTimeOut++;
if (State_Flag.FState_COilTimeOut == FState_COilTimeOutNum)
{
State_Flag.FState_ClearOilTx = 0u;
}
}
if (Data_Sig == 0x40u)
{
State_Flag.FState_ClearOilRx == 1;
}
#endif
}
/*-------------------------------------------------------------------------
...
...
source/Application/Graphic/GUI/GUI.c
View file @
89de3cf0
This diff is collapsed.
Click to expand it.
source/Driver/Graphic/images.c
View file @
89de3cf0
This source diff could not be displayed because it is too large. You can
view the blob
instead.
source/Driver/Graphic/images.h
View file @
89de3cf0
...
...
@@ -196,6 +196,10 @@ enum SpriteName
CN_tianlanyezouge_03
,
CN_tianlanyezouge_04
,
CN_tianlanyezouge_05
,
CN_AUTO
,
CN_A_ECO
,
CN_A_POWER
,
CN_black
,
CN_dangwei_1
,
CN_dangwei_10
,
CN_dangwei_11
,
...
...
@@ -219,7 +223,9 @@ enum SpriteName
CN_dangwei_RM
,
CN_MANUAL
,
CN_Alarm_01
,
CN_Alarm_01_1
,
CN_Alarm_02
,
CN_Alarm_02_1
,
CN_ODO
,
CN_ODO_danwei
,
CN_TRIP
,
...
...
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