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
3c0c38e7
Commit
3c0c38e7
authored
Jul 12, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:系统指示灯点亮关窗关灯问题
parent
802a846d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
6 deletions
+15
-6
CAN_CH0_CAN_Communication_Matrix.c
...ce/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
+10
-2
Can_RX_User.c
Firmware/Source/Application/CAN_User/Can_RX_User.c
+1
-1
CommonInterface.c
...ware/Source/Application/CommonInterface/CommonInterface.c
+1
-1
GUI_Display.h
Firmware/Source/Application/GUI_Display/GUI_Display.h
+1
-0
Telltales_user.c
Firmware/Source/Component/Telltales/Telltales_user.c
+2
-2
No files found.
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
View file @
3c0c38e7
...
...
@@ -136,13 +136,21 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
((
void
*
)
0
),
},
};
void
System_Indicator_ON_callback
(
canlib_uint8_t
CopyData
[])
void
System_Indicator_ON_callback
(
canlib_uint8_t
CopyData
[])
{
System_Indicator_CANFlag
=
0
;
}
void
System_Indicator_OFF_callback
(
canlib_uint8_t
CopyData
[])
void
System_Indicator_OFF_callback
(
canlib_uint8_t
CopyData
[])
{
System_Indicator_CANFlag
=
1
;
uint8_t
i
=
0
;
BUZZER_Init
();
poweroff_time
=
0
;
Clear_Bu98
();
for
(
i
=
0
;
i
<
LampCh0_MAX
;
i
++
)
{
LED_Driver_Channel_Set
(
LampChannel_0
,
i
,
LED_OFF
);
}
}
uint8_t
Get_CAN_CH0_ID_398_Sig_ICU_SN0
(
void
)
...
...
Firmware/Source/Application/CAN_User/Can_RX_User.c
View file @
3c0c38e7
...
...
@@ -85,7 +85,7 @@ void Set_CAN_ALL_Signal(void)
else
{
MMCU_SeatDetectState
=
Get_CAN_CH0_ID_125_Sig_MMCU_SeatDetectState
();
// 掉线需要做处理
//
MMCU_PowerMode = Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode();
MMCU_PowerMode
=
Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode
();
}
if
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x339_Msg
))
==
CAN_ERR_OK
)
{
...
...
Firmware/Source/Application/CommonInterface/CommonInterface.c
View file @
3c0c38e7
...
...
@@ -70,7 +70,7 @@ void Common_Input_Para(void)
Common_Set_IG_Sts
(
COMMON_POWER_ON
);
Common_Set_IG_Sts_Valid
(
COMMON_Valid
);
PowerIgnOffTimeLine
=
0ul
;
PowerIgnOnTimeLine
=
1
600
ul
;
PowerIgnOnTimeLine
=
1
501
ul
;
}
else
{
...
...
Firmware/Source/Application/GUI_Display/GUI_Display.h
View file @
3c0c38e7
...
...
@@ -39,6 +39,7 @@ typedef struct
extern
uint8_t
BUZZER_ON
;
extern
uint8_t
Charge_OFF_Flag
;
extern
uint8_t
EEPROM_Cumulativee_clean
;
extern
uint16_t
poweroff_time
;
void
Gauge_Power_SOC_pull_Display
(
void
);
// void Gauge_Power_2_SOC_Display(void);
...
...
Firmware/Source/Component/Telltales/Telltales_user.c
View file @
3c0c38e7
...
...
@@ -478,7 +478,7 @@ static Tellib_uint16_t LED_GEAR_Judgement(void)
Tellib_uint16_t
LED_STATE
=
0u
;
Tellib_uint8_t
Signal1
=
Get_CAN_Num_MMCU_TravelSpeedGear
();
Tellib_uint8_t
Signal2
=
Get_CAN_Num_MMCU_ParkingGearState
();
if
((
Signal2
!=
0x1
)
&&
(
Charge_OFF_Flag
==
0
))
if
((
Signal2
!=
0x1
)
&&
(
Charge_OFF_Flag
==
0
)
&&
(
System_Indicator_CANFlag
!=
1
)
)
{
if
((
Signal1
==
0x1
)
||
(
Signal1
==
0x2
))
{
...
...
@@ -489,7 +489,7 @@ static Tellib_uint16_t LED_GEAR_Judgement(void)
LED_STATE
=
0
;
}
}
else
if
(
Charge_OFF_Flag
==
0
)
else
if
(
(
Charge_OFF_Flag
==
0
)
&&
(
System_Indicator_CANFlag
!=
1
)
)
{
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