Merge branch 'Bai_Zhengyuan' into 'dev'

段码补充

See merge request !25

Firmware/Source/Application/GUI_Display/GUI_Display.c

@@ -59,7 +59,7 @@ void Gauge_Cutterhead_Gear_Display(void)
 {
     uint8_t CutterheadValue = Get_Gear_Cutterhead_Value();
     uint8_t CutterheadValid = Get_Gear_Cutterhead_Valid();
-
+#if (PART_NUMBER == RMR42E_60)
     if (CutterheadValid == 2U)
     {
         if (FLASH_SYNC_1Hz)
@@ -75,6 +75,9 @@ void Gauge_Cutterhead_Gear_Display(void)
     {
         SEG_SET_Cutterhead(CutterheadValid, CutterheadValue, 0);
     }
+#else
+    SEG_SET_Cutterhead(CutterheadValid, CutterheadValue, 0);
+#endif
 }
 
 void Gauge_Gears_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();
+    uint16_t u16faucodelValue = Get_FaultCode_Value();
+    SEG_SET_Fault_Code(u8faucodeValid, u16faucodelValue, 0);
+}
+
 void Clear_Bu98(void)
 {
     uint8_t i = 0;
@@ -224,6 +241,12 @@ void Gauge_CAN_setup_Service(void)
     Gauge_Clock_Display();
     Gauge_Clock_All_Display();
     Gauge_EleDial_AllSOC_Display();
+    if (PART_NUMBER == G54_A01)
+    {
+        Gauge_flue_Display();
+        Gauge_faultcode_Display();
+    }
+
     // SEG_SET_GEAR(1, 1);
     // SEG_SET_Cutterhead(1, 2);
     Gauge_Frame_Display();

Firmware/Source/Application/GUI_Display/GUI_Display.h

@@ -51,6 +51,8 @@ void Gauge_EleDial_AllSOC_Display(void);
 void Gauge_Cutterhead_Gear_Display(void);
 void Gauge_Gears_Display(void);
 void Gauge_Service(void);
+void Gauge_flue_Display(void);
+void Gauge_faultcode_Display(void);
 
 void Gauge_CAN_setup_Service(void);
 void Checkself_LED_Display(void);

Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.h

@@ -63,8 +63,8 @@ _Fun_Res SEG_SET_EleDial_2SOC(uint8_t m_Flag,uint8_t m_SEG);
 /**@brief 电量表盘AllSOC显示函数*/
 _Fun_Res SEG_SET_EleDial_AllSOC(uint8_t m_Flag,uint16_t m_NUM);
 
-// /**@brief 燃油表盘显示函数*/
-// _Fun_Res SEG_SET_FuelDial(uint8_t m_Flag,uint8_t m_SEG);
+/**@brief 燃油表盘显示函数*/
+_Fun_Res SEG_SET_FuelDial(uint8_t m_Flag,uint8_t m_SEG);
 
 /**@brief 转速表盘显示函数*/
 //_Fun_Res SEG_SET_EspeedDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM);
@@ -83,7 +83,7 @@ _Fun_Res SEG_SET_L8_NUM(uint8_t m_Flag , uint8_t m_NUM);
 
 
 /**@brief 故障码显示函数*/
-_Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM);
+_Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM, uint8_t checkself);
 
 /**@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 );