Merge branch 'dev' into pro

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

@@ -367,6 +367,45 @@ class BatParam:
             self.CellUVlmt=2
             self.CantChrgVol=2.6
             self.AvgOtherTempGap=40
+            
+        elif celltype==101:   #真芯好电_20ah磷酸铁锂电芯
+                self.Capacity = 20
+                self.PackFullChrgVolt=54
+                self.CellFullChrgVolt=3.65
+                self.OcvInflexionBelow=3.2849
+                self.OcvInflexion2=3.2998
+                self.OcvInflexion3=3.3268
+                self.OcvInflexionAbove=3.3333
+                self.CellVoltNums=15
+                self.CellTempNums=1
+                self.FullChrgSoc=100
+                self.PeakSoc=62.5
+                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.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]
+                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
+                self.CellFullChrgVolt=3.65
+                self.OcvInflexionBelow=3.2846
+                self.OcvInflexion2=33.2917
+                self.OcvInflexion3=3.3277
+                self.OcvInflexionAbove=3.3333
+                self.CellVoltNums=120
+                self.CellTempNums=40
+                self.FullChrgSoc=100
+                self.PeakSoc=62.5#dV/dQ峰值SOC
+                self.PeakVoltLowLmt=3.35#dV/dQ峰值SOC
+                self.PeakVoltUpLmt=3.4#dV/dQ峰值SOC
+                self.PeakCellVolt=[3.362,3.363,3.365,3.366,3.367]#dV/dQ峰值SOC
+                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.379 ]    
  
         else:
             print('未找到对应电池编号！！！')

demo.ipynb

@@ -7549,6 +7549,23 @@
    "outputs": [],
    "metadata": {}
   },
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "1\n"
+     ]
+    }
+   ],
+   "source": [
+    "print(1)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -7558,12 +7575,15 @@
   }
  ],
  "metadata": {
-  "interpreter": {
-   "hash": "b3ba2566441a7c06988d0923437866b63cedc61552a5af99d1f4fb67d367b25f"
-  },
   "kernelspec": {
+<<<<<<< HEAD
    "name": "python3",
    "display_name": "Python 3.8.8 64-bit ('base': conda)"
+=======
+   "display_name": "py388",
+   "language": "python",
+   "name": "python3"
+>>>>>>> dev
   },
   "language_info": {
    "codemirror_mode": {
@@ -7574,9 +7594,19 @@
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
+<<<<<<< HEAD
    "file_extension": ".py"
+=======
+   "pygments_lexer": "ipython3",
+   "version": "3.8.16"
+>>>>>>> dev
   },
-  "orig_nbformat": 4
+  "orig_nbformat": 4,
+  "vscode": {
+   "interpreter": {
+    "hash": "9bb309b059ca3dc41bcdf6b07c770e5a501ed97315f8b1ee2607bdea1906eb5f"
+   }
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 2

demo.py

@@ -1,3 +1,35 @@
+<<<<<<< HEAD
 from LIB.BACKEND import DBManager, Log
 log = Log.Mylog(log_name='signal_monitor', log_level = 'info')
 log.set_file_hl(file_name='log/info.log', log_level='info', size=1024* 1024 * 100)
+=======
+# #LIB/MIDDLE/算法名/main.py   该文件调用核心算法
+
+# # 准备算法输入参数
+# parameter1 = * 
+# parameter2 = *
+
+
+# # 多次调用核心算法时，将循环写在外面
+# for (i=1:n){
+     
+#      # 获取数据
+#      data1 = get_data(sn[i], start_time, end_time, ....)
+#      data2 = get_data_by_sql(sn[i], start_time, end_time, ....)
+
+#      # 通用数据预处理 (可选，由算法说明文档说明算法输入数据是否需要预处理)
+#      data1 = data_process(data1)
+#      data2 = data_process(data2)
+     
+#      # 调用核心算法
+#      [res1, res2] = core_algorithm(data1, data2, parameter1, parameter2)
+
+#      # 使用结果
+#      res1 = res1.append(res)
+#      res1.to_csv(...)
+# }
+
+# # 批量使用结果
+# res.to_csv(...)
+print(1)
+>>>>>>> dev