up

LIB/MIDDLE/CellStateEstimation/Common/BatParam.py

@@ -147,30 +147,6 @@ class BatParam:
                 self.PackCrntDec=1
                 self.BalCurrent=0.015
                 self.LookTab_SOC = [0.0, 2.5, 5.0, 7.5, 10.0, 12.5, 15.0, 17.5, 20.0, 22.5, 25.0, 27.5, 30.0, 32.5, 35.0, 37.5, 40.0, 42.5, 45.0, 47.5, 50.0, 52.5, 55.0, 57.5, 60.0, 62.5, 65.0, 67.5, 70.0, 72.5, 75.0, 77.5, 80.0, 82.5, 85.0, 87.5, 90.0, 92.5, 95.0, 97.5, 100.0]
-<<<<<<< HEAD
-                self.LookTab_OCV = [2.5220, 2.8283, 3.0608, 3.1690, 3.1981, 3.2012, 3.2071, 3.2229, 3.2341, 3.2452, 3.2533, 3.2607, 3.2691, 3.2775, 3.2849, 3.2859, 3.2859, 3.2862, 3.2865, 3.2871, 3.2874, 3.2886, 3.2896, 3.2908, 3.2933, 3.2998, 3.3181, 3.3249, 3.3258, 3.3262, 3.3268, 3.3268, 3.3274, 3.3277, 3.3280, 3.3286, 3.3289, 3.3299, 3.3305, 3.3333, 3.4406]  
-        elif celltype==102:   #真芯好电_20ah磷酸铁锂电芯
-                self.Capacity = 120*2
-                self.PackFullChrgVolt= 426
-                self.CellFullChrgVolt=3.65
-                self.OcvInflexionBelow=3.2846
-                self.OcvInflexion2=3.2886
-                self.OcvInflexion3=3.3190
-                self.OcvInflexionAbove=3.3311
-                self.CellVoltNums=120
-                self.CellTempNums=40
-                self.FullChrgSoc=100
-                self.PeakSoc=60
-                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,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100]
-                self.LookTab_OCV = [2.8977,3.1857,3.2040,3.2269,3.2521,3.2691,3.2846,3.2865,3.2871,3.2880,3.2886,3.2917,3.3190,3.3277,3.3277,3.3280,3.3286,3.3289,3.3296,3.3311,3.3795]
-
-=======
-                self.LookTab_OCV = [2.5220, 2.8283, 3.0608, 3.1690, 3.1981, 3.2012, 3.2071, 3.2229, 3.2341, 3.2452, 3.2533, 3.2607, 3.2691, 3.2775, 3.2849, 3.2859, 3.2859, 3.2862, 3.2865, 3.2871, 3.2874, 3.2886, 3.2896, 3.2908, 3.2933, 3.2998, 3.3181, 3.3249, 3.3258, 3.3262, 3.3268, 3.3268, 3.3274, 3.3277, 3.3280, 3.3286, 3.3289, 3.3299, 3.3305, 3.3333, 3.4406]
         elif celltype==102:   #平峰科技_120ah磷酸铁锂电芯
                 self.Capacity = 120*2
                 self.PackFullChrgVolt=426
@@ -190,7 +166,6 @@ class BatParam:
                 self.BalCurrent=0.015
                 self.LookTab_SOC = [0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100]
                 self.LookTab_OCV = [2.8977,3.1857,3.2040,3.2269,3.2521,3.2691,3.2846,3.2865,3.2871,3.2880,3.2886,3.2917,3.3190,3.3277,3.3277,3.3280,3.3286,3.3289,3.3296,3.3311,3.379 ]    
->>>>>>> dev
         else:
             print('未找到对应电池编号！！！')
             # sys.exit()