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
f24d9531
Commit
f24d9531
authored
Jul 15, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:欠压保护和过压保护显示问题和恢复后自检问题
parent
0f64c82a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
9 deletions
+12
-9
CommonInterface.c
...ware/Source/Application/CommonInterface/CommonInterface.c
+3
-2
CommonInterface.h
...ware/Source/Application/CommonInterface/CommonInterface.h
+1
-1
PowerManag_user.c
Firmware/Source/Component/PowerManagement/PowerManag_user.c
+6
-4
System_Monitor_User.c
...are/Source/Component/System_Monitor/System_Monitor_User.c
+2
-2
No files found.
Firmware/Source/Application/CommonInterface/CommonInterface.c
View file @
f24d9531
...
...
@@ -10,7 +10,7 @@ static uint32_t PowerSocTimeLine;
static
COMMON_PowerStatus_t
PowerSts
;
/*1 ON ; 0 OFF*/
static
DataValid_t
PowerSts_Valid
;
uint8_t
Power_Stay_Flag
=
0
;
// static uint16_t u16SelfCheckTime;
/*每次唤醒调用*/
void
Common_DataInit
(
void
)
...
...
@@ -82,9 +82,10 @@ void Common_Input_Para(void)
Common_Set_IG_Sts
(
COMMON_POWER_OFF
);
Common_Set_IG_Sts_Valid
(
COMMON_Valid
);
}
if
((
Get_CAN_Power_State
()
==
PKEY_ON
))
if
((
Get_CAN_Power_State
()
==
PKEY_ON
)
||
(
Power_Stay_Flag
==
1
)
)
{
PowerIgnOnTimeLine
=
0ul
;
Power_Stay_Flag
=
0
;
}
}
else
...
...
Firmware/Source/Application/CommonInterface/CommonInterface.h
View file @
f24d9531
...
...
@@ -72,7 +72,7 @@ extern void Common_Set_Disp_V_Speed_Valid(DataValid_t Val);
// extern uint16_t Common_Get_DispSpeed(void);
extern
uint32_t
Common_GetIgnOnTime
(
void
);
/*ms*/
extern
uint32_t
Common_GetIgnOffTime
(
void
);
/*ms*/
extern
uint8_t
Power_Stay_Flag
;
#endif
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @
f24d9531
...
...
@@ -199,6 +199,11 @@ static Power_Status_em Power_Stay_Protect(void)
{
RTE_WDT_Clear
();
Gen_TimeDelay
(
2000u
,
50u
);
BU98R10_Shutdown
(
);
TimerM_PWM_set_duty
(
TIMERM_COUNTER1
,
TIMERM_CHB
,
0
);
TimerM_PWM_set_duty
(
TIMERM_COUNTER0
,
TIMERM_CHD
,
1000
);
RTE_GPIO_Set_Level
(
RTE_GPIO_PORT04_PIN01
,
RTE_GPIO_LEVEL_LOW
);
// OUT_EN_1
CAN_TX_SetEnable
(
&
CAN_CH0_CanMsgTxOp
,
CAN_N_TX_Disable
);
for
(
LED
=
0u
;
LED
<
LampCh0_MAX
;
LED
++
)
{
LED_Driver_Channel_Set
(
0u
,
LED
,
0u
);
...
...
@@ -236,12 +241,9 @@ static Power_Status_em Power_Stay_Protect(void)
}
BU98R10_Init
(
);
CAN_TX_SetEnable
(
&
CAN_CH0_CanMsgTxOp
,
CAN_N_TX_Enable
);
Power_Stay_Flag
=
1
;
return
u8PowerSts
;
}
if
(
SYS_OPR_STAT_IGN_OFF
)
{
break
;
}
}
}
...
...
Firmware/Source/Component/System_Monitor/System_Monitor_User.c
View file @
f24d9531
...
...
@@ -10,8 +10,8 @@
#define u16ENTER_LOW_Y_RANGE 9000U
#define u16EXIT_LOW_Y_RANGE 10000U
#define u16EXIT_HIGH_Y_RANGE 16
0
00U
#define u16ENTER_HIGH_Y_RANGE 1
65
00U
#define u16EXIT_HIGH_Y_RANGE 16
5
00U
#define u16ENTER_HIGH_Y_RANGE 1
70
00U
#define u16EXIT_HIGH_N_RANGE 17500U
#define u16ENTER_HIGH_N_RANGE 18000U
#define u16Top_Vol 0xffffu
...
...
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