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
e9f41b5d
Commit
e9f41b5d
authored
Jul 10, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:修改can休眠唤醒条件和时间
parent
427770e1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
13 deletions
+9
-13
RMR42E.uvprojx
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx
+1
-1
CAN_CH0_CAN_Communication_Matrix.c
...ce/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
+2
-1
PowerManag_user.c
Firmware/Source/Component/PowerManagement/PowerManag_user.c
+3
-3
System_Monitor_User.c
...are/Source/Component/System_Monitor/System_Monitor_User.c
+3
-8
No files found.
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx
View file @
e9f41b5d
...
...
@@ -275,7 +275,7 @@
</OCR_RVCT3>
<OCR_RVCT4>
<Type>
1
</Type>
<StartAddress>
0x
800
0
</StartAddress>
<StartAddress>
0x0
</StartAddress>
<Size>
0x40000
</Size>
</OCR_RVCT4>
<OCR_RVCT5>
...
...
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
View file @
e9f41b5d
...
...
@@ -99,7 +99,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
{
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
,
0x00u
},
200ul
,
200
0
ul
,
0x125ul
,
((
void
*
)
0
),
(
System_Indicator_ON_callback
),
...
...
@@ -218,6 +218,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
();
}
if
(
CAN_MSG_Status
(
&
CAN_CH0_CanMsgOp
,
Co_Can_ConvertSubID_CAN_CH0
(
CAN_CH0_ID_CAN_0x339_Msg
))
==
CAN_ERR_OK
)
{
...
...
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @
e9f41b5d
...
...
@@ -69,7 +69,7 @@ static void Power_KL30_Init(void)
g_stRTCInformation
.
u8RTCMonth
=
1
;
g_stRTCInformation
.
u8RTCYear
=
20
;
RTE_RTC_Init
(
g_stRTCInformation
);
RTE_DEEPSLEEP_GPIO_Interrupt_Enable
(
KL15_AD_IN
,
Trigger_Rising
);
RTE_DEEPSLEEP_GPIO_Interrupt_Enable
(
CAN_MCU_RXD
,
Trigger_Rising
);
}
extern
uint32_t
PowerIgnOffTimeLine
;
...
...
@@ -91,7 +91,7 @@ static void Power_Wakeup_Init(void)
TimerM_PWM_CH_Output_init
(
TIMERM_COUNTER0
,
TIMERM_CHD
,
ActiveLevel_High
);
TimerM_PWM_CH_Output_init
(
TIMERM_COUNTER1
,
TIMERM_CHB
,
ActiveLevel_High
);
Telltales_Init
();
RTE_DEEPSLEEP_GPIO_Interrupt_Enable
(
KL15_AD_IN
,
Trigger_Rising
);
RTE_DEEPSLEEP_GPIO_Interrupt_Enable
(
CAN_MCU_RXD
,
Trigger_Rising
);
}
static
void
Power_LVP_Init
(
void
)
...
...
@@ -252,7 +252,7 @@ static Power_Status_em Power_Stay_Sleep(void)
while
(
1
)
{
RTE_WDT_Clear
();
if
(
RTE_GPIO_Get_Level
(
KL15_AD_IN
))
/* KL15 */
if
(
RTE_GPIO_Get_Level
(
CAN_MCU_RXD
))
/* KL15 */
{
u8PowerSts
=
EM_IGN_Wakeup
;
break
;
...
...
Firmware/Source/Component/System_Monitor/System_Monitor_User.c
View file @
e9f41b5d
...
...
@@ -105,18 +105,13 @@ monitorlib_uint8_t Sys_Read_KL15_Valid(void)
monitorlib_uint8_t
System_LINE_KL15
(
void
)
{
static
monitorlib_uint8_t
u8KL15
=
0
;
if
(
Sys_Read_KL15_Voltage
()
>=
5500u
)
if
(
Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode
()
!=
0x0
)
{
u8KL15
=
1u
;
}
else
if
((
Sys_Read_KL15_Voltage
()
>=
5000u
)
&&
(
Sys_Read_KL15_Voltage
()
<
5500u
))
{
;
}
else
{
u8KL15
=
0
;
u8KL15
=
0
u
;
}
return
u8KL15
;
}
...
...
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