更新参数

LIB/MIDDLE/CellStateEstimation/Common/V1_0_1/BatParam.py

@@ -223,8 +223,8 @@ class BatParam:
             self.PackVoltUvLv1=self.CellUvLv1*self.CellVoltNums
             self.PackVoltUvLv2=self.CellUvLv2*self.CellVoltNums
 
-            self.PackChgOc=-600
-            self.PackDisOc=600
+            self.PackChgOc=-60
+            self.PackDisOc=200
 
             self.LeakCurrentLv1=-20
             self.LeakCurrentLv2=-30
@@ -236,7 +236,6 @@ class BatParam:
             self.CellTempDiffLv1=10
             self.CellTempDiffLv2=15                       
         elif celltype==100:
-<<<<<<< HEAD
             self.Capacity = 228*2
             self.PackFullChrgVolt=3.65*192
             self.CellFullChrgVolt=3.5
@@ -263,48 +262,13 @@ class BatParam:
             self.CellUvLv2=2.2
             self.CellVoltDiffLv1=0.6
             self.CellVoltDiffLv2=1
-            self.PackVoltOvLv1=self.CellOvLv1*self.CellVoltNums
-            self.PackVoltOvLv2=self.CellOvLv2*self.CellVoltNums
-            self.PackVoltUvLv1=self.CellUvLv1*self.CellVoltNums
-            self.PackVoltUvLv2=self.CellUvLv2*self.CellVoltNums
-
-            self.PackChgOc=-600
-            self.PackDisOc=600
-=======
-                self.Capacity = 228*2
-                self.PackFullChrgVolt=3.65*192
-                self.CellFullChrgVolt=3.5
-                self.OcvInflexionBelow=3.285
-                self.OcvInflexion2=3.296
-                self.OcvInflexion3=3.328
-                self.OcvInflexionAbove=3.4
-                self.CellVoltNums=384
-                self.CellTempNums=64
-                self.FullChrgSoc=98
-                self.PeakSoc=59
-                self.PeakVoltLowLmt=3.35
-                self.PeakVoltUpLmt=3.4
-                self.PeakCellVolt=[3.362,3.363,3.365,3.366,3.367]
-                self.PackCrntDec=1
-                self.BalCurrent=0.015
-                self.LookTab_SOC = [0.00, 	2.40, 	6.38, 	10.37, 	14.35, 	18.33, 	22.32, 	26.30, 	30.28, 	35.26, 	40.24, 	45.22, 	50.20, 	54.19, 	58.17, 	60.16, 	65.14, 	70.12, 	75.10, 	80.08, 	84.06, 	88.05, 	92.03, 	96.02, 	100.00]
-                self.LookTab_OCV = [2.7151,	3.0298,	3.1935,	3.2009,	3.2167,	3.2393,	3.2561,	3.2703,	3.2843,	3.2871,	3.2874,	3.2868,	3.2896,	3.2917,	3.2967,	3.3128,	3.3283,	3.3286,	3.3287,	3.3288,	3.3289,	3.3296,	3.3302,	3.3314,	3.3429]
-                
-                self.CellOvLv1=3.75
-                self.CellOvLv2=3.8
-                
-                self.CellUvLv1=2.3
-                self.CellUvLv2=2.2
-                self.CellVoltDiffLv1=0.6
-                self.CellVoltDiffLv2=1
-                self.PackVoltOvLv1=self.CellOvLv1*self.CellVoltNums/2
-                self.PackVoltOvLv2=self.CellOvLv2*self.CellVoltNums/2
-                self.PackVoltUvLv1=self.CellUvLv1*self.CellVoltNums/2
-                self.PackVoltUvLv2=self.CellUvLv2*self.CellVoltNums/2
+            self.PackVoltOvLv1=self.CellOvLv1*self.CellVoltNums/2
+            self.PackVoltOvLv2=self.CellOvLv2*self.CellVoltNums/2
+            self.PackVoltUvLv1=self.CellUvLv1*self.CellVoltNums/2
+            self.PackVoltUvLv2=self.CellUvLv2*self.CellVoltNums/2
 
-                self.PackChgOc=-800
-                self.PackDisOc=800
->>>>>>> ba9bf9fc2e2d0731a5ea954d319fdf44177571ff
+            self.PackChgOc=-800
+            self.PackDisOc=800
 
             self.LeakCurrentLv1=-20
             self.LeakCurrentLv2=-50