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
0552f959
Commit
0552f959
authored
Jul 09, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:刀盘开关和档位要在ready下才能开启
parent
4725c32f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
GUI_Display.c
Firmware/Source/Application/GUI_Display/GUI_Display.c
+1
-1
Telltales_user.c
Firmware/Source/Component/Telltales/Telltales_user.c
+3
-3
No files found.
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @
0552f959
...
...
@@ -30,7 +30,7 @@ void Gauge_Cutterhead_Gear_Display(void)
uint8_t
Signal1
=
Get_CAN_Num_BMCU_BladeSpeedGear
();
uint8_t
Signal2
=
Get_CAN_Num_BMCU_ErrorGrage
();
// uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
if
(
Common_Get_IG_Sts
()
==
COMMON_POWER_ON
&&
Charge_OFF_Flag
==
0
)
if
(
(
Common_Get_IG_Sts
()
==
COMMON_POWER_ON
)
&&
(
Charge_OFF_Flag
==
0
)
&&
(
Get_CAN_Power_State
()
==
READY
)
)
{
if
(
Signal2
==
0x1
||
Signal2
==
0x2
||
Signal2
==
0x3
||
Signal2
==
0x4
)
{
...
...
Firmware/Source/Component/Telltales/Telltales_user.c
View file @
0552f959
...
...
@@ -450,7 +450,7 @@ static Tellib_uint16_t LED_Cutterhead_Switch_Judgement(void)
{
Tellib_uint16_t
LED_STATE
=
0u
;
Tellib_uint8_t
Signal1
=
Get_CAN_Num_BMCU_PTOSwicthState
();
if
(
Signal1
==
0x1
&&
openLED_flag
)
if
(
Signal1
==
0x1
&&
openLED_flag
&&
(
Get_CAN_Power_State
()
==
READY
)
)
{
LED_STATE
=
1
;
}
...
...
@@ -730,7 +730,7 @@ static Tellib_uint16_t LED_Cutterhead_Gear_Judgement(void)
Tellib_uint16_t
LED_STATE
=
0u
;
Tellib_uint8_t
Signal1
=
Get_CAN_Num_BMCU_BladeSpeedGear
();
Tellib_uint8_t
Signal2
=
Get_CAN_Num_BMCU_ErrorGrage
();
if
((
Signal2
==
0x1
||
Signal2
==
0x2
||
Signal2
==
0x3
||
Signal2
==
0x4
)
&&
openLED_flag
)
if
((
Signal2
==
0x1
||
Signal2
==
0x2
||
Signal2
==
0x3
||
Signal2
==
0x4
)
&&
openLED_flag
&&
(
Get_CAN_Power_State
()
==
READY
)
)
{
if
(
Signal1
==
0x1
||
Signal1
==
0x2
||
Signal1
==
0x3
)
{
...
...
@@ -741,7 +741,7 @@ static Tellib_uint16_t LED_Cutterhead_Gear_Judgement(void)
LED_STATE
=
0
;
}
}
else
if
(
Signal2
==
0x0
&&
openLED_flag
)
else
if
(
Signal2
==
0x0
&&
openLED_flag
&&
(
Get_CAN_Power_State
()
==
READY
)
)
{
if
(
Signal1
==
0x1
||
Signal1
==
0x2
||
Signal1
==
0x3
)
{
...
...
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