[update] edc 1.5 library

python/biopro/controller.py

@@ -1585,6 +1585,9 @@ class ControlAPI(metaclass=Router):
     
     def stop_project(self, project) -> bool:
         raise NotImplementedError()
+    
+    def show_device_data(self, device) -> bool:
+        raise NotImplementedError()
 
 # noinspection PyAbstractClass
 class ControlClient(SocketClient, ControlAPI, metaclass=SocketClientMacro(ControlAPI)):

python/biopro/data.py

@@ -130,6 +130,14 @@ class DataAPI(metaclass=abc.ABCMeta):
     def hardware_test(self) -> JSON_OBJECT:
         """"""
         pass
+    
+    @abc.abstractmethod
+    def show_data(self, device: Union[int, Device]):
+        """show device data
+
+        :param device: device ID
+        """
+        pass
 
 
 # noinspection PyAbstractClass
@@ -191,6 +199,9 @@ class DataClient(SocketClient, DataAPI, metaclass=SocketClientMacro(DataAPI)):
 
     def stop_sync(self, *device: Union[int, Device]):
         self.send_command('stop_sync', *self._to_device_id(*device))
+    
+    def show_data(self, device: int):
+        self.send_command('show_data', device)
 
     @staticmethod
     def _to_device_id(*device: Union[int, Device]) -> Tuple[int, ...]:

python/biopro/devlib/data.py

@@ -853,7 +853,7 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
 
     __slots__ = ('_message', '_cycle_number', '_start_return_data', '_time_stamp',
                  '_total_time_stamp', '_mode', '_cycle_start_time',
-                 '_mode_stop')
+                 '_mode_stop', '_show_data')
 
     def __init__(self):
         super().__init__()
@@ -868,6 +868,8 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         self._mode = 0
         self._cycle_start_time = []
 
+        self._show_data = False
+
     @property
     def name(self) -> str:
         return self.NAME
@@ -885,12 +887,8 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         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
-        ch2 = struct.unpack('<i', data[12:16])[0]  # unit: uV
+        voltage = 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 - ch2
-        else:
-            voltage = ch2
 
         cycle_number = struct.unpack('<H', data[20:22])[0]
         finish_mode_falg = data[22]
@@ -919,9 +917,10 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
                 print("error timeStamp full data:", list(data), datetime.now(), '\n')
                 return None
             else:
-                # print('|', time_stamp, '|', delta, '|', int(time_stamp * 1000 / 2),
-                #       '|', current, '|', voltage, '|', impedance,
-                #       '|', cycle_number, '|', finishMode, '@', str(self.device))
+                if self._show_data:
+                    print('|', time_stamp, '|', delta, '|', int(time_stamp * 1000 / 2),
+                        '|', current, '|', voltage, '|', impedance,
+                        '|', cycle_number, '|', finishMode, '@', str(self.device))
 
                 # print('|', '{:10}'.format(time_stamp),
                 #       '|', '{:4}'.format(delta),
@@ -1339,7 +1338,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                  '_total_time_stamp', '_mode', '_cycle_start_time',
                  '_mode_stop', '_last_time_stamp', '_last_delta', '_cali_coeff',
                  'cali_coeff', '_ac_amp', '_mode', '_freq_start', '_freq_stop',
-                 '_freq_direction', '_last_phase', '_first_phase_flag')
+                 '_freq_direction', '_last_phase', '_first_phase_flag', '_show_data')
 
     def __init__(self, cali_coeff: bytes = None):
         super().__init__()
@@ -1363,6 +1362,8 @@ class EISZeroOneDataDecoder(RecDataDecoder):
         self._cali_coeff: Optional[bytes] = None
         self.cali_coeff: Optional[List[Tuple[int, int]]] = None
 
+        self._show_data = False
+
         if cali_coeff is not None:
             self._cali_coeff = cali_coeff
             self.cali_coeff = self._decode_cali_coeff(cali_coeff)
@@ -1547,34 +1548,34 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                     imag_after_cal = impedance * math.sin(round(phase) * math.pi / 180)
                     real_after_cal = impedance * math.cos(round(phase) * math.pi / 180)
 
-
-                if (self._mode == 0):
-                    # print('|', '{:10}'.format(time_stamp),
-                    #     '|', '{:5}'.format(delta),
-                    #     '|', '{:6}'.format(ch1),
-                    #     '|', '{:6}'.format(ch2),
-                    #     '|', '{:8}'.format(ch3 / 100),
-                    #     '|', '{:6}'.format(round(voltage_mag)),
-                    #     '|', '{:5}'.format(int(imag_after_cal)),
-                    #     '|', '{:5}'.format(int(real_after_cal)),
-                    #     '|', '{:5}'.format(round(impedance)),
-                    #     '|', '{:5}'.format(round(phase, 1)),
-                    #     '|', '{:5}'.format(round(current, 3)),
-                    #     '|', '{:1}'.format(gain),
-                    #     '|', '{:1}'.format(finishMode),
-                    #     '@', str(self.device), '|')
-                    pass
-                else:
-                    # print('|', '{:10}'.format(time_stamp),
-                    #     '|', '{:5}'.format(delta),
-                    #     '|', '{:5}'.format(ch1),
-                    #     '|', '{:5}'.format(ch2),
-                    #     '|', '{:5}'.format(ch3),
-                    #     '|', '{:5}'.format(cycle_number),
-                    #     '|', '{:1}'.format(gain),
-                    #     '|', '{:1}'.format(finishMode),
-                    #     '@', str(self.device), '|')
-                    pass
+                if self._show_data:
+                    if (self._mode == 0):
+                        print('|', '{:10}'.format(time_stamp),
+                            '|', '{:5}'.format(delta),
+                            '|', '{:6}'.format(ch1),
+                            '|', '{:6}'.format(ch2),
+                            '|', '{:8}'.format(ch3 / 100),
+                            '|', '{:6}'.format(round(voltage_mag)),
+                            '|', '{:5}'.format(int(imag_after_cal)),
+                            '|', '{:5}'.format(int(real_after_cal)),
+                            '|', '{:5}'.format(round(impedance)),
+                            '|', '{:5}'.format(round(phase, 1)),
+                            '|', '{:5}'.format(round(current, 3)),
+                            '|', '{:1}'.format(gain),
+                            '|', '{:1}'.format(finishMode),
+                            '@', str(self.device), '|')
+                        pass
+                    else:
+                        print('|', '{:10}'.format(time_stamp),
+                            '|', '{:5}'.format(delta),
+                            '|', '{:5}'.format(ch1),
+                            '|', '{:5}'.format(ch2),
+                            '|', '{:5}'.format(ch3),
+                            '|', '{:5}'.format(cycle_number),
+                            '|', '{:1}'.format(gain),
+                            '|', '{:1}'.format(finishMode),
+                            '@', str(self.device), '|')
+                        pass
 
         if finishMode == True:
             print("finishMode full data:", list(data), datetime.now())

python/biopro/devlib/device.py

@@ -651,8 +651,6 @@ class DeviceInstruction:
     VIS_DEVICE_DONE = 0x20
     """identify device done"""
 
-    VIS_CC_ZERO = 0x40
-
     VIS_STI = 0xC0
     """stimulation on virtual instruction"""
 
@@ -726,7 +724,6 @@ class DeviceCommonInstruction:
     STOP_STIMULATE = "stop_stimulate"
     VIS_DEVICE_DETECT = 'VIS_DEVICE_DETECT'
     VIS_DEVICE_DONE = 'VIS_DEVICE_DONE'
-    VIS_CC_ZERO = 'VIS_CC_ZERO'
     CIS_VOLT = 'CIS_VOLT'
     CIS_VERSION = 'CIS_VERSION'
 
@@ -750,8 +747,6 @@ class DeviceCommonInstruction:
             return 'VIS_DEVICE_DETECT',
         elif instruction == cls.VIS_DEVICE_DONE:
             return 'VIS_DEVICE_DONE',
-        elif instruction == cls.VIS_CC_ZERO:
-            return 'VIS_CC_ZERO',
         elif instruction == cls.RECORD:
             return 'VIS_STARTR',
         elif instruction == cls.RECORD_ALL:

python/biopro/project/project.py

@@ -211,6 +211,9 @@ class Project(threading.Thread):
     return True
   
   def as_json(self):
+    running_task = None
+    if self._task_manager.running_task is not None:
+      running_task = self._task_manager.running_task.as_json()
     data = {
       'id': self._id,
       'name': self._name,
@@ -219,6 +222,6 @@ class Project(threading.Thread):
       'status': self._status,
       'device': self._device,
       'task': self.task_list,
-      'running_task': self._task_manager.running_task.as_json()
+      'running_task': running_task
     }
     return data

python/biopro/server/data.py

@@ -699,6 +699,9 @@ class DataServer(SocketServer, DataAPI):
                 self.mqtt_thread.publish('device_instruction', json_stringify(content), inter = True)
 
         return True
+    
+    def show_data(self, device):
+        self._configurations[device].put_rec_queue('show_data')
 
 class DataRuntime(metaclass=abc.ABCMeta):
     __slots__ = ('_server', '_device', '_meta_file', '_data_format',

python/biopro/server/main.py

@@ -1339,6 +1339,13 @@ class ControlServer(SocketServer, ControlServerAPI):
         def _hardware_send_test_set(self, options: Dict[str, str]) -> bool:
             # TODO write options files
             return False
+        
+        @logging_info
+        def show_device_data(self, device: int):
+            client = self.data_server.client()
+            if client is not None:
+                with client:
+                    client.show_data(device)
 
 class _RandomCrashThread(ServerThread):
     def __init__(self):

python/biopro/server/recording.py

@@ -185,6 +185,8 @@ class RecordingProcess(Process):
                 self.final_write()
                 self.is_closed = True
                 return False
+            elif q == 'show_data':
+                self._decoder._show_data = not self._decoder._show_data
             else:
                 self.rec_update()
                 self.sync_data(q)

python/res/devlib/json/Elite_BAT_1.0.devlib.json

@@ -1203,7 +1203,7 @@
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "X07;",
+        "X0C;",
         "B>va;4B>vb;2B>vc;2B>vd;",
         "4b>pa;4b>pb;",
         "4b>pc;4b>pd;",
@@ -1633,16 +1633,6 @@
     "dpv_engineering_mode_advanced": [
       "dpv_advanced_mode"
     ],
-    "VIS_CC_ZERO": [
-      "_data_format('I4V4Z4T4')",
-      "_disable_cache(False)",
-      "_notify(True)",
-      "set_adc_gain_I",
-      "set_adc_gain_Vin",
-      "VIS_CC_ZERO",
-      "_sync(True)",
-      "VIS_STI"
-    ],
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

python/res/devlib/json/Elite_EDC_1.4.devlib.json

@@ -492,14 +492,6 @@
         "1XC0;1X02;4B>ve;2B>vf;4B>vg;B>cn"
       ]
     },
-    "VIS_CC_ZERO": [
-      "_data_format('I4V4Z4T4')",
-      "_disable_cache(False)",
-      "_notify(True)",
-      "VIS_CC_ZERO",
-      "_sync(True)",
-      "VIS_STI"
-    ],
     "curve_cv3_high_cycle": {
       "type": "RIS",
       "parameter": {

python/res/devlib/json/Elite_EDC_1.5.devlib.json

@@ -671,6 +671,17 @@
       },
       "on_change": "set_para_DAC_VOLT"
     },
+    "DAC_VOLT_SCROLL": {
+      "description": "DAC scroll output Voltage",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
     "ADC_VALUE_I": {
       "description": "ADC value current value",
       "domain": "int"
@@ -836,6 +847,18 @@
       ],
       "on_change": "set_dac_gain_Vout"
     },
+    "DAC_VOLT_BUTTON": {
+      "description": "DAC volt",
+      "record_meta": true,
+      "initial": 1,
+      "value": [
+        "10000",
+        "25000",
+        "50000",
+        "60000"
+      ],
+      "on_change": "cali_Vout"
+    },
     "CTRL_HIGH_Z_15": {
       "description": "ctrl highZ level",
       "record_meta": true,
@@ -851,7 +874,8 @@
       "initial": 0,
       "value": [
         "Iin",
-        "Vin"
+        "Vin",
+        "Vout"
       ]
     },
     "BLE_WRITE": {
@@ -912,11 +936,13 @@
       "_notify(True)",
       "set_adc_gain_I",
       "set_adc_gain_Vin",
+      "set_dac_gain_Vout",
       {
         "expression": "ADC_DAC_CHANNEL_15",
         "when": {
           "0": "cali_Iin",
-          "1": "cali_Vin"
+          "1": "cali_Vin",
+          "2": "cali_Vout"
         }
       },
       "_sync(True)",
@@ -1007,12 +1033,6 @@
         "XE0;2B>va"
       ]
     },
-    "set_dac_gain_Vout": {
-      "type": "RIS",
-      "data": [
-        "XE1;X02;B>DAC_LEVEL_V_OUT_15"
-      ]
-    },
     "set_adc_gain_I": {
       "type": "RIS",
       "data": [
@@ -1025,6 +1045,12 @@
         "XE1;X01;B>ADC_LEVEL_V_IN_15"
       ]
     },
+    "set_dac_gain_Vout": {
+      "type": "RIS",
+      "data": [
+        "XE1;X02;B>DAC_LEVEL_V_OUT_15"
+      ]
+    },
     "set_ctrl_highZ": {
       "type": "RIS",
       "data": [
@@ -1052,13 +1078,22 @@
         "XF1;B>ADC_DAC_CHANNEL_15;B>ADC_LEVEL_V_IN_15"
       ]
     },
+    "cali_Vout": {
+      "type": "RIS",
+      "parameter": {
+        "v": "DAC_VOLT_BUTTON" 
+      },
+      "data": [
+        "XF1;B>ADC_DAC_CHANNEL_15;B>v"
+      ]
+    },
     "curve_iv": {
       "type": "RIS",
       "parameter": {
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME * 0x12",
+        "vd": "STEP_TIME",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1079,7 +1114,7 @@
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME * 0x12",
+        "vd": "STEP_TIME",
         "ve": "CYCLE_NUMBER",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
@@ -1203,7 +1238,7 @@
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "X07;",
+        "X0C;",
         "B>va;4B>vb;2B>vc;2B>vd;",
         "4b>pa;4b>pb;",
         "4b>pc;4b>pd;",
@@ -1633,16 +1668,6 @@
     "dpv_engineering_mode_advanced": [
       "dpv_advanced_mode"
     ],
-    "VIS_CC_ZERO": [
-      "_data_format('I4V4Z4T4')",
-      "_disable_cache(False)",
-      "_notify(True)",
-      "set_adc_gain_I",
-      "set_adc_gain_Vin",
-      "VIS_CC_ZERO",
-      "_sync(True)",
-      "VIS_STI"
-    ],
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

python/res/devlib/json/Elite_EDC_1.5r2.devlib.json

@@ -671,6 +671,17 @@
       },
       "on_change": "set_para_DAC_VOLT"
     },
+    "DAC_VOLT_SCROLL": {
+      "description": "DAC scroll output Voltage",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
     "ADC_VALUE_I": {
       "description": "ADC value current value",
       "domain": "int"
@@ -836,6 +847,18 @@
       ],
       "on_change": "set_dac_gain_Vout"
     },
+    "DAC_VOLT_BUTTON": {
+      "description": "DAC volt",
+      "record_meta": true,
+      "initial": 1,
+      "value": [
+        "10000",
+        "25000",
+        "50000",
+        "60000"
+      ],
+      "on_change": "cali_Vout"
+    },
     "CTRL_HIGH_Z_15": {
       "description": "ctrl highZ level",
       "record_meta": true,
@@ -851,7 +874,8 @@
       "initial": 0,
       "value": [
         "Iin",
-        "Vin"
+        "Vin",
+        "Vout"
       ]
     },
     "BLE_WRITE": {
@@ -912,11 +936,13 @@
       "_notify(True)",
       "set_adc_gain_I",
       "set_adc_gain_Vin",
+      "set_dac_gain_Vout",
       {
         "expression": "ADC_DAC_CHANNEL_15",
         "when": {
           "0": "cali_Iin",
-          "1": "cali_Vin"
+          "1": "cali_Vin",
+          "2": "cali_Vout"
         }
       },
       "_sync(True)",
@@ -1007,12 +1033,6 @@
         "XE0;2B>va"
       ]
     },
-    "set_dac_gain_Vout": {
-      "type": "RIS",
-      "data": [
-        "XE1;X02;B>DAC_LEVEL_V_OUT_15"
-      ]
-    },
     "set_adc_gain_I": {
       "type": "RIS",
       "data": [
@@ -1025,6 +1045,12 @@
         "XE1;X01;B>ADC_LEVEL_V_IN_15"
       ]
     },
+    "set_dac_gain_Vout": {
+      "type": "RIS",
+      "data": [
+        "XE1;X02;B>DAC_LEVEL_V_OUT_15"
+      ]
+    },
     "set_ctrl_highZ": {
       "type": "RIS",
       "data": [
@@ -1052,13 +1078,22 @@
         "XF1;B>ADC_DAC_CHANNEL_15;B>ADC_LEVEL_V_IN_15"
       ]
     },
+    "cali_Vout": {
+      "type": "RIS",
+      "parameter": {
+        "v": "DAC_VOLT_BUTTON" 
+      },
+      "data": [
+        "XF1;B>ADC_DAC_CHANNEL_15;B>v"
+      ]
+    },
     "curve_iv": {
       "type": "RIS",
       "parameter": {
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME * 0x12",
+        "vd": "STEP_TIME",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1079,7 +1114,7 @@
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME * 0x12",
+        "vd": "STEP_TIME",
         "ve": "CYCLE_NUMBER",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
@@ -1203,7 +1238,7 @@
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "X07;",
+        "X0C;",
         "B>va;4B>vb;2B>vc;2B>vd;",
         "4b>pa;4b>pb;",
         "4b>pc;4b>pd;",
@@ -1633,16 +1668,6 @@
     "dpv_engineering_mode_advanced": [
       "dpv_advanced_mode"
     ],
-    "VIS_CC_ZERO": [
-      "_data_format('I4V4Z4T4')",
-      "_disable_cache(False)",
-      "_notify(True)",
-      "set_adc_gain_I",
-      "set_adc_gain_Vin",
-      "VIS_CC_ZERO",
-      "_sync(True)",
-      "VIS_STI"
-    ],
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

python/res/devlib/json/Elite_EDC_1.5re.devlib.json

@@ -671,6 +671,17 @@
       },
       "on_change": "set_para_DAC_VOLT"
     },
+    "DAC_VOLT_SCROLL": {
+      "description": "DAC scroll output Voltage",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
     "ADC_VALUE_I": {
       "description": "ADC value current value",
       "domain": "int"
@@ -836,6 +847,18 @@
       ],
       "on_change": "set_dac_gain_Vout"
     },
+    "DAC_VOLT_BUTTON": {
+      "description": "DAC volt",
+      "record_meta": true,
+      "initial": 1,
+      "value": [
+        "10000",
+        "25000",
+        "50000",
+        "60000"
+      ],
+      "on_change": "cali_Vout"
+    },
     "CTRL_HIGH_Z_15": {
       "description": "ctrl highZ level",
       "record_meta": true,
@@ -851,7 +874,8 @@
       "initial": 0,
       "value": [
         "Iin",
-        "Vin"
+        "Vin",
+        "Vout"
       ]
     },
     "BLE_WRITE": {
@@ -912,11 +936,13 @@
       "_notify(True)",
       "set_adc_gain_I",
       "set_adc_gain_Vin",
+      "set_dac_gain_Vout",
       {
         "expression": "ADC_DAC_CHANNEL_15",
         "when": {
           "0": "cali_Iin",
-          "1": "cali_Vin"
+          "1": "cali_Vin",
+          "2": "cali_Vout"
         }
       },
       "_sync(True)",
@@ -1007,12 +1033,6 @@
         "XE0;2B>va"
       ]
     },
-    "set_dac_gain_Vout": {
-      "type": "RIS",
-      "data": [
-        "XE1;X02;B>DAC_LEVEL_V_OUT_15"
-      ]
-    },
     "set_adc_gain_I": {
       "type": "RIS",
       "data": [
@@ -1025,6 +1045,12 @@
         "XE1;X01;B>ADC_LEVEL_V_IN_15"
       ]
     },
+    "set_dac_gain_Vout": {
+      "type": "RIS",
+      "data": [
+        "XE1;X02;B>DAC_LEVEL_V_OUT_15"
+      ]
+    },
     "set_ctrl_highZ": {
       "type": "RIS",
       "data": [
@@ -1052,13 +1078,22 @@
         "XF1;B>ADC_DAC_CHANNEL_15;B>ADC_LEVEL_V_IN_15"
       ]
     },
+    "cali_Vout": {
+      "type": "RIS",
+      "parameter": {
+        "v": "DAC_VOLT_BUTTON" 
+      },
+      "data": [
+        "XF1;B>ADC_DAC_CHANNEL_15;B>v"
+      ]
+    },
     "curve_iv": {
       "type": "RIS",
       "parameter": {
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME * 0x12",
+        "vd": "STEP_TIME",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1079,7 +1114,7 @@
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME * 0x12",
+        "vd": "STEP_TIME",
         "ve": "CYCLE_NUMBER",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
@@ -1203,7 +1238,7 @@
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "X07;",
+        "X0C;",
         "B>va;4B>vb;2B>vc;2B>vd;",
         "4b>pa;4b>pb;",
         "4b>pc;4b>pd;",
@@ -1633,16 +1668,6 @@
     "dpv_engineering_mode_advanced": [
       "dpv_advanced_mode"
     ],
-    "VIS_CC_ZERO": [
-      "_data_format('I4V4Z4T4')",
-      "_disable_cache(False)",
-      "_notify(True)",
-      "set_adc_gain_I",
-      "set_adc_gain_Vin",
-      "VIS_CC_ZERO",
-      "_sync(True)",
-      "VIS_STI"
-    ],
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

python/res/devlib/json/Elite_EIS_1.0.devlib.json

@@ -62,6 +62,7 @@
       "value": [
         "EIS CURVE",
         "Cyclic Voltammetry",
+        "Chronoamperometric",
         "Dev Mode"
       ]
     },
@@ -265,6 +266,17 @@
         "expression": "VALUE"
       }
     },
+    "VOLT_VSCAN": {
+      "description": "Voltage of VScan",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
     "BLE_WRITE": {
       "description": "send msg to elite",
       "domain": {
@@ -295,20 +307,23 @@
       {
         "expression": "MODE",
         "when": {
-          "1": "set_adc_gain_I"
+          "1": "set_adc_gain_I",
+          "2": "set_adc_gain_I"
         }
       },
       {
         "expression": "MODE",
         "when": {
-          "1": "set_adc_gain_Vin"
+          "1": "set_adc_gain_Vin",
+          "2": "set_adc_gain_Vin"
         }
       },
       {
         "expression": "MODE",
         "when": {
           "0": "curve_eis",
-          "1": "curve_cv3"
+          "1": "curve_cv3",
+          "2": "curve_const_vscan"
         }
       },
       {
@@ -424,14 +439,23 @@
         "1XD2;1X02;4B>ve;2B>vf;2B>cn"
       ]
     },
-    "VIS_CC_ZERO": [
-      "_data_format('EISZeroOne')",
-      "_disable_cache(False)",
-      "_notify(True)",
-      "VIS_CC_ZERO",
-      "_sync(True)",
-      "VIS_STI"
-    ],
+    "curve_const_vscan": {
+      "type": "RIS",
+      "parameter": {
+        "va": "VOLT_VSCAN",
+        "pa": "ADC_LEVEL_I_15",
+        "pb": "ADC_LEVEL_V_IN_15",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE"
+      },
+      "data": [
+        "1XD3;",
+        "2B>va;",
+        "4b>pa;4b>pb;",
+        "4b>0;4b>pd;",
+        "2B>pe"
+      ]
+    },
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

python/res/devlib/json/Elite_EIS_1.1.devlib.json

@@ -62,6 +62,7 @@
       "value": [
         "EIS CURVE",
         "Cyclic Voltammetry",
+        "Chronoamperometric",
         "Dev Mode"
       ]
     },
@@ -265,6 +266,17 @@
         "expression": "VALUE"
       }
     },
+    "VOLT_VSCAN": {
+      "description": "Voltage of VScan",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
     "BLE_WRITE": {
       "description": "send msg to elite",
       "domain": {
@@ -295,20 +307,23 @@
       {
         "expression": "MODE",
         "when": {
-          "1": "set_adc_gain_I"
+          "1": "set_adc_gain_I",
+          "2": "set_adc_gain_I"
         }
       },
       {
         "expression": "MODE",
         "when": {
-          "1": "set_adc_gain_Vin"
+          "1": "set_adc_gain_Vin",
+          "2": "set_adc_gain_Vin"
         }
       },
       {
         "expression": "MODE",
         "when": {
           "0": "curve_eis",
-          "1": "curve_cv3"
+          "1": "curve_cv3",
+          "2": "curve_const_vscan"
         }
       },
       {
@@ -424,14 +439,23 @@
         "1XD2;1X02;4B>ve;2B>vf;2B>cn"
       ]
     },
-    "VIS_CC_ZERO": [
-      "_data_format('EISZeroOne')",
-      "_disable_cache(False)",
-      "_notify(True)",
-      "VIS_CC_ZERO",
-      "_sync(True)",
-      "VIS_STI"
-    ],
+    "curve_const_vscan": {
+      "type": "RIS",
+      "parameter": {
+        "va": "VOLT_VSCAN",
+        "pa": "ADC_LEVEL_I_15",
+        "pb": "ADC_LEVEL_V_IN_15",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE"
+      },
+      "data": [
+        "1XD3;",
+        "2B>va;",
+        "4b>pa;4b>pb;",
+        "4b>0;4b>pd;",
+        "2B>pe"
+      ]
+    },
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

python/res/devlib/json/Elite_EIS_MINI_1.0.devlib.json

@@ -62,6 +62,7 @@
       "value": [
         "EIS CURVE",
         "Cyclic Voltammetry",
+        "Chronoamperometric",
         "Dev Mode"
       ]
     },
@@ -265,6 +266,17 @@
         "expression": "VALUE"
       }
     },
+    "VOLT_VSCAN": {
+      "description": "Voltage of VScan",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
     "BLE_WRITE": {
       "description": "send msg to elite",
       "domain": {
@@ -295,20 +307,23 @@
       {
         "expression": "MODE",
         "when": {
-          "1": "set_adc_gain_I"
+          "1": "set_adc_gain_I",
+          "2": "set_adc_gain_I"
         }
       },
       {
         "expression": "MODE",
         "when": {
-          "1": "set_adc_gain_Vin"
+          "1": "set_adc_gain_Vin",
+          "2": "set_adc_gain_Vin"
         }
       },
       {
         "expression": "MODE",
         "when": {
           "0": "curve_eis",
-          "1": "curve_cv3"
+          "1": "curve_cv3",
+          "2": "curve_const_vscan"
         }
       },
       {
@@ -424,14 +439,23 @@
         "1XD2;1X02;4B>ve;2B>vf;2B>cn"
       ]
     },
-    "VIS_CC_ZERO": [
-      "_data_format('EISZeroOne')",
-      "_disable_cache(False)",
-      "_notify(True)",
-      "VIS_CC_ZERO",
-      "_sync(True)",
-      "VIS_STI"
-    ],
+    "curve_const_vscan": {
+      "type": "RIS",
+      "parameter": {
+        "va": "VOLT_VSCAN",
+        "pa": "ADC_LEVEL_I_15",
+        "pb": "ADC_LEVEL_V_IN_15",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE"
+      },
+      "data": [
+        "1XD3;",
+        "2B>va;",
+        "4b>pa;4b>pb;",
+        "4b>0;4b>pd;",
+        "2B>pe"
+      ]
+    },
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

python/res/devlib/json/Elite_MEGAFLY_0.1.devlib.json

@@ -1426,14 +1426,6 @@
         "X80;X03;B>CTRL_HIGH_Z_15"
       ]
     },
-    "VIS_CC_ZERO": [
-      "_data_format('I4V4Z4T4')",
-      "_disable_cache(False)",
-      "_notify(True)",
-      "VIS_CC_ZERO",
-      "_sync(True)",
-      "VIS_STI"
-    ],
     "pulse_fly": [
       "sti_mode",
       "gas1_mode",