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
29a4dcd6
Commit
29a4dcd6
authored
3 years ago
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整区域
parent
1687e182
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Popup_Scheduler.c
source/Application/Alarm/Popup_Scheduler.c
+2
-2
loc_graphics_data.h
source/Driver/Graphic/loc_graphics_data.h
+1
-1
No files found.
source/Application/Alarm/Popup_Scheduler.c
View file @
29a4dcd6
...
...
@@ -1224,7 +1224,7 @@ static void Popup_Cal_CutGrade ( uint16_t NewPopupID )
else
{
s_PopupScheduling
.
NewPopupID
=
NewPopupID
;
Popup_Cal_CutGrade_loc
(
NewPopupID
);
Popup_Cal_CutGrade_loc
(
NewPopupID
);
/*优先级比较*/
}
return
;
...
...
@@ -1236,7 +1236,7 @@ static void Popup_Cal_CutGrade_loc ( uint16_t NewPopupID )
if
(
s_PopupScheduling
.
CurPopupID
<
POPUP_MAX
)
{
ret
=
Popup_Compare_Priority
(
NewPopupID
,
s_PopupScheduling
.
CurPopupID
);
ret
=
Popup_Compare_Priority
(
NewPopupID
,
s_PopupScheduling
.
CurPopupID
);
/*优先级比较*/
switch
(
ret
)
{
case
0u
:
/*新信息优先级低于/等于当前显示类型*/
...
...
This diff is collapsed.
Click to expand it.
source/Driver/Graphic/loc_graphics_data.h
View file @
29a4dcd6
...
...
@@ -124,7 +124,7 @@ static const SpritesHandler_t SpriteHandler[Max_Sprite] =
{
ODO_Sprite
,
{
438u
,
424u
,
324u
,
42u
,
1u
},
TARGET_SDRAM
,
&
ODOSpriteBuf
,
&
ODOIndex
,
ODOLogicLayerAttr
,
MAX_ODO_SUP_LAYER
,
&
ODOUpdate
,
&
ODOEn
,
R_NULL
},
{
WarningLight_Sprite
,
{
8u
,
88u
,
82u
,
264u
,
1u
},
TARGET_SDRAM
,
&
WarningLightSpriteBuf
,
&
WarningLightIndex
,
WarningLightLogicLayerAttr
,
MAX_WARNINGLIGHT_SUP_LAYER
,
&
WarningLightUpdate
,
&
WarningLightEn
,
R_NULL
},
{
ADAS_Sprite
,
{
112u
,
94u
,
254u
,
260u
,
1u
},
TARGET_SDRAM
,
&
ADASSpriteBuf
,
&
ADASIndex
,
ADASLogicLayerAttr
,
MAX_ADAS_SUP_LAYER
,
&
ADASUpdate
,
&
ADASEn
,
R_NULL
},
{
MultiPurpose_Sprite
,
{
3
82u
,
182u
,
410u
,
170
u
,
1u
},
TARGET_SDRAM
,
&
MultiPurposeSpriteBuf
,
&
MultiPurposeIndex
,
MultiPurposeLogicLayerAttr
,
MAX_MULTIPURPOSE_SUP_LAYER
,
&
MultiPurposeUpdate
,
&
MultiPurposeEn
,
R_NULL
},
{
MultiPurpose_Sprite
,
{
3
94u
,
198u
,
398u
,
154
u
,
1u
},
TARGET_SDRAM
,
&
MultiPurposeSpriteBuf
,
&
MultiPurposeIndex
,
MultiPurposeLogicLayerAttr
,
MAX_MULTIPURPOSE_SUP_LAYER
,
&
MultiPurposeUpdate
,
&
MultiPurposeEn
,
R_NULL
},
{
Cruise_Sprite
,
{
382u
,
84u
,
230u
,
92u
,
1u
},
TARGET_SDRAM
,
&
CruiseSpriteBuf
,
&
CruiseIndex
,
CruiseLogicLayerAttr
,
MAX_CRUISE_SUP_LAYER
,
&
CruiseUpdate
,
&
CruiseEn
,
R_NULL
},
{
Gear_Sprite
,
{
622u
,
86u
,
170u
,
94u
,
1u
},
TARGET_SDRAM
,
&
GearSpriteBuf
,
&
GearIndex
,
GearLogicLayerAttr
,
MAX_GEAR_SUP_LAYER
,
&
GearUpdate
,
&
GearEn
,
R_NULL
},
{
Temp_Sprite
,
{
26u
,
12u
,
258u
,
70u
,
1u
},
TARGET_SDRAM
,
&
TempSpriteBuf
,
&
TempIndex
,
TempLogicLayerAttr
,
MAX_TEMP_SUP_LAYER
,
&
TempUpdate
,
&
TempEn
,
R_NULL
},
...
...
This diff is collapsed.
Click to expand it.
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