From 4a28348db4a652deb0aebe60e433f93bab4c07ae Mon Sep 17 00:00:00 2001
From: Roy <flyu0033136@gmail.com>
Date: Wed, 18 May 2022 11:06:23 +0800
Subject: [PATCH] [update] fix cp mode instruction and decoder

---
 python/biopro/devlib/data.py                  | 30 ++++++++++---------
 .../res/devlib/json/elite_zm_15.devlib.json   |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/python/biopro/devlib/data.py b/python/biopro/devlib/data.py
index 8a7764d..105e706 100644
--- a/python/biopro/devlib/data.py
+++ b/python/biopro/devlib/data.py
@@ -881,14 +881,16 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
     def decode(self, data: bytes) -> Optional[RecordingData]:
         if len(data) < 18:
             return None
-
+        voltage = 0
         mem_cnt = data[1]
         time_stamp: float = struct.unpack('<I', data[4:8])[0]  # unit: ms 0x18030000
         current = struct.unpack('<i', data[8:12])[0]  # unit: nA
-        voltage = struct.unpack('<i', data[12:16])[0]  # unit: uV
+        ch2 = struct.unpack('<i', data[12:16])[0]  # unit: uV
         impedance = struct.unpack('<i', data[16:20])[0]  # unit: mOm
         if self._mode == 16:
-            voltage = impedance - voltage
+            voltage = impedance - ch2
+        else:
+            voltage = ch2
 
         cycle_number = struct.unpack('<H', data[20:22])[0]
         finish_mode_falg = data[22]
@@ -948,18 +950,18 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         ret.append_data(1, voltage)
         ret.append_data(2, impedance)
         ret.append_data(3, cycle_number)
-        ret.append_data(4, battery)
-        ret.append_data(5, elite_notify_times)
-        ret.append_data(6, mem_cnt)
+        # ret.append_data(4, battery)
+        # ret.append_data(5, elite_notify_times)
+        # ret.append_data(6, mem_cnt)
 
-        # memoryboard information
-        ret.append_data(7, ram_num)
-        ret.append_data(8, broken_flag)
-        try:
-            ret.append_data(9, mem_wrong_information)
-            # print('append_data success, mem_wrong_information:', mem_wrong_information, hex(mem_wrong_information))
-        except:
-            print('append_data fail, mem_wrong_information:', mem_wrong_information, hex(mem_wrong_information))
+        # # memoryboard information
+        # ret.append_data(7, ram_num)
+        # ret.append_data(8, broken_flag)
+        # try:
+        #     ret.append_data(9, mem_wrong_information)
+        #     # print('append_data success, mem_wrong_information:', mem_wrong_information, hex(mem_wrong_information))
+        # except:
+        #     print('append_data fail, mem_wrong_information:', mem_wrong_information, hex(mem_wrong_information))
 
 
     
diff --git a/python/res/devlib/json/elite_zm_15.devlib.json b/python/res/devlib/json/elite_zm_15.devlib.json
index 8f27933..1d2ee3d 100644
--- a/python/res/devlib/json/elite_zm_15.devlib.json
+++ b/python/res/devlib/json/elite_zm_15.devlib.json
@@ -861,7 +861,7 @@
           "13": "curve_ocp",
           "14": "curve_pulse_sensing",
           "15": "curve_dpv",
-          "16": "curve_const_vscan"
+          "16": "const_current"
         }
       },
       {