Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
TianYing_ty100
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
TY
TianYing_ty100
Commits
f5ccc98e
Commit
f5ccc98e
authored
Oct 08, 2024
by
陈家乐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:580外发计数不在IG_ON里初始化
parent
57efc3b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
Can_App.c
Firmware/Source/Application/CAN_User/Can_App.c
+1
-1
Can_User.c
Firmware/Source/Application/CAN_User/Can_User.c
+4
-0
PowerManag_user.c
Firmware/Source/Component/PowerManagement/PowerManag_user.c
+1
-0
No files found.
Firmware/Source/Application/CAN_User/Can_App.c
View file @
f5ccc98e
...
@@ -20,7 +20,7 @@ void CAN_TX_Flag_Init(void)
...
@@ -20,7 +20,7 @@ void CAN_TX_Flag_Init(void)
void
CAN_TX_Count_Init
(
void
)
void
CAN_TX_Count_Init
(
void
)
{
{
//CAN_TX_Count = 0;
//CAN_TX_Count = 0;
CAN_Send_Cound
=
0
;
//
CAN_Send_Cound = 0;
if
(
AliveCount_KL30_ResettingFlag
>
0
)
if
(
AliveCount_KL30_ResettingFlag
>
0
)
{
{
AliveCount_KL30_ResettingFlag
=
0
;
AliveCount_KL30_ResettingFlag
=
0
;
...
...
Firmware/Source/Application/CAN_User/Can_User.c
View file @
f5ccc98e
...
@@ -13,6 +13,7 @@ uint8_t CAN_Send_Cound = 0;
...
@@ -13,6 +13,7 @@ uint8_t CAN_Send_Cound = 0;
void
Can_Init
(
void
)
void
Can_Init
(
void
)
{
{
CAN_Send_Cound
=
0
;
CAN_TX_Count_Init
();
CAN_TX_Count_Init
();
can_config_st_t
Can_Config
;
can_config_st_t
Can_Config
;
Can_Config
.
ch
=
CAN_CH_0
;
Can_Config
.
ch
=
CAN_CH_0
;
...
@@ -325,6 +326,7 @@ void Can_BusOff_Recover(uint8_t deltaTime)
...
@@ -325,6 +326,7 @@ void Can_BusOff_Recover(uint8_t deltaTime)
{
{
CanRxInitflag
=
1
;
CanRxInitflag
=
1
;
CAN_TX_Count_Init
();
CAN_TX_Count_Init
();
CAN_Send_Cound
=
0
;
if
(
RSCAN0Busoff
.
Status
==
RSCAN0_BUS_STABLE
)
if
(
RSCAN0Busoff
.
Status
==
RSCAN0_BUS_STABLE
)
{
{
RSCAN0Busoff
.
Status
=
RSCAN0_BUS_OFF_LV1
;
RSCAN0Busoff
.
Status
=
RSCAN0_BUS_OFF_LV1
;
...
@@ -347,6 +349,7 @@ void Can_BusOff_Recover(uint8_t deltaTime)
...
@@ -347,6 +349,7 @@ void Can_BusOff_Recover(uint8_t deltaTime)
}
}
//需调用CAN中止函数,中止所有硬件buf内要发送的数据
//需调用CAN中止函数,中止所有硬件buf内要发送的数据
CAN_TX_Count_Init
();
CAN_TX_Count_Init
();
CAN_Send_Cound
=
0
;
Can_QuickTimer_Init
();
Can_QuickTimer_Init
();
reset_busoff
(
CAN_CH_0
);
reset_busoff
(
CAN_CH_0
);
}
}
...
@@ -360,6 +363,7 @@ void Can_BusOff_Recover(uint8_t deltaTime)
...
@@ -360,6 +363,7 @@ void Can_BusOff_Recover(uint8_t deltaTime)
RSCAN0Busoff
.
Timer
=
0U
;
RSCAN0Busoff
.
Timer
=
0U
;
//需调用CAN中止函数,中止所有硬件buf内要发送的数据
//需调用CAN中止函数,中止所有硬件buf内要发送的数据
CAN_TX_Count_Init
();
CAN_TX_Count_Init
();
CAN_Send_Cound
=
0
;
Can_QuickTimer_Init
();
Can_QuickTimer_Init
();
reset_busoff
(
CAN_CH_0
);
reset_busoff
(
CAN_CH_0
);
}
}
...
...
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @
f5ccc98e
...
@@ -108,6 +108,7 @@ static void Power_KL30_Init(void)
...
@@ -108,6 +108,7 @@ static void Power_KL30_Init(void)
extern
uint32_t
PowerIgnOffTimeLine
;
extern
uint32_t
PowerIgnOffTimeLine
;
static
void
Power_Wakeup_Init
(
void
)
static
void
Power_Wakeup_Init
(
void
)
{
{
CAN_Send_Cound
=
0
;
PowerIgnOffTimeLine
=
0
;
PowerIgnOffTimeLine
=
0
;
//RTE_CLOCK_Select_Start();
//RTE_CLOCK_Select_Start();
Gpio_Init
(
Gpio_WakeUp_Init
);
Gpio_Init
(
Gpio_WakeUp_Init
);
...
...
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