Skip to content

R
RT_RMR42E
Commit 1ebd3cc5 authored by 耨义强's avatar 耨义强
Browse files
Options

✨ feat(修改段码显示):

parent 6249643f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 551 additions and 522 deletions
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @ 1ebd3cc5
...@@ -254,6 +254,32 @@ void Gauge_Service(void) ...@@ -254,6 +254,32 @@ void Gauge_Service(void)
Gauge_Trip_Display(); Gauge_Trip_Display();
Gauge_FuelDial_Display(); Gauge_FuelDial_Display();
Gauge_EspeedDial_Display(); Gauge_EspeedDial_Display();
SEG_SET_Clock(22,22,1,1,1);
SEG_SET_Fault_Code(1,2222);
SEG_SET_EleDial(1,10,22);
SEG_SET_FuelDial(1,8);
SEG_SET_GEAR(1,1);
SEG_SET_Cutterhead(1,2);
SEG_SET_LED_STS(0,1);
SEG_SET_LED_STS(1,1);
SEG_SET_LED_STS(2,1);
SEG_SET_LED_STS(3,1);
SEG_SET_LED_STS(4,1);
SEG_SET_LED_STS(5,1);
SEG_SET_LED_STS(6,1);
SEG_SET_LED_STS(7,1);
SEG_SET_LED_STS(8,1);
SEG_SET_LED_STS(9,1);
SEG_SET_LED_STS(10,1);
SEG_SET_LED_STS(11,1);
SEG_SET_LED_STS(12,1);
SEG_SET_LED_STS(13,1);
SEG_SET_LED_STS(14,1);
SEG_SET_LED_STS(15,1);
SEG_SET_LED_STS(16,1);
SEG_SET_LED_STS(17,1);
SEG_SET_LED_STS(18,1);
SEG_SET_Frame(1);
} }
else else
{ {
......
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @ 1ebd3cc5
...@@ -542,19 +542,19 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -542,19 +542,19 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
} }
if ( Bit_Is_Set(m8, 5) ) if ( Bit_Is_Set(m8, 5) )
{ {
IC1_SEG071 = IC_SEG_ON; IC1_SEG070 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG071 = IC_SEG_OFF; IC1_SEG070 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if ( Bit_Is_Set(m8, 4) )
{ {
IC1_SEG070 = IC_SEG_ON; IC1_SEG071 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG070 = IC_SEG_OFF; IC1_SEG071 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if ( Bit_Is_Set(m8, 6) )
{ {
...@@ -601,19 +601,19 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -601,19 +601,19 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
} }
if ( Bit_Is_Set(m8, 5) ) if ( Bit_Is_Set(m8, 5) )
{ {
IC1_SEG063 = IC_SEG_ON; IC1_SEG061 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG063 = IC_SEG_OFF; IC1_SEG061 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if ( Bit_Is_Set(m8, 4) )
{ {
IC1_SEG061 = IC_SEG_ON; IC1_SEG063 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG061 = IC_SEG_OFF; IC1_SEG063 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if ( Bit_Is_Set(m8, 6) )
{ {
...@@ -759,19 +759,19 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -759,19 +759,19 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
} }
if ( Bit_Is_Set(m8, 5) ) if ( Bit_Is_Set(m8, 5) )
{ {
IC1_SEG089 = IC_SEG_ON; IC1_SEG088 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG089 = IC_SEG_OFF; IC1_SEG088 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if ( Bit_Is_Set(m8, 4) )
{ {
IC1_SEG088 = IC_SEG_ON; IC1_SEG089 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG088 = IC_SEG_OFF; IC1_SEG089 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if ( Bit_Is_Set(m8, 6) )
{ {
...@@ -819,19 +819,19 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -819,19 +819,19 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
} }
if ( Bit_Is_Set(m8, 5) ) if ( Bit_Is_Set(m8, 5) )
{ {
IC1_SEG096 = IC_SEG_ON; IC1_SEG095 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG096 = IC_SEG_OFF; IC1_SEG095 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if ( Bit_Is_Set(m8, 4) )
{ {
IC1_SEG095 = IC_SEG_ON; IC1_SEG096 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG095 = IC_SEG_OFF; IC1_SEG096 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if ( Bit_Is_Set(m8, 6) )
{ {
...@@ -878,19 +878,19 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -878,19 +878,19 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
} }
if ( Bit_Is_Set(m8, 5) ) if ( Bit_Is_Set(m8, 5) )
{ {
IC1_SEG103 = IC_SEG_ON; IC1_SEG102 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG103 = IC_SEG_OFF; IC1_SEG102 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if ( Bit_Is_Set(m8, 4) )
{ {
IC1_SEG102 = IC_SEG_ON; IC1_SEG103 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG102 = IC_SEG_OFF; IC1_SEG103 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if ( Bit_Is_Set(m8, 6) )
{ {
...@@ -937,19 +937,19 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -937,19 +937,19 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
} }
if ( Bit_Is_Set(m8, 5) ) if ( Bit_Is_Set(m8, 5) )
{ {
IC1_SEG111 = IC_SEG_ON; IC1_SEG109 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG111 = IC_SEG_OFF; IC1_SEG109 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if ( Bit_Is_Set(m8, 4) )
{ {
IC1_SEG109 = IC_SEG_ON; IC1_SEG111 = IC_SEG_ON;
} }
else else
{ {
IC1_SEG109 = IC_SEG_OFF; IC1_SEG111 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if ( Bit_Is_Set(m8, 6) )
{ {
...@@ -2448,19 +2448,19 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2448,19 +2448,19 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
} }
if ( Bit_Is_Set(m8, 5) ) if ( Bit_Is_Set(m8, 5) )
{ {
IC2_SEG039 = IC_SEG_ON; IC2_SEG037 = IC_SEG_ON;
} }
else else
{ {
IC2_SEG039 = IC_SEG_OFF; IC2_SEG037 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if ( Bit_Is_Set(m8, 4) )
{ {
IC2_SEG037 = IC_SEG_ON; IC2_SEG039 = IC_SEG_ON;
} }
else else
{ {
IC2_SEG037 = IC_SEG_OFF; IC2_SEG039 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if ( Bit_Is_Set(m8, 6) )
{ {
...@@ -2506,19 +2506,19 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2506,19 +2506,19 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
} }
if ( Bit_Is_Set(m8, 5) ) if ( Bit_Is_Set(m8, 5) )
{ {
IC2_SEG081 = IC_SEG_ON; IC2_SEG034 = IC_SEG_ON;
} }
else else
{ {
IC2_SEG081 = IC_SEG_OFF; IC2_SEG034 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if ( Bit_Is_Set(m8, 4) )
{ {
IC2_SEG034 = IC_SEG_ON; IC2_SEG081 = IC_SEG_ON;
} }
else else
{ {
IC2_SEG034 = IC_SEG_OFF; IC2_SEG081 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if ( Bit_Is_Set(m8, 6) )
{ {
...@@ -2584,19 +2584,19 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2584,19 +2584,19 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
} }
if ( Bit_Is_Set(m8, 5) ) if ( Bit_Is_Set(m8, 5) )
{ {
IC2_SEG086 = IC_SEG_ON; IC2_SEG031 = IC_SEG_ON;
} }
else else
{ {
IC2_SEG086 = IC_SEG_OFF; IC2_SEG031 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if ( Bit_Is_Set(m8, 4) )
{ {
IC2_SEG031 = IC_SEG_ON; IC2_SEG086 = IC_SEG_ON;
} }
else else
{ {
IC2_SEG031 = IC_SEG_OFF; IC2_SEG086 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if ( Bit_Is_Set(m8, 6) )
{ {
...@@ -2642,19 +2642,19 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2642,19 +2642,19 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
} }
if ( Bit_Is_Set(m8, 5) ) if ( Bit_Is_Set(m8, 5) )
{ {
IC2_SEG090 = IC_SEG_ON; IC2_SEG028 = IC_SEG_ON;
} }
else else
{ {
IC2_SEG090 = IC_SEG_OFF; IC2_SEG028 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if ( Bit_Is_Set(m8, 4) )
{ {
IC2_SEG028 = IC_SEG_ON; IC2_SEG090 = IC_SEG_ON;
} }
else else
{ {
IC2_SEG028 = IC_SEG_OFF; IC2_SEG090 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if ( Bit_Is_Set(m8, 6) )
{ {
......
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.h
View file @ 1ebd3cc5
...@@ -73,6 +73,9 @@ _Fun_Res SEG_SET_ODO_NUM(uint8_t m_Flag,uint32_t m_NUM); ...@@ -73,6 +73,9 @@ _Fun_Res SEG_SET_ODO_NUM(uint8_t m_Flag,uint32_t m_NUM);
/**@brief 小计里程显示函数*/ /**@brief 小计里程显示函数*/
_Fun_Res SEG_SET_TRIP_NUM(uint8_t m_Flag,uint16_t m_NUM); _Fun_Res SEG_SET_TRIP_NUM(uint8_t m_Flag,uint16_t m_NUM);
/**@brief 故障码显示函数*/
_Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM);
/**@brief 时间显示函数*/ /**@brief 时间显示函数*/
_Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t m_Flag1, uint8_t m_Flag2 ); _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t m_Flag1, uint8_t m_Flag2 );
......
Firmware/Source/System/Sys_Task_List.c
View file @ 1ebd3cc5
...@@ -62,9 +62,9 @@ void Sys_50ms_Tasks(void) ...@@ -62,9 +62,9 @@ void Sys_50ms_Tasks(void)
BU98R10_Update_Request(); BU98R10_Update_Request();
LED_Driver_Scan_Refresh(); LED_Driver_Scan_Refresh();
Telltales_Management(); Telltales_Management();
//Gauge_Service(); Gauge_Service();
// Key_Check_Service(); // Key_Check_Service();
SEG_SET_EleDial(1,10,10);
} }
uint8_t u8LEDDriverCheckCount = 0U; uint8_t u8LEDDriverCheckCount = 0U;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment