Merge branch 'nou' of http://tyw-server.synology.me:12345/shihao/rt_rmr42e into zhengping

Firmware/Source/Application/GUI_Display/GUI_Display.c

@@ -239,6 +239,32 @@ void Gauge_Service(void)
                 Gauge_Clock_Display();
                 Gauge_Trip_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
             {            

Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.h

@@ -7,9 +7,27 @@
 
 typedef enum
 {
-    SEG_LED_Voltage = 0u,        
-    SEG_LED_Auto_Start_Stop,
-    
+    SEG_LED_Recharge = 0u,        
+    //SEG_LED_Auto_Start_Stop,
+    //SEG_LED_Fuel,
+    SEG_LED_Engine_Failure, //发动机故障
+    SEG_LED_Battery_Failure,//电池故障
+    SEG_LED_Oil_press_Warning,  //机油压力报警
+    SEG_LED_System_Light,//系统知识灯
+    SEG_LED_Power_Battery_Failure, //动力电池故障
+    SEG_LED_Chloramine, //草满
+    SEG_LED_Cutter_Overload,  //刀盘过载
+    SEG_LED_Seat_Detection, //座椅检测
+    SEG_LED_Key_Access,//钥匙接入
+    SEG_LED_Ready,  //Ready
+    SEG_LED_Cutter_Head_switch,//刀盘开关
+    SEG_LED_engine_Burn,  //发动机工作
+    SEG_LED_External_Discharge, //对外放电
+    SEG_LED_bluetooth, //蓝牙
+    SEG_LED_Distance_Light,//远光灯
+    SEG_LED_Cruise_Control,//定速巡航
+    SEG_LED_HHT_Charger,  //充电枪
+    SEG_LED_Fuel_Oil,  //燃油灯
 
     SEG_LED_MAX
 } SEG_LED_Idx_t;
@@ -53,6 +71,9 @@ _Fun_Res SEG_SET_ODO_NUM(uint8_t m_Flag,uint32_t m_NUM);
 /**@brief 小计里程显示函数*/
 _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 时间显示函数*/
 _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 );