1.SOC及CMD的调用使能 变动

2.SFM 新增  温度1s升高超过20℃的 合理性故障； 新增  不一致性诊断
3.cdmv_V_deltOCV 及cdmv_ohm_deltR  的数据类型改为int16_T

inc/EmbeddedCoder_inc/BCUDisp.h

@@ -50,13 +50,18 @@ extern boolean_T ihd_st_disChrgMosControl;
 extern boolean_T ihd_st_relayControl;    
 extern uint8_T ihd_st_heatForceControl;
 extern uint8_T ihd_st_EOLState;
+extern boolean_T ihd_flg_urtRecFlg;
 
 extern int16_T sfmd_I_curr;                              /*处理后整包电流 */
 extern uint16_T sfmd_T_modTMax;                          /*处理后模组温度最小 */
 extern uint16_T sfmd_T_modTMin;                          /*处理后模组温度最大 */
+extern uint16_T sfmd_idx_modTMax;                          /*处理后模组温度最小 */
+extern uint16_T sfmd_idx_modTMin;                          /*处理后模组温度最大 */
 extern uint16_T sfmd_V_cellUAvrg;                        /*处理后单体电压平均 */
 extern uint16_T sfmd_V_cellUMax;                         /*处理后单体电压最大 */
 extern uint16_T sfmd_V_cellUMin;                         /*处理后单体电压最小 */
+extern uint16_T sfmd_idx_cellUMin;
+extern uint16_T sfmd_idx_cellUMax;
 extern boolean_T sfmd_flg_cellUDisable;                  /*单体电压有效标志位 ； 0为有效；1为无效 */
 extern boolean_T sfmd_flg_currDisable;                   /*电流有效标志位 ； 0为有效；1为无效 */
 extern boolean_T sfmd_flg_modTDisable;                   /*模组温度有效标志位 ； 0为有效；1为无效 */
@@ -117,8 +122,8 @@ extern uint16_T cand_V_chrgStartStat;                    /*循环发送的充电
 extern uint16_T cand_Q_reqCp;                            /*循环发送的单体需求均衡容量； */
 extern uint16_T cand_Q_totalCp;                          /*循环发送的单体累计均衡容量； */
 
-extern uint16_T  cdmv_V_deltOCV[cmnc_num_cellUNumMax];
-extern uint16_T  cdmv_ohm_deltR[cmnc_num_cellUNumMax];
+extern int16_T  cdmv_V_deltOCV[cmnc_num_cellUNumMax];
+extern int16_T  cdmv_ohm_deltR[cmnc_num_cellUNumMax];
 extern boolean_T cdmd_flg_deltOCVDisable;
 
 extern uint16_T test_efkSocMin;

inc/EmbeddedCoder_inc/SFM.h

@@ -1,6 +1,7 @@
 #include "rtwtypes.h"
 #include "BCUCal.h"
 #include "BCUDisp.h"
+#include <math.h>
 extern boolean_T FirstRun_SFM;
 
 extern void SFM_Init(void);

src/EmbeddedCoder_src/BCU.c

@@ -75,6 +75,7 @@ void BCU(void)
                     ihd_flg_HVILFlt = Lockstatus;
                     ihd_st_workStat = BattWorkStateDelay;
                     ihd_flg_urtRecFlt = UartErrorFlag;
+					ihd_flg_urtRecFlg = UartRecvFlag;
                     ihd_st_chrgConnect = chargerConnectState;
                     ihd_flg_cellULowFlt = ((battWarningState)&0x01) == 1;
                     ihd_flg_battULowFlt = ((battWarningState >> 1) & 0x01) == 1;

src/EmbeddedCoder_src/BCUDisp.c

@@ -50,13 +50,18 @@ boolean_T ihd_st_disChrgMosControl;
 boolean_T ihd_st_relayControl;    
 uint8_T ihd_st_heatForceControl;             
 uint8_T ihd_st_EOLState;                   
+boolean_T ihd_flg_urtRecFlg;
 
 int16_T sfmd_I_curr;                              /*处理后整包电流 */
 uint16_T sfmd_T_modTMax;                          /*处理后模组温度最小 */
 uint16_T sfmd_T_modTMin;                          /*处理后模组温度最大 */
+uint16_T sfmd_idx_modTMax;                          /*处理后模组温度最小 */
+uint16_T sfmd_idx_modTMin;                          /*处理后模组温度最大 */
 uint16_T sfmd_V_cellUAvrg;                        /*处理后单体电压平均 */
 uint16_T sfmd_V_cellUMax;                         /*处理后单体电压最大 */
 uint16_T sfmd_V_cellUMin;                         /*处理后单体电压最小 */
+uint16_T sfmd_idx_cellUMin;
+uint16_T sfmd_idx_cellUMax;
 boolean_T sfmd_flg_cellUDisable;                  /*单体电压有效标志位 ； 0为有效；1为无效 */
 boolean_T sfmd_flg_currDisable;                   /*电流有效标志位 ； 0为有效；1为无效 */
 boolean_T sfmd_flg_modTDisable;                   /*模组温度有效标志位 ； 0为有效；1为无效 */
@@ -117,8 +122,8 @@ uint16_T cand_V_chrgStartStat;                    /*循环发送的充电前单
 uint16_T cand_Q_reqCp;                            /*循环发送的单体需求均衡容量； */
 uint16_T cand_Q_totalCp;                          /*循环发送的单体累计均衡容量； */
 
-uint16_T  cdmv_V_deltOCV[cmnc_num_cellUNumMax] ;
-uint16_T  cdmv_ohm_deltR[cmnc_num_cellUNumMax] ;
+int16_T  cdmv_V_deltOCV[cmnc_num_cellUNumMax] ;
+int16_T  cdmv_ohm_deltR[cmnc_num_cellUNumMax] ;
 boolean_T cdmd_flg_deltOCVDisable;
 
 uint16_T test_efkSocMin;

src/EmbeddedCoder_src/CDM.c

@@ -27,7 +27,6 @@ void CDM(void)
         FirstRun_CDM = true;
     }
     ihd_st_workStat_Delay = ihd_st_workStat;
-    
     if (FirstRun_CDM)
     {
         for (i = 0;i < cmnc_num_cellUNum;i++)
@@ -46,10 +45,11 @@ void CDM(void)
     {
         for (i = 0;i < cmnc_num_cellUNum;i++)
         {
-            cmdn_V_cellUDelt[i] = (real_T)(sfmv_V_cellU[i]  -sfmd_V_cellUAvrg) * 0.001;
+            cmdn_V_cellUDelt[i] = (real_T)(sfmv_V_cellU[i]  - sfmd_V_cellUAvrg) * 0.001;
         }
         cdmn_I_curr = (real_T) sfmd_I_curr * 0.1;
         //
+   
         for (i = 0;i < cmnc_num_cellUNum;i++)
         {
             K[0] = (P[0][i]  + cdmn_I_curr * P[1][i])/(Lambda + P[0][i] + cdmn_I_curr * P[2][i] + ( P[1][i] + cdmn_I_curr * P[3][i]) * cdmn_I_curr);
@@ -61,13 +61,13 @@ void CDM(void)
             P[1][i] = ((1 -K[0])* P[1][i] -P[3][i] * K[0] * cdmn_I_curr) /Lambda;
             P[2][i] = (-K[1] *P[0][i] +P[2][i] * (1 - K[1] * cdmn_I_curr))/Lambda;
             P[3][i] = (-K[1] *P[1][i] +P[3][i] * (1 - K[1] * cdmn_I_curr))/Lambda;
-        }
+	    }
         //
         cdmd_flg_deltOCVDisable = false;
-        for (i = 0;i < 1;i++)
-        {
-            cdmv_V_deltOCV[i] = (uint16_T) (deltaE[i]  * 1000);
-            cdmv_ohm_deltR[i] = (uint16_T) (deltaR[i]  * 1000 * 10);
+        for (i = 0;i < cmnc_num_cellUNum;i++)
+        {   
+            cdmv_V_deltOCV[i] = (int16_T) (deltaE[i]  * 1000);
+            cdmv_ohm_deltR[i] = (int16_T) (deltaR[i]  * 1000 * 1000);
             if(arf[i] > 0.05 && arf[i] < -0.05)
             {
                 cdmd_flg_deltOCVDisable = true;
@@ -79,4 +79,5 @@ void CDM(void)
         cdmd_flg_deltOCVDisable = false;
     }
     FirstRun_CDM = false;
+	
 }

src/EmbeddedCoder_src/SOC.c

@@ -60,6 +60,8 @@ void SOC(void)
     static int16_T ahSoc0_est;
     static uint16_T ekfSoc0_est;
     //
+    uint16_T socd_V_chrgCCV;
+	uint16_T socd_V_disChrgCCV;
     static boolean_T overFlg;
     static boolean_T fulFlg;
     static uint8_T overCntl;
@@ -138,7 +140,7 @@ void SOC(void)
         }
         socn_Q_cap = (uint16_T)((uint16_T)((uint32_T)sohd_pct_bcuSoh * cmnc_Q_ratedCp / 2000U) << 1);
     }
-    
+	
     //printf("1----  battSocEi:%d,bcuSocEi:%d,battSocEE:%d,bcuSocEE:%d\n",socd_pct_battSocEi,socd_pct_bcuSocEi,socn_pct_battSocEE,socn_pct_bcuSocEE);
     //======================================================================
     ////////////////////////EKFSOC//////////////////////////////////////////
@@ -157,10 +159,10 @@ void SOC(void)
         P_Min_Delay[3] = 10;
     }
     //参数查表
-    ocv = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_V_ocv[0])), 12U) * 0.001;
-    Ro = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_ohm[0])), 12U) * 0.001 * 0.001;
-    Rp = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_polar[0])), 12U) * 0.001 * 0.001;
-    C = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_F_polar[0])), 12U) * 0.001 * 1000;
+    ocv = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_V_ocv[0])),   12U) * 0.001;
+    Ro  = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_ohm[0])),   12U) * 0.001 * 0.001;
+    Rp  = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_polar[0])), 12U) * 0.001 * 0.001;
+    C   = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_F_polar[0])), 12U) * 0.001 * 1000;
     A[0] = 1;
     A[1] = 0;
     A[2] = 0;
@@ -220,10 +222,10 @@ void SOC(void)
         P_Max_Delay[3] = 10;
     }
     // 参数查表
-    ocv = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Max_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_V_ocv[0])), 12U) * 0.001;
-    Ro = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Max_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_ohm[0])), 12U) * 0.001 * 0.001;
-    Rp = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Max_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_polar[0])), 12U) * 0.001 * 0.001;
-    C = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Max_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_F_polar[0])), 12U) * 0.001 * 1000;
+    ocv = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Max_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_V_ocv[0])),   12U) * 0.001;
+    Ro  = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Max_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_ohm[0])),   12U) * 0.001 * 0.001;
+    Rp  = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Max_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_polar[0])), 12U) * 0.001 * 0.001;
+    C   = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Max_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_F_polar[0])), 12U) * 0.001 * 1000;
     A[0] = 1;
     A[1] = 0;
     A[2] = 0;
@@ -288,6 +290,7 @@ void SOC(void)
     }
     socd_pct_ekfSoc = (uint16_T)(((1 - (real_T)(factor * 0.01)) * (real_T)(EKFSOCMin * 0.1) + (real_T)(factor * 0.01) * (real_T)(EKFSOCMax * 0.1)) * 10);
    
+    //printf("4----socd_pct_ekfSoc:%d,EKFSOCMax:%d,EKFSOCMin:%d,\n",socd_pct_ekfSoc,EKFSOCMax,EKFSOCMin);
 
    //-------------------------EKFavrg---------------------------------------
     if (FirstRun_SOC)
@@ -300,10 +303,10 @@ void SOC(void)
         P_avrg_Delay[3] = 10;
     }
     //参数查表
-    ocv = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_V_ocv[0])), 12U) * 0.001;
-    Ro = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_ohm[0])), 12U) * 0.001 * 0.001;
-    Rp = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_polar[0])), 12U) * 0.001 * 0.001;
-    C = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_F_polar[0])), 12U) * 0.001 * 1000;
+    ocv = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_V_ocv[0])),   12U) * 0.001;
+    Ro  = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_ohm[0])),   12U) * 0.001 * 0.001;
+    Rp  = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_R_polar[0])), 12U) * 0.001 * 0.001;
+    C   = (real_T)look1_iu16lu16n16tu16_binlcase((uint16_T)(soc_Min_Delay * 10), (&(cmnm_pct_soc[0])), (&(cmnm_F_polar[0])), 12U) * 0.001 * 1000;
     A[0] = 1;
     A[1] = 0;
     A[2] = 0;
@@ -356,7 +359,7 @@ void SOC(void)
     {
         socv_pct_cellSoc[i] = look1_iu16lu16n16tu16_binlcase((look1_iu16lu16n16tu16_binlcase(EKFSOCAvrg, (&(cmnm_pct_soc[0])), (&(cmnm_V_ocv[0])), 12U) + cdmv_V_deltOCV[i]), (&(cmnm_V_ocv[0])),(&(cmnm_pct_soc[0])),12U);
     }
-    socn_flg_ekfInvalid = socn_flg_ekfInvalidAvrg || cdmd_flg_deltOCVDisable;
+    //socn_flg_ekfInvalid = socn_flg_ekfInvalidAvrg || cdmd_flg_deltOCVDisable;
     cellSocMax = ArrMax(&socv_pct_cellSoc[0],cmnc_num_cellUNum);
     cellSocMin = ArrMin(&socv_pct_cellSoc[0],cmnc_num_cellUNum);
     if (cellSocMax > 800)
@@ -373,9 +376,9 @@ void SOC(void)
     }
     socd_pct_cellBattSoc = (uint16_T)(((1 - (real_T)(factor * 0.01)) * (real_T)(cellSocMin * 0.1) + (real_T)(factor * 0.01) * (real_T)(cellSocMax * 0.1)) * 10);
     
+ 
     
-    
-    //printf("4----factor:%d,socd_pct_ekfSoc:%d,EKFSOCMax:%d,EKFSOCMin:%d,\n",factor,socd_pct_ekfSoc,EKFSOCMax,EKFSOCMin);
+
     //======================================================================
     ////////////////////////AhSOC//////////////////////////////////////////
     //======================================================================
@@ -385,7 +388,7 @@ void SOC(void)
     }
     else
     {
-        ahDelay = ahDelay + battcurr / (real_T)(cmnc_Q_ratedCp * 0.1) / 36.0;
+        ahDelay = ahDelay + battcurr / (real_T)(cmnc_Q_ratedCp * 0.1) / 36.0;//cmnc_Q_ratedCp
     }
     ahSoc = (int16_T)(ahDelay * 10);
     if (ahSoc > socc_pct_battSocUp)
@@ -400,6 +403,8 @@ void SOC(void)
     {
         socd_pct_ahSoc = (uint16_T)ahSoc;
     }
+	 //  printf("S_%d   %d   %d   %d   %d   %d   %d   %d\n",socd_pct_cellBattSoc,cellSocMax,cellSocMin,socd_pct_ekfSoc,EKFSOCMax,EKFSOCMin,ahSoc,EKFSOCAvrg);
+	 //  printf("E_%d   %d   %d   %d   %d   %d   %d   %d\n",cdmv_V_deltOCV[0],cdmv_V_deltOCV[1],cdmv_V_deltOCV[15],cdmv_V_deltOCV[16],cdmv_ohm_deltR[0],cdmv_ohm_deltR[1],cdmv_ohm_deltR[15],cdmv_ohm_deltR[16]);
     //printf("5----ahDelay:%f,ahSoc:%d,battcurr:%f,sfmd_I_curr:%d\n",ahDelay,ahSoc,battcurr,sfmd_I_curr);
     //======================================================================
     ///////////////////////estSOC//////////////////////////////////////////
@@ -416,8 +421,8 @@ void SOC(void)
     if (ekfInvalidCntl < 20)
     {
         if (onceFlg_est)
-        {
-            ahSoc0_est = ahSoc;
+        {  
+            ahSoc0_est  = ahSoc;
             ekfSoc0_est = socd_pct_ekfSoc;
             onceFlg_est = false;
         }
@@ -448,7 +453,9 @@ void SOC(void)
         chrgCntl = (chrgCntl + 1) > 250 ? 250 : (chrgCntl + 1);
         lowCntl = 0;
         lowFlg = false;
-        if (sfmd_V_cellUMax >= look1_is16lu16n16tu16_binlcase(sfmd_I_curr, (&(socm_I_chrgCor[0])), (&(socm_V_chrgCor[0])), 2U))
+		//socd_V_chrgCCV = look1_iu16lu16n16tu16_binlcase(socc_pct_chrgCor, (&(cmnm_pct_soc[0])), (&(cmnm_V_ocv[0])), 12U) + sfmd_I_curr * (look1_iu16lu16n16tu16_binlcase(socc_pct_chrgCor, (&(cmnm_pct_soc[0])), (&(cmnm_R_ohm[0])), 12U) + cdmv_ohm_deltR[sfmd_idx_cellUMax]) * 0.001 * 0.1;
+		socd_V_chrgCCV = look1_is16lu16n16tu16_binlcase(sfmd_I_curr,&socm_I_chrgCor[0],&socm_V_chrgCor[0],2U); 
+		if (sfmd_V_cellUMax >= socd_V_chrgCCV)
         {
             overCntl = (overCntl + 1) > 250 ? 250 : (overCntl + 1);
         }
@@ -518,7 +525,9 @@ void SOC(void)
         overFlg = false;
         fulFlg = false;
         fulCntl = 0;
-        if (sfmd_V_cellUMin <= look1_is16lu16n16tu16_binlcase(sfmd_I_curr, (&(socm_I_disChrgCor[0])), (&(socm_V_disChrgCor[0])), 2U))
+		
+		socd_V_disChrgCCV = look1_iu16lu16n16tu16_binlcase(socc_pct_disChrgCor, (&(cmnm_pct_soc[0])), (&(cmnm_V_ocv[0])), 12U) + sfmd_I_curr * (look1_iu16lu16n16tu16_binlcase(socc_pct_chrgCor, (&(cmnm_pct_soc[0])), (&(cmnm_R_ohm[0])), 12U) + cdmv_ohm_deltR[sfmd_idx_cellUMin]) * 0.001 * 0.1;
+        if (sfmd_V_cellUMin <= socd_V_disChrgCCV)
         {
             lowCntl = (lowCntl + 1) > 250 ? 250 : (lowCntl + 1);
         }
@@ -552,7 +561,7 @@ void SOC(void)
         }
         // printf("8----lowCntl:%d,lowFlg:%d,ahSoc0_utrckLow:%d,estSoc0_utrckLow:%d,socn_pct_utrackSoc:%d\n",lowCntl,lowFlg,ahSoc0_utrckLow,estSoc0_utrckLow,socn_pct_utrackSoc);
     }
-    //===================================================================
+	//===================================================================
     //------------------EEsave
     //==================================================================
     socd_pct_battSoc = socn_pct_utrackSoc;
@@ -567,9 +576,9 @@ void SOC(void)
         socd_flg_EEsave = 0;
     }
     
-    //=====================================================================
-    //////////////////////////////BCUSOC///////////////////////////////////
-    //=====================================================================
+    //===============================================================================================================================================================
+    ////////////////////////////////////////////////////////////////////BCUSOC///////////////////////////////////////////////////////////////////////////////////////
+    //===============================================================================================================================================================
     
     if (sfmd_I_curr < 10 && sfmd_I_curr > -10)
     {
@@ -664,7 +673,6 @@ void SOC(void)
     //
     socd_pct_bcuSocEo = socd_pct_bcuSoc;
     FirstRun_SOC = false;
-    
     //printf("\n");
 }
 

src/EmbeddedCoder_src/SPM.c

@@ -39,7 +39,7 @@ void SPM(void)
   if (ihd_flg_urtRecFlg)
   {
       CDM();
-      SOC();
+	  SOC();
   }
   // 循环发送数组
   cand_Q_cellCap = sohv_Q_cellCapArrEo[cand_Nr_cellNr-1];