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
8cbb3659
Commit
8cbb3659
authored
Mar 03, 2025
by
zhengyuan.bai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix: 完善段码显示
parent
7c8fb4d6
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
215 additions
and
76 deletions
+215
-76
GUI_Display.c
Firmware/Source/Application/GUI_Display/GUI_Display.c
+24
-1
GUI_Display.h
Firmware/Source/Application/GUI_Display/GUI_Display.h
+2
-0
SEG_DISPLAY.c
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
+187
-73
SEG_DISPLAY.h
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.h
+2
-2
No files found.
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @
8cbb3659
...
@@ -59,7 +59,7 @@ void Gauge_Cutterhead_Gear_Display(void)
...
@@ -59,7 +59,7 @@ void Gauge_Cutterhead_Gear_Display(void)
{
{
uint8_t
CutterheadValue
=
Get_Gear_Cutterhead_Value
();
uint8_t
CutterheadValue
=
Get_Gear_Cutterhead_Value
();
uint8_t
CutterheadValid
=
Get_Gear_Cutterhead_Valid
();
uint8_t
CutterheadValid
=
Get_Gear_Cutterhead_Valid
();
#if (PART_NUMBER == RMR42E_60)
if
(
CutterheadValid
==
2U
)
if
(
CutterheadValid
==
2U
)
{
{
if
(
FLASH_SYNC_1Hz
)
if
(
FLASH_SYNC_1Hz
)
...
@@ -75,6 +75,9 @@ void Gauge_Cutterhead_Gear_Display(void)
...
@@ -75,6 +75,9 @@ void Gauge_Cutterhead_Gear_Display(void)
{
{
SEG_SET_Cutterhead
(
CutterheadValid
,
CutterheadValue
,
0
);
SEG_SET_Cutterhead
(
CutterheadValid
,
CutterheadValue
,
0
);
}
}
#else
SEG_SET_Cutterhead
(
CutterheadValid
,
CutterheadValue
,
0
);
#endif
}
}
void
Gauge_Gears_Display
(
void
)
void
Gauge_Gears_Display
(
void
)
...
@@ -135,6 +138,20 @@ void Gauge_Frame_Display(void)
...
@@ -135,6 +138,20 @@ void Gauge_Frame_Display(void)
}
}
}
}
void
Gauge_flue_Display
(
void
)
{
uint8_t
u8fuelValid
=
Get_FuelStatus_Valid
();
uint8_t
u8fuelValue
=
Get_FuelSeg_Display
();
SEG_SET_FuelDial
(
u8fuelValid
,
u8fuelValue
);
}
void
Gauge_faultcode_Display
(
void
)
{
uint8_t
u8faucodeValid
=
Get_FaultCode_Valid
();
uint8_t
u8faucodelValue
=
Get_FaultCode_Value
();
SEG_SET_Fault_Code
(
u8faucodeValid
,
u8faucodelValue
);
}
void
Clear_Bu98
(
void
)
void
Clear_Bu98
(
void
)
{
{
uint8_t
i
=
0
;
uint8_t
i
=
0
;
...
@@ -224,6 +241,12 @@ void Gauge_CAN_setup_Service(void)
...
@@ -224,6 +241,12 @@ void Gauge_CAN_setup_Service(void)
Gauge_Clock_Display
();
Gauge_Clock_Display
();
Gauge_Clock_All_Display
();
Gauge_Clock_All_Display
();
Gauge_EleDial_AllSOC_Display
();
Gauge_EleDial_AllSOC_Display
();
if
(
PART_NUMBER
==
G54_A01
)
{
Gauge_flue_Display
();
Gauge_faultcode_Display
();
}
// SEG_SET_GEAR(1, 1);
// SEG_SET_GEAR(1, 1);
// SEG_SET_Cutterhead(1, 2);
// SEG_SET_Cutterhead(1, 2);
Gauge_Frame_Display
();
Gauge_Frame_Display
();
...
...
Firmware/Source/Application/GUI_Display/GUI_Display.h
View file @
8cbb3659
...
@@ -51,6 +51,8 @@ void Gauge_EleDial_AllSOC_Display(void);
...
@@ -51,6 +51,8 @@ void Gauge_EleDial_AllSOC_Display(void);
void
Gauge_Cutterhead_Gear_Display
(
void
);
void
Gauge_Cutterhead_Gear_Display
(
void
);
void
Gauge_Gears_Display
(
void
);
void
Gauge_Gears_Display
(
void
);
void
Gauge_Service
(
void
);
void
Gauge_Service
(
void
);
void
Gauge_flue_Display
(
void
);
void
Gauge_faultcode_Display
(
void
);
void
Gauge_CAN_setup_Service
(
void
);
void
Gauge_CAN_setup_Service
(
void
);
void
Checkself_LED_Display
(
void
);
void
Checkself_LED_Display
(
void
);
...
...
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @
8cbb3659
This diff is collapsed.
Click to expand it.
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.h
View file @
8cbb3659
...
@@ -63,8 +63,8 @@ _Fun_Res SEG_SET_EleDial_2SOC(uint8_t m_Flag,uint8_t m_SEG);
...
@@ -63,8 +63,8 @@ _Fun_Res SEG_SET_EleDial_2SOC(uint8_t m_Flag,uint8_t m_SEG);
/**@brief 电量表盘AllSOC显示函数*/
/**@brief 电量表盘AllSOC显示函数*/
_Fun_Res
SEG_SET_EleDial_AllSOC
(
uint8_t
m_Flag
,
uint16_t
m_NUM
);
_Fun_Res
SEG_SET_EleDial_AllSOC
(
uint8_t
m_Flag
,
uint16_t
m_NUM
);
/
/ /
**@brief 燃油表盘显示函数*/
/**@brief 燃油表盘显示函数*/
//
_Fun_Res SEG_SET_FuelDial(uint8_t m_Flag,uint8_t m_SEG);
_Fun_Res
SEG_SET_FuelDial
(
uint8_t
m_Flag
,
uint8_t
m_SEG
);
/**@brief 转速表盘显示函数*/
/**@brief 转速表盘显示函数*/
//_Fun_Res SEG_SET_EspeedDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM);
//_Fun_Res SEG_SET_EspeedDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM);
...
...
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