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
2f3d6ec5
Commit
2f3d6ec5
authored
Jul 26, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:125无效值开窗问题,以及档位指示灯点亮问题,并将大于6的电源信号都定义为无效值
parent
f0dbf732
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
Can_RX_User.c
Firmware/Source/Application/CAN_User/Can_RX_User.c
+1
-3
GUI_Display.c
Firmware/Source/Application/GUI_Display/GUI_Display.c
+15
-1
Telltales_user.c
Firmware/Source/Component/Telltales/Telltales_user.c
+1
-1
No files found.
Firmware/Source/Application/CAN_User/Can_RX_User.c
View file @
2f3d6ec5
...
...
@@ -241,10 +241,8 @@ uint8_t Get_CAN_Power_State(void)
case
0x6
:
state
=
CHRGEND
;
break
;
case
0x7
:
state
=
POWER_CHECK_NULL
;
break
;
default:
state
=
POWER_CHECK_NULL
;
break
;
}
return
state
;
...
...
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @
2f3d6ec5
...
...
@@ -489,6 +489,20 @@ void Gauge_Service(void)
Buzzer_time
++
;
}
}
else
{
if
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x125_Msg
))
==
CAN_SIG_NORMAL
)
{
BUZZER_Init
();
poweroff_time
=
0
;
Clear_Bu98
();
interact_PWM_Low_Duty
=
100
;
for
(
i
=
0
;
i
<
LampCh0_MAX
;
i
++
)
{
LED_Driver_Channel_Set
(
LampChannel_0
,
i
,
LED_OFF
);
}
}
}
}
else
{
...
...
@@ -500,7 +514,7 @@ void Gauge_Service(void)
{
LED_Driver_Channel_Set
(
LampChannel_0
,
i
,
LED_OFF
);
}
}
}
}
void
Gauge_CAN_setup_Service
(
void
)
...
...
Firmware/Source/Component/Telltales/Telltales_user.c
View file @
2f3d6ec5
...
...
@@ -471,7 +471,7 @@ static void LED_Cutterhead_Switch_Execution(Tellib_uint16_t led_status)
static
Tellib_uint16_t
LED_GEAR_Judgement
(
void
)
{
Tellib_uint16_t
LED_STATE
=
0u
;
if
((
Charge_OFF_Flag
==
0
)
&&
(
System_Indicator_CANFlag
!=
1
))
if
((
Charge_OFF_Flag
==
0
)
&&
(
System_Indicator_CANFlag
!=
1
)
&&
(
Get_CAN_Power_State
()
!=
POWER_CHECK_NULL
)
)
{
LED_STATE
=
1
;
}
...
...
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