✨ feat:累计里程和电量段码修改

Firmware/Source/Application/GUI_Display/GUI_Display.c

@@ -82,29 +82,19 @@ uint8_t SOC_2_Count = 0;
 //        }
 //    }
 // }
-// void Gauge_VSpeed_Display(void)
-// {
-//     uint16_t VSpeedDisplayValue = 0;
-//     if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
-//     {
-//         if ( Get_VechileSpeedValid( ) == 1u )
-//         {
-//             VSpeedDisplayValue = Get_DispVechileSpeed( ) / 10u;
-//             SEG_SET_VSpeed_NUM(1u, VSpeedDisplayValue);
-//         }
-//         else
-//         {
-//             VSpeedDisplayValue = 0u;
-//             SEG_SET_VSpeed_NUM(1u, VSpeedDisplayValue);
-//         }
-//     }
-//     else
-//     {
-//         VSpeedDisplayValue = 0u;
-//         SEG_SET_VSpeed_NUM(0u, 0u);
-//     }
+void Gauge_EleDial_AllSOC_Display(void)
+{
+    uint8_t AllSOC_DIS = 0;
+    if (Common_Get_IG_Sts() == COMMON_POWER_ON)
+    {
+        SEG_SET_EleDial_AllSOC(1, AllSOC_DIS);
+    }
+    else
+    {
+        SEG_SET_EleDial_AllSOC(0, 0);
+    }
+}
 
-// }
 void Gauge_Clock_Display(void)
 {
     uint8_t PageType_DIS = 0;
@@ -145,41 +135,24 @@ void Gauge_Clock_Display(void)
     //     SEG_SET_Clock(0, 0, 0, 0, 0);
     // }
 }
-
-void Gauge_Trip_Display(void)
+uint32_t AccumulatedWorkHours;
+void Gauge_Clock_All_Display(void)
 {
-    if (Common_Get_IG_Sts() == COMMON_POWER_ON)
-    {
-        SEG_SET_TRIP_NUM(1u, Get_Trip_Value());
-    }
-    else
-    {
-        SEG_SET_TRIP_NUM(0u, 0u);
-    }
-}
     
-void Gauge_ODO_Display(void)
-{
-    if (Common_Get_IG_Sts() == COMMON_POWER_ON)
+    if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x339_Msg)))
     {
-        SEG_SET_ODO_NUM(1u, Get_ODO_Value() / 10u);
-    }
-    else
-    {
-        SEG_SET_ODO_NUM(0u, 0u);
-    }
-}
-void Gauge_EspeedDial_Display(void)
-{
+        AccumulatedWorkHours = Get_CAN_CH0_ID_339_Sig_MMCU_AccumulatedWorkHours() * 10;
         if (Common_Get_IG_Sts() == COMMON_POWER_ON)
         {
-        // SEG_SET_EspeedDial(1,  Get_DispEngineSpeed()/1000, Get_DispEngineSpeed());
+            SEG_SET_Clock_ALL(0, AccumulatedWorkHours);
+        }
     }
     else
     {
-        // SEG_SET_EspeedDial(0,  0,  0);
+        
     }
 }
+
 void Gauge_Frame_Display(void)
 {
     if (Common_Get_IG_Sts() == COMMON_POWER_ON)
@@ -221,21 +194,19 @@ void Gauge_Service(void)
     {
         if (Common_Get_IG_Sts() == COMMON_POWER_ON && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16000 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9000)
         {
-            if (Get_CAN_Power_State() != PKEY_ON )
+            if (Get_CAN_Power_State() != PKEY_ON)
             {
                 if (Common_GetIgnOnTime() >= 3000)
                 {
                     // Gauge_Power_1_SOC_Display();
                     // Gauge_Power_2_SOC_Display();
                     Checkself_Init();
-                    Gauge_ODO_Display();
                     Gauge_Clock_Display();
-                    Gauge_Trip_Display();
-                    Gauge_EspeedDial_Display();
                     SEG_SET_Clock(22, 22, 1, 1, 1);
                     SEG_SET_Fault_Code(0, 2222);
-                    SEG_SET_EleDial(1, 10, 22);
-                    SEG_SET_FuelDial(0, 8);
+                    // SEG_SET_EleDial_1SOC(1, 10, 22);
+                    // SEG_SET_FuelDial(0, 8);
+                    Gauge_EleDial_AllSOC_Display();
                     SEG_SET_GEAR(1, 1);
                     SEG_SET_Cutterhead(1, 2);
                     SEG_SET_Frame(1);
@@ -254,7 +225,7 @@ void Gauge_Service(void)
                 //     LED_Driver_Channel_Set(LampChannel_0, i, LED_OFF);
                 // }
                 interact_PWM_Low_Duty = 50;
-                //蜂鸣器
+                // 蜂鸣器
             }
         }
         else

Firmware/Source/Application/GUI_Display/GUI_Display.h

@@ -45,15 +45,13 @@ void Gauge_Battery_Display(void);
 
 
 void Gauge_Clock_Display(void);
+void Gauge_Clock_All_Display(void);
 void Gauge_DrivingRange_Display(void);
-void Gauge_Trip_Display(void);
-void Gauge_ODO_Display(void);
 //void Gauge_Gear_Display(void);
-void Gauge_EspeedDial_Display(void);
 void Gauge_Frame_Display(void);
 void Gauge_MaintenanceMileage_Display(void);
 void Gauge_EnergyRecoveryLevel_Display(void);
-
+void Gauge_EleDial_AllSOC_Display(void);
 
 void Gauge_KL30_Init(void);
 void Gauge_KL15_Init(void);

Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.h

@@ -46,11 +46,17 @@ _Fun_Res SEG_SET_Frame(uint8_t m_Flag);
 /**@brief 挡位显示函数*/
 _Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag,uint8_t m_Gear);
 
-/**@brief 电量表盘显示函数*/
-_Fun_Res SEG_SET_EleDial(uint8_t m_Flag,uint8_t m_SEG,uint16_t m_NUM);
+/**@brief 电量表盘1SOC显示函数*/
+_Fun_Res SEG_SET_EleDial_1SOC(uint8_t m_Flag,uint8_t m_SEG);
 
-/**@brief 燃油表盘显示函数*/
-_Fun_Res SEG_SET_FuelDial(uint8_t m_Flag,uint8_t m_SEG);
+/**@brief 电量表盘2SOC显示函数*/
+_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_EspeedDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM);
@@ -67,21 +73,18 @@ _Fun_Res SEG_SET_VSpeed_NUM(uint8_t m_Flag , uint16_t m_NUM);
 /**@brief L8字段显示函数*/
 _Fun_Res SEG_SET_L8_NUM(uint8_t m_Flag , uint8_t m_NUM);
 
-/**@brief 总计里程显示函数*/
-_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 时间显示函数*/
+/**@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 );
 
+/**@brief 累计时间显示函数*/
+_Fun_Res SEG_SET_Clock_ALL(uint8_t m_Flag , uint32_t m_NUM);
+
 uint8_t Check_SEG_Display(void);
 
-extern uint8_t check_SEG_step;