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
1e26d5f6
Commit
1e26d5f6
authored
6 months ago
by
王雅楠
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wangyanan' into 'dev'
Wangyanan See merge request
!51
parents
eba84b97
d0183b03
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
179 additions
and
57 deletions
+179
-57
userdefine.h
...BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h
+1
-1
AMT630H_Datas.c
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+177
-55
Telltales_user.c
Firmware/Source/Component/Telltales/Telltales_user.c
+1
-1
No files found.
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h
View file @
1e26d5f6
...
@@ -20,7 +20,7 @@ User definitions
...
@@ -20,7 +20,7 @@ User definitions
typedef
unsigned
short
MD_STATUS
;
typedef
unsigned
short
MD_STATUS
;
#define HAS_BOOTLOADER (
1
u) // 仅仿真App时设置为0
#define HAS_BOOTLOADER (
0
u) // 仅仿真App时设置为0
#define APP_BASE (0x0000C400ul)
#define APP_BASE (0x0000C400ul)
/* Status list definition */
/* Status list definition */
...
...
This diff is collapsed.
Click to expand it.
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @
1e26d5f6
This diff is collapsed.
Click to expand it.
Firmware/Source/Component/Telltales/Telltales_user.c
View file @
1e26d5f6
...
@@ -283,7 +283,7 @@ static Tellib_uint16_t LED_HEV_Judgement(void)
...
@@ -283,7 +283,7 @@ static Tellib_uint16_t LED_HEV_Judgement(void)
}
}
else
else
{
{
if
((
Get_CAN_CH0_ID_111_Sig_ISG_Ready
()
==
0x01UL
)
||
((
Get_CAN_CH0_ID_111_Sig_ISG_Power
()
==
1u
)
&&
(
Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable
()
==
0
u
)))
if
((
Get_CAN_CH0_ID_111_Sig_ISG_Ready
()
==
0x01UL
)
||
((
Get_CAN_CH0_ID_111_Sig_ISG_Power
()
==
1u
)
&&
(
Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable
()
==
2u
))
||
((
Get_CAN_CH0_ID_111_Sig_ISG_Power
()
==
1u
)
&&
(
Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable
()
==
1
u
)))
{
{
LED_STATE
=
1u
;
LED_STATE
=
1u
;
}
}
...
...
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