Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
RT_RMR42E
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
时昊
RT_RMR42E
Commits
2bd3900f
Commit
2bd3900f
authored
Jul 09, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:累计时间存储逻辑以及零件版本号修改
parent
d2c69af1
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
38 deletions
+26
-38
RMR42E.uvguix.Administrator
...t/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvguix.Administrator
+20
-20
GUI_Display.c
Firmware/Source/Application/GUI_Display/GUI_Display.c
+4
-16
UDS_ISO14229_Services.c
Firmware/Source/UDS/UDS_ISO14229_Services.c
+2
-2
No files found.
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvguix.Administrator
View file @
2bd3900f
This diff is collapsed.
Click to expand it.
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @
2bd3900f
...
...
@@ -233,31 +233,19 @@ uint8_t Get_Clockonetime_lenth(void)
}
uint16_t
EEPROM_Write_Time
=
0
;
uint8_t
EEPROM_Cumulativee_clean
=
0
;
void
Data_CumulativeWorkHours_EEPROM_Write
(
void
)
{
uint32_t
u32Data
[
1
]
=
{
0
};
uint32_t
eeprom_back
[
1
]
=
{
0
};
if
(
Common_Get_IG_Sts
()
==
COMMON_POWER_ON
&&
Charge_OFF_Flag
==
0
)
{
u32Data
[
0
]
=
Get_CAN_Num_MMCU_AccumulatedWorkHours
();
if
(
u32Data
[
0
]
>
0XFFFA
&&
EEPROM_Cumulativee_clean
==
0
)
if
(
++
EEPROM_Write_Time
>
6000
)
// 一分钟存一次
{
EEPROM_Cumulativee_clean
=
1
;
eeprom_WriteRecord
(
EEPROM_BLOCK_00
,
(
uint8_t
*
)
eeprom_back
,
4
);
u32Data
[
0
]
=
0
;
EEPROM_Write_Time
=
0
;
}
eeprom_ReadRecord
(
EEPROM_BLOCK_00
,
(
uint8_t
*
)
eeprom_back
,
4
);
if
(
EEPROM_Write_Time
==
0
)
{
if
(
u32Data
[
0
]
>=
eeprom_back
[
0
])
{
eeprom_WriteRecord
(
EEPROM_BLOCK_00
,
(
uint8_t
*
)
u32Data
,
4
);
}
}
if
(
++
EEPROM_Write_Time
>
6000
)
// 一分钟存一次
{
EEPROM_Write_Time
=
0
;
eeprom_WriteRecord
(
EEPROM_BLOCK_00
,
(
uint8_t
*
)
u32Data
,
4
);
}
}
else
...
...
@@ -316,7 +304,7 @@ void Clear_Bu98(void)
void
Gauge_Service
(
void
)
{
uint8_t
i
=
0
;
if
(
Common_Get_IG_Sts
()
==
COMMON_POWER_ON
)
if
(
Common_Get_IG_Sts
()
==
COMMON_POWER_ON
)
{
if
(
Get_CAN_Power_State
()
!=
PKEY_ON
)
{
...
...
Firmware/Source/UDS/UDS_ISO14229_Services.c
View file @
2bd3900f
...
...
@@ -27,8 +27,8 @@ extern void UDS_Service_Response(uint8_t si, uint8_t RspType, uint16_t A_TA_type
/*诊断使用, 判断App一致性, 禁止修改(内部版本号除外)*/
extern
const
ProjectInfoStruct
ProjectInfo
__attribute__
((
section
(
".ARM.__at_0x00007800"
)))
=
{
"RMR42E"
,
//
豪进232
"R
YB-1
"
,
"RMR42E"
,
//
润通RMR42E
"R
MR42E-60
"
,
"BAT32A139KK64FB"
,
// 中微芯片
{
"CAN_STD"
,
...
...
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