✨ feat:混动车型增加总SOC显示逻辑

Firmware/Source/Application/Data_Soc/Data_Soc.c

@@ -460,15 +460,12 @@ static void Data_Soc_Battery_Icon_Service(void)
 
 static void Data_Soc_All_Soc_Service(void)
 {
+    #if (PART_NUMBER == RMR42E_60)
     if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON) && (System_Indicator_CANFlag != 1))
     {
-        #if (PART_NUMBER == RMR42E_60)
         if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18203020_Msg)) == CAN_SIG_NORMAL)
-        #else
-            if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x17A_Msg)) == CAN_SIG_NORMAL)
-        #endif
         {
-            // Soc.AllSocValue = Get_CAN_CH0_ID_18203020_Sig_MBMS_StatSoc();
+            Soc.AllSocValue = Get_CAN_CH0_ID_18203020_Sig_MBMS_StatSoc();
         }
         else 
         {
@@ -485,6 +482,42 @@ static void Data_Soc_All_Soc_Service(void)
         Soc.AllSocValue = 0U;
         Soc.AllSocValid = 0U;
     }
+    #else
+        uint8_t MBMSStatSoc = Get_CAN_CH0_ID_17A_Sig_MBMS_StatSoc();
+        uint8_t VCUChgMode = Get_CAN_CH0_ID_220_Sig_VCU_ChgMode();
+
+        if (MBMSStatSoc > 100U)
+        {
+            MBMSStatSoc = 100u;
+        }
+
+        if (VCUChgMode == 1U)
+        {
+            if (Get_CAN_Power_State() > KEY_OFF)
+            {
+                Soc.AllSocValue = MBMSStatSoc;
+                Soc.AllSocValid = 1U;
+            }
+            else 
+            {
+                Soc.AllSocValue = 0U;
+                Soc.AllSocValid = 0U;
+            }
+        }
+        else
+        {
+            if (Get_CAN_Power_State() < KEY_ACC)
+            {
+                Soc.AllSocValue = 0U;
+                Soc.AllSocValid = 0U;
+            }
+            else 
+            {
+                Soc.AllSocValue = MBMSStatSoc;
+                Soc.AllSocValid = 1U;
+            }
+        }
+    #endif
 }
 
 void Data_Soc_Service(void)