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
ade3a199
Commit
ade3a199
authored
Jul 11, 2024
by
郑萍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:更改自检的bug,50982 【润通草地车】【数显自检】仪表数显自检时,显示有问题以及上传升级文档
parent
7eb49f99
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
30 deletions
+30
-30
SEG_DISPLAY.c
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
+21
-21
Sys_Scheduler_Lib.c
Firmware/Source/System/Sys_Scheduler_Lib.c
+6
-6
Sys_Scheduler_Lib.h
Firmware/Source/System/Sys_Scheduler_Lib.h
+1
-1
Sys_Task_List.c
Firmware/Source/System/Sys_Task_List.c
+2
-2
HaoJin232程序合成及诊断升级方法说明_2024.03.20.pdf
...utility/BootRelease/HaoJin232程序合成及诊断升级方法说明_2024.03.20.pdf
+0
-0
No files found.
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @
ade3a199
...
...
@@ -321,16 +321,16 @@ _Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag, uint8_t m_Gear, uint8_t checkself)
if
(
checkself
==
1
)
{
m8
=
SEG_DISPLAY_NUMBER0
[
m_Gear
];
if
(
m_Gear
==
8
)
{
IC2_SEG096
=
IC_SEG_ON
;
IC2_SEG142
=
IC_SEG_ON
;
}
else
{
IC2_SEG096
=
IC_SEG_OFF
;
IC2_SEG142
=
IC_SEG_OFF
;
}
//
if (m_Gear == 8)
//
{
//
IC2_SEG096 = IC_SEG_ON;
//
IC2_SEG142 = IC_SEG_ON;
//
}
//
else
//
{
//
IC2_SEG096 = IC_SEG_OFF;
//
IC2_SEG142 = IC_SEG_OFF;
//
}
if
(
Bit_Is_Set
(
m8
,
0
))
{
IC2_SEG148
=
IC_SEG_ON
;
...
...
@@ -2614,30 +2614,30 @@ void Checkself_SEG_Display(void)
uint16_t
hour
=
0
;
uint16_t
min
=
0
;
soc_all
=
(
Checkself_SEG_step
/
1
)
*
11
+
100
;
uint32_t
allhour
=
(
Checkself_SEG_step
/
1
)
*
11111
;
soc_all
=
(
Checkself_SEG_step
/
5
)
*
11
+
100
;
uint32_t
allhour
=
(
Checkself_SEG_step
/
5
)
*
11111
;
// Fuel = Checkself_SEG_step / 5u;
// SEG_SET_FuelDial(1, Fuel);
SEG_SET_EleDial_AllSOC
(
1
,
soc_all
);
SEG_SET_EleDial_2SOC
(
1
,
(
Checkself_SEG_step
/
1
)
+
1
);
SEG_SET_EleDial_1SOC
(
1
,
(
Checkself_SEG_step
/
1
)
+
1
);
SEG_SET_EleDial_2SOC
(
1
,
(
(
Checkself_SEG_step
*
10
)
/
45
)
);
SEG_SET_EleDial_1SOC
(
1
,
(
(
Checkself_SEG_step
*
10
)
/
45
)
);
SEG_SET_Clock_ALL
(
1
,
allhour
);
hour
=
(
Checkself_SEG_step
/
1
)
*
11
;
min
=
(
Checkself_SEG_step
/
1
)
*
11
;
hour
=
(
Checkself_SEG_step
/
5
)
*
11
;
min
=
(
Checkself_SEG_step
/
5
)
*
11
;
SEG_SET_Clock
(
hour
,
min
,
1
,
1
,
1
);
SEG_SET_GEAR
(
1
,
(
Checkself_SEG_step
/
1
),
1
);
SEG_SET_Cutterhead
(
1
,
(
Checkself_SEG_step
/
1
),
1
);
if
(
Checkself_SEG_step_count
<
2
0
)
SEG_SET_GEAR
(
1
,
(
Checkself_SEG_step
/
5
),
1
);
SEG_SET_Cutterhead
(
1
,
(
Checkself_SEG_step
/
5
),
1
);
if
(
Checkself_SEG_step_count
<
10
0
)
{
Checkself_SEG_step_count
++
;
}
else
{
Checkself_SEG_step_count
=
2
0
;
Checkself_SEG_step_count
=
10
0
;
}
if
(
Checkself_SEG_step_count
<
1
0
)
if
(
Checkself_SEG_step_count
<
5
0
)
{
Checkself_SEG_step
++
;
}
...
...
Firmware/Source/System/Sys_Scheduler_Lib.c
View file @
ade3a199
...
...
@@ -9,7 +9,7 @@ typedef struct
uint32_t
u32Task10msCnt
;
uint32_t
u32Task20msCnt
;
uint32_t
u32Task50msCnt
;
uint32_t
u32Task
7
5msCnt
;
uint32_t
u32Task
1
5msCnt
;
uint32_t
u32Task100msCnt
;
}
Sys_Scheduler_st_t
;
...
...
@@ -246,7 +246,7 @@ void Sys_Scheduler_Start(uint32_t u32SchCycle)
g_stSysScheduler
.
u32Task10msCnt
=
1UL
;
g_stSysScheduler
.
u32Task20msCnt
=
3UL
;
g_stSysScheduler
.
u32Task50msCnt
=
5UL
;
g_stSysScheduler
.
u32Task
75msCnt
=
6
UL
;
g_stSysScheduler
.
u32Task
15msCnt
=
2
UL
;
g_stSysScheduler
.
u32Task100msCnt
=
7UL
;
}
...
...
@@ -303,11 +303,11 @@ void Sys_Scheduling_Service(void)
Sys_50ms_Tasks
();
}
g_stSysScheduler
.
u32Task
7
5msCnt
+=
u32msDelta
;
if
(
g_stSysScheduler
.
u32Task
75msCnt
>=
7
5UL
)
g_stSysScheduler
.
u32Task
1
5msCnt
+=
u32msDelta
;
if
(
g_stSysScheduler
.
u32Task
15msCnt
>=
1
5UL
)
{
g_stSysScheduler
.
u32Task
75msCnt
%=
7
5UL
;
Sys_
7
5ms_Tasks
();
g_stSysScheduler
.
u32Task
15msCnt
%=
1
5UL
;
Sys_
1
5ms_Tasks
();
}
g_stSysScheduler
.
u32Task100msCnt
+=
u32msDelta
;
...
...
Firmware/Source/System/Sys_Scheduler_Lib.h
View file @
ade3a199
...
...
@@ -41,5 +41,5 @@ extern void Sys_5ms_Tasks(void);
extern
void
Sys_10ms_Tasks
(
void
);
extern
void
Sys_20ms_Tasks
(
void
);
extern
void
Sys_50ms_Tasks
(
void
);
extern
void
Sys_
7
5ms_Tasks
(
void
);
extern
void
Sys_
1
5ms_Tasks
(
void
);
extern
void
Sys_100ms_Tasks
(
void
);
Firmware/Source/System/Sys_Task_List.c
View file @
ade3a199
...
...
@@ -48,9 +48,9 @@ void Sys_50ms_Tasks(void)
Gauge_Service
();
}
void
Sys_
7
5ms_Tasks
(
void
)
void
Sys_
1
5ms_Tasks
(
void
)
{
if
(
checkself_seg_Flag
==
1
)
if
(
(
Common_GetIgnOnTime
()
<=
1500
)
&&
(
Common_GetIgnOnTime
()
>
0
)
&&
(
checkself_seg_Flag
==
1
)
)
{
Checkself_SEG_Display
();
// if (Checkself_SEG_step_count < 20)
...
...
Firmware/utility/BootRelease/HaoJin232程序合成及诊断升级方法说明_2024.03.20.pdf
0 → 100644
View file @
ade3a199
File added
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