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
b7b0698d
Commit
b7b0698d
authored
Jul 18, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:自检历程加上段码更新请求函数并更改时钟段码显示函数的bug,去掉过压保护debug的调试变量
parent
961622b2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
SEG_DISPLAY.c
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
+1
-3
System_Monitor_User.c
...are/Source/Component/System_Monitor/System_Monitor_User.c
+0
-2
Sys_Task_List.c
Firmware/Source/System/Sys_Task_List.c
+6
-1
No files found.
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @
b7b0698d
...
@@ -1876,7 +1876,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
...
@@ -1876,7 +1876,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
_Fun_Res
m_Res
;
_Fun_Res
m_Res
;
uint8_t
Num
;
uint8_t
Num
;
uint8_t
m8
;
uint8_t
m8
;
if
((
m_hour
>
=
99u
)
||
(
m_minute
>=
99u
)
||
(
m_icon
>
1u
)
||
(
m_Flag1
>
1u
)
||
(
m_Flag2
>
1u
))
if
((
m_hour
>
99u
)
||
(
m_minute
>
99u
)
||
(
m_icon
>
1u
)
||
(
m_Flag1
>
1u
)
||
(
m_Flag2
>
1u
))
{
{
m_Res
=
EX_ERR
;
m_Res
=
EX_ERR
;
}
}
...
@@ -2644,8 +2644,6 @@ void Checkself_SEG_Display(void)
...
@@ -2644,8 +2644,6 @@ void Checkself_SEG_Display(void)
if
(
Checkself_SEG_step
==
0
)
if
(
Checkself_SEG_step
==
0
)
{
{
Checkself_SEG_step
=
0
;
Checkself_SEG_step
=
0
;
SEG_SET_EleDial_2SOC
(
1
,
0
);
SEG_SET_EleDial_1SOC
(
1
,
0
);
}
}
else
else
{
{
...
...
Firmware/Source/Component/System_Monitor/System_Monitor_User.c
View file @
b7b0698d
...
@@ -59,7 +59,6 @@ static const monitorlib_uint16_t SysFun_Range [ 26u ] = {
...
@@ -59,7 +59,6 @@ static const monitorlib_uint16_t SysFun_Range [ 26u ] = {
2u
,
2u
,
0u
,
0u
,
};
};
monitorlib_uint16_t
u16Voltage_KL15
;
monitorlib_uint16_t
Sys_Read_KL30_Voltage_F
(
void
)
monitorlib_uint16_t
Sys_Read_KL30_Voltage_F
(
void
)
{
{
monitorlib_uint16_t
u16Voltage
;
monitorlib_uint16_t
u16Voltage
;
...
@@ -85,7 +84,6 @@ monitorlib_uint16_t Sys_Read_KL15_Voltage(void)
...
@@ -85,7 +84,6 @@ monitorlib_uint16_t Sys_Read_KL15_Voltage(void)
{
{
monitorlib_uint16_t
u16Voltage
;
monitorlib_uint16_t
u16Voltage
;
u16Voltage
=
(
monitorlib_uint16_t
)
ADC_Read_Signal
(
ADC_CH_KL15_VOLTAGE
);
u16Voltage
=
(
monitorlib_uint16_t
)
ADC_Read_Signal
(
ADC_CH_KL15_VOLTAGE
);
u16Voltage_KL15
=
(
monitorlib_uint16_t
)
ADC_Read_Signal
(
ADC_CH_KL15_VOLTAGE
);
return
u16Voltage
;
return
u16Voltage
;
}
}
...
...
Firmware/Source/System/Sys_Task_List.c
View file @
b7b0698d
...
@@ -41,17 +41,22 @@ void Sys_20ms_Tasks(void)
...
@@ -41,17 +41,22 @@ void Sys_20ms_Tasks(void)
void
Sys_50ms_Tasks
(
void
)
void
Sys_50ms_Tasks
(
void
)
{
{
BU98R10_Update_Request
();
LED_Driver_Scan_Refresh
();
LED_Driver_Scan_Refresh
();
Telltales_Management
();
Telltales_Management
();
Set_CAN_ALL_Signal
();
Set_CAN_ALL_Signal
();
Gauge_Service
();
Gauge_Service
();
if
((
Common_GetIgnOnTime
()
>
1500
))
{
BU98R10_Update_Request
();
}
}
}
void
Sys_15ms_Tasks
(
void
)
void
Sys_15ms_Tasks
(
void
)
{
{
if
((
Common_GetIgnOnTime
()
<=
1500
)
&&
(
Common_GetIgnOnTime
()
>
0
)
&&
(
checkself_seg_Flag
==
1
))
if
((
Common_GetIgnOnTime
()
<=
1500
)
&&
(
Common_GetIgnOnTime
()
>
0
)
&&
(
checkself_seg_Flag
==
1
))
{
{
BU98R10_Update_Request
();
Checkself_SEG_Display
();
Checkself_SEG_Display
();
}
}
}
}
...
...
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