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
51208c5e
Commit
51208c5e
authored
Jul 16, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:自检显示对段修改进入休眠时间改为5秒
parent
0fccac19
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
13 deletions
+18
-13
SEG_DISPLAY.c
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
+17
-12
PowerManag_user.c
Firmware/Source/Component/PowerManagement/PowerManag_user.c
+1
-1
No files found.
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @
51208c5e
...
...
@@ -564,7 +564,7 @@ _Fun_Res SEG_SET_EleDial_1SOC(uint8_t m_Flag, uint8_t m_SEG)
_Fun_Res
m_Res
;
uint8_t
Num
;
uint8_t
m8
;
if
((
m_Flag
==
1u
)
&&
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x18200A20_Msg
))
==
CAN_SIG_NORMAL
))
if
((
(
m_Flag
==
1u
)
&&
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x18200A20_Msg
))
==
CAN_SIG_NORMAL
))
||
(
checkself_seg_Flag
==
1
))
{
IC1_SEG136
=
IC_SEG_GREY
;
IC1_SEG137
=
IC_SEG_GREY
;
...
...
@@ -656,7 +656,7 @@ _Fun_Res SEG_SET_EleDial_2SOC(uint8_t m_Flag, uint8_t m_SEG)
_Fun_Res
m_Res
;
uint8_t
Num
;
uint8_t
m8
;
if
((
m_Flag
==
1u
)
&&
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x18200A21_Msg
))
==
CAN_SIG_NORMAL
))
if
((
(
m_Flag
==
1u
)
&&
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x18200A21_Msg
))
==
CAN_SIG_NORMAL
))
||
(
checkself_seg_Flag
==
1
))
{
IC1_SEG124
=
IC_SEG_ON
;
IC1_SEG123
=
IC_SEG_ON
;
...
...
@@ -2606,21 +2606,26 @@ void Checkself_SEG_Display(void)
uint16_t
Trip
=
0
;
uint16_t
hour
=
0
;
uint16_t
min
=
0
;
soc_all
=
(
Checkself_SEG_step
/
5
)
*
11
+
100
;
uint32_t
allhour
=
(
Checkself_SEG_step
/
5
)
*
11111
;
uint8_t
Checkself_num
=
((
Checkself_SEG_step
*
10
)
/
48
);
if
(
Checkself_num
>=
10
)
{
Checkself_num
=
9
;
}
uint32_t
allhour
=
Checkself_num
*
11111
;
// Fuel = Checkself_SEG_step / 5u;
// SEG_SET_FuelDial(1, Fuel);
uint32_t
EleDial_2SOC
=
((
Checkself_SEG_step
*
10
)
/
48
);
SEG_SET_EleDial_2SOC
(
1
,
EleDial_2SOC
);
SEG_SET_EleDial_1SOC
(
1
,
EleDial_2SOC
);
soc_all
=
Checkself_num
*
11
+
100
;
SEG_SET_EleDial_AllSOC
(
1
,
soc_all
);
SEG_SET_EleDial_2SOC
(
1
,
((
Checkself_SEG_step
*
10
)
/
45
));
SEG_SET_EleDial_1SOC
(
1
,
((
Checkself_SEG_step
*
10
)
/
45
));
SEG_SET_Clock_ALL
(
1
,
allhour
);
hour
=
(
Checkself_SEG_step
/
5
)
*
11
;
min
=
(
Checkself_SEG_step
/
5
)
*
11
;
hour
=
Checkself_num
*
11
;
min
=
Checkself_num
*
11
;
SEG_SET_Clock
(
hour
,
min
,
1
,
1
,
1
);
SEG_SET_GEAR
(
1
,
(
Checkself_SEG_step
/
5
)
,
1
);
SEG_SET_Cutterhead
(
1
,
(
Checkself_SEG_step
/
5
)
,
1
);
SEG_SET_GEAR
(
1
,
Checkself_num
,
1
);
SEG_SET_Cutterhead
(
1
,
Checkself_num
,
1
);
if
(
Checkself_SEG_step_count
<
100
)
{
Checkself_SEG_step_count
++
;
...
...
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @
51208c5e
...
...
@@ -165,7 +165,7 @@ static Power_Status_em Power_Stay_OFF(void)
}
else
{
if
((
Common_GetIgnOffTime
()
<
25
00
))
if
((
Common_GetIgnOffTime
()
<
50
00
))
{
u8PowerSts
=
EM_IGN_OFF
;
}
...
...
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