[update]

python/biopro/devlib/data.py

@@ -885,8 +885,12 @@ 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
-        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 - ch2
+        else:
+            voltage = ch2
 
         cycle_number = struct.unpack('<H', data[20:22])[0]
         finish_mode_falg = data[22]

python/biopro/devlib/device.py

@@ -651,6 +651,8 @@ class DeviceInstruction:
     VIS_DEVICE_DONE = 0x20
     """identify device done"""
 
+    VIS_CC_ZERO = 0x40
+
     VIS_STI = 0xC0
     """stimulation on virtual instruction"""
 
@@ -724,6 +726,7 @@ 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'
 
@@ -747,6 +750,8 @@ 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/devlib/library.py

@@ -1105,8 +1105,6 @@ class CompletedDevice(Device):
         return self._configuration.get_parameter(name, False)
     
     def set_multi_parameters(self, parameter):
-        if len(parameter) == 0:
-            return
         for (name, value) in parameter[0].items():
             if name != 'target':
                 self.set_parameter(name, value)

python/biopro/project/condition.py

@@ -56,8 +56,7 @@ class Condition():
         return getattr(self, self.type)(**kwargs)
        
     def absolute_time(self, **kwargs):
-        # now = int(time())
-        now = round(time(), 1)
+        now = int(time())
         time_condition = round(self.datetime_to_timestamp(self.str_to_datetime(self._value)))
 
         return self.compareWith(self.comparsion, now, time_condition)
@@ -66,9 +65,8 @@ class Condition():
         project_start_time = kwargs['project_start_time']
         delay_time = kwargs['delay_time']
 
-        # time_diff = int(time() - project_start_time - delay_time)
-        time_diff = round(time() - project_start_time - delay_time, 1)
-        return self.compareWith(self.comparsion, time_diff, round(int(self._value), 1))
+        time_diff = int(time() - project_start_time - delay_time)
+        return self.compareWith(self.comparsion, time_diff, int(self._value))
     
     def after_task_run(self, **kwargs):
         # print('relative_time_from_task', kwargs,kwargs['task_start_time'],kwargs['delay_time'])
@@ -77,37 +75,19 @@ class Condition():
         task_start_time = kwargs['task_start_time'][-1]
         delay_time = kwargs['delay_time']
 
-        time_diff = round(time() - task_start_time - delay_time, 1)
-        return self.compareWith(self.comparsion, time_diff, round(int(self._value), 1))
+        time_diff = int(time() - task_start_time - delay_time)
+        # print('time_diff',  time_diff)
+        return self.compareWith(self.comparsion, time_diff, int(self._value))
     
     def device(self, **kwargs):
         print('device')
     
-    """ def previous_task_done(self, **kwargs):
+    def previous_task_done(self, **kwargs):
         running_task = kwargs['running_task']
         if running_task.status == 2 and self._active == False:
             self._active = True
             return True
-        return False """
-
-    def previous_task_done(self, **kwargs):
-        running_task = kwargs['running_task']
-        self_task = kwargs['self_task']
-        # print('\nprevious_task_done: ', running_task.status, ' ', self._active)
-        if running_task != self_task:
-            if running_task.status == 2 and self._active == False:
-                # self._active = True
-                return True
         return False
-    
-    """ def cycle(self, **kwargs):
-        running_task = kwargs['running_task']
-        self_task = kwargs['self_task']
-        if running_task != self_task:
-            if running_task.status == 2 and self._active == False:
-                # self._active = True
-                return True
-        return False """
 
     def str_to_datetime(self, time_str):
         return datetime.strptime(time_str,'%Y-%m-%dT%H:%M')

python/biopro/project/project.py

@@ -24,7 +24,7 @@ class Project(threading.Thread):
     self._project = project
     self._device_manager = device_manager
     self._mqtt_thread = mqttThread
-    self._time_interval = 0.1
+    self._time_interval = 1
     self._start_time = None
     self._end_time = None
 
@@ -139,39 +139,23 @@ class Project(threading.Thread):
               project_start_time = self._start_time,
               delay_time = delay_time,
               running_task= self._task_manager.running_task,
-              previous_task =  self._task_manager.prev_task,
-              self_task = task
+              previous_task =  self._task_manager.prev_task
             )
             # print('match_condition_list', match_condition_list)
             for condition in match_condition_list:
-              # print('\ncondition.type: ', condition.type)
               match_action_list = task.get_match_action(condition.id)
-              # print('match_action_list', match_action_list)
               for action in match_action_list:
-                # print('action type', action.type)
-                # print('match_action_list len: ', len(match_action_list))
+                # print('match_action', action.type, action.target)
                 if action.type == 'start' and task.status != 1:
                   self._task_manager.set_running_task(task)
-                  # Trace
                   self.mqtt_thread.broadcast_command('project:task ' + task.name + ' start at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
-                elif action.type == 'cycle' and task.status != 1:
-                  # TODO: directly goto next without swich cycle as running task
-                  """ if task._cycle_count < task._cycle - 1:
-                    task._cycle_count += 1
-                    cycle_target = self._task_manager.task_list[task._cycle_next - 1] # TODO: not sure deep or shallow
-                    cycle_target.reset()
-                    task = cycle_target """
-                  self._task_manager.set_running_task(task)
-                elif action.type == 'stop' and len(self._task_manager.running_task.parameter_set) == 0:
-                  self.mqtt_thread.broadcast_command('project:task ' + str(self._task_manager.running_task.name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
-                  self._task_manager.running_task.stop()
 
                 device = self._complete_device[action.target]
                 task_info = task.get_task_info(action)
                 instruction_set = getattr(self._instruction_set, action.type, None)
-                # print('instruction_set', instruction_set, '\n', action.type)
-                # if instruction_set != None and task.cycle == -1:
-                if instruction_set != None and len(task.parameter_set) > 0:
+                # print('instruction_set',instruction_set)
+                
+                if instruction_set != None:
                   for instruction in instruction_set:
                     args = list(map(lambda arg: task_info[arg], instruction['arguments']))
                     threading.Thread(target=getattr(device, instruction['method'])(*args))
@@ -180,8 +164,7 @@ class Project(threading.Thread):
 
         # check task not running then stop
         if self.check_running_task_not_run() == True:
-          if self._task_manager.running_task.cycle == -1:
-            self.mqtt_thread.broadcast_command('project:task ' + str(self._task_manager.running_task.name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
+          self.mqtt_thread.broadcast_command('project:task ' + str(self._task_manager.running_task.name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
           self._task_manager.running_task.stop()
         
         # check project done then close project
@@ -221,21 +204,13 @@ class Project(threading.Thread):
     # if no running task
     if self._task_manager.running_task == None:
       return False
-    
-    for key in self._task_manager.running_task.action:
-      # print('action key', key, self._task_manager.running_task, self._task_manager.running_task.action[key])
-      if len(self._task_manager.running_task.parameter_set) == 0 and self._task_manager.running_task.action[key]['type'] == 'stop':
-        return False
-      
+
     for device in self._task_manager.running_task.device:
       if self._complete_device[device].status == 1:
         return False
     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,
@@ -244,6 +219,6 @@ class Project(threading.Thread):
       'status': self._status,
       'device': self._device,
       'task': self.task_list,
-      'running_task': running_task
+      'running_task': self._task_manager.running_task.as_json()
     }
     return data

python/biopro/project/task.py

@@ -15,9 +15,6 @@ class Task:
     self._name = None
     self._parent = None
     self._cycle = None
-    self._cycle_count = 0
-    self._cycle_next = None
-    self._cycle_next_uuid = None
     self._device = None
     self._event = None
     self._trigger = None
@@ -103,31 +100,6 @@ class Task:
   @cycle.setter
   def cycle(self, new_cycle):
     self._cycle = new_cycle
-
-  # TODO: not sure needed?
-  @property
-  def cycle_count(self) -> int:
-    return self._cycle_count
-  
-  @cycle_count.setter
-  def cycle_count(self, new_cycle_count):
-    self._cycle_count = new_cycle_count
-    
-  @property
-  def cycle_next(self) -> str:
-    return self._cycle_next
-  
-  @cycle_next.setter
-  def cycle_next(self, new_cycle_next):
-    self._cycle_next = new_cycle_next
-
-  @property
-  def cycle_next_uuid(self) -> str:
-    return self._cycle_next_uuid
-  
-  @cycle_next_uuid.setter
-  def cycle_next_uuid(self, new_cycle_next_uuid):
-    self._cycle_next_uuid = new_cycle_next_uuid
   
   @property
   def device(self) -> dict:
@@ -235,10 +207,6 @@ class Task:
   
   def stop(self):
     self.status = 2
-  
-  def reset(self):
-    self.status = -1
-    # self.status = 0
 
   def get_match_action_list(self, match_condition_list):
     return map(lambda condition: [x for x in self._action_list if condition.id in x.get_condition_list()], match_condition_list)
@@ -273,9 +241,6 @@ class Task:
       'name': self.name,
       'parent': self.parent,
       'cycle': self.cycle,
-      'cycle_count': self.cycle_count,
-      'cycle_next': self.cycle_next,
-      'cycle_next_uuid': self.cycle_next_uuid,
       'device': self.device,
       'event': self.event,
       'trigger': self.trigger,

python/biopro/project/task_manager.py

@@ -57,8 +57,7 @@ class TaskManager():
         task = Task(task) 
         self._task_list.append(task)
     
-    # original version
-    """ def set_running_task(self, task):
+    def set_running_task(self, task):
       try:
         # if there is task running & same task active ,then reject
         if self._running_task != None and self._running_task.uuid == task.uuid:
@@ -81,44 +80,6 @@ class TaskManager():
           _task = next((task for task in self._task_list if task.uuid == task_uuid), None)
           if _task != None:
             self._next_task.append(_task)
-      except RuntimeError as e:
-        print(e) """
-
-    def set_running_task(self, task):
-      try:
-        # if there is task running & same task active ,then reject
-        if self._running_task != None and self._running_task.uuid == task.uuid:
-          # print('set_running_task return false: ', self._running_task.name)
-          return False
-
-        # save running task
-        self._prev_task = self._running_task
-        # clear next task list
-        self._next_task.clear()
-        self._running_task = task
-        self._running_task.run()
-
-        if self._prev_task != None:
-          # if previous task is still running, then need to close
-          if self._prev_task.status == 1:
-            self._prev_task.stop()
-          print('prev', 'run', self._prev_task.name, self._running_task.name)
-
-        # print(f'!!@#!set_running_task\n\n\n{task._cycle_count}\n{task._cycle}\n\n\n')
-        if task._cycle_count < task._cycle - 1:
-          task._cycle_count += 1
-          # use uuid to get the cycle next task
-          cycle_target = [_task_next for _task_next in self._task_list if _task_next.uuid == task._cycle_next_uuid]
-          # cycle_target = self._task_list[task._cycle_next - 1]  # original use index version
-          cycle_target[0].reset()
-          self._next_task.append(cycle_target[0])
-        else:
-          task._cycle_count = 0
-          for task_uuid in self._running_task.next:
-            _task = next((task for task in self._task_list if task.uuid == task_uuid), None)
-            if _task != None:
-              _task.reset()
-              self._next_task.append(_task)
       except RuntimeError as e:
         print(e)
 

python/biopro/recording/file.py

@@ -1131,17 +1131,14 @@ class RecordingFileWriter:
         self._splitting_size = 0
         return None
 
-    def close(self, mqtt_thread):
+    def close(self):
+        # if self._recording_file is not None:
+        #     self._recording_file.close()
+        #     self._recording_file = None
+        print('close1')
         self._close = True
         if len(self._recording_file_dict) > 0:
             for ch in self._data_db.keys():
-                if len(self._data_rl[ch]) > 0:
-                    self._data_rl[ch].append(str(int(self._time_now)))
-                    mes = ' '.join(self._data_rl[ch])
-                    mqtt_thread[ch].on_message(mes)
-                    self._data_rl[ch].clear()
-                    self._send_data[ch] = False
-
                 if self._recording_file_dict[ch]._status:
                     _data = ' '.join(self._data_db[ch])
                     self._raw_save['data'][ch] = _data

python/biopro/server/main.py

@@ -1015,7 +1015,6 @@ class ControlServer(SocketServer, ControlServerAPI):
     @logging_info
     def run_project(self, project) -> bool:
         if project is not None:
-            # print(project)
             project = self._project_manager.create(project)
             self._project_manager.run_project(project)
         return  project.as_json()

python/biopro/server/recording.py

@@ -229,6 +229,25 @@ class RecordingProcess(Process):
                 #     except:
                 #         pass
 
+                try:
+                    time_duration = self._meta_file.configuration.get_parameter('TIME_DURATION')
+                    if time_duration and time_duration is not 0 and time() - self._start_time >= time_duration:
+                        self._queue_msg.put(['ds', self._device, 'interrupt'])
+                        return None
+
+                    if isinstance(self._decoder, I4V4Z4T4DataDecoder) or isinstance(self._decoder, EISZeroOneDataDecoder):
+                        if self._decoder.isFinishMode is not None and self._decoder.isFinishMode() == 1:
+                            self._queue_msg.put(['ds', self._device, 'interrupt'])
+                            return None
+                            # content = {}
+                            # content['header'] = 'device_instruction/0'
+                            # content['device'] = result.device
+                            # content['instruction'] = 'interrupt'
+                            # self._mqtt_thread.publish('device_instruction',json_stringify(content), True)
+                            # self.server.stop_sync(self.device)
+                except RuntimeError as e:
+                    print(e)
+
                 if result is not None:
                     ##
                     if len(self._mqtt_send_data_ch_level) == 0:
@@ -245,27 +264,9 @@ class RecordingProcess(Process):
                 self._writer.channels_update(ret[0].channels())
             self._writer.write(ret, self._mqtt_send_data_ch_level)
         # print('write time: ', time() - ctime1)
+
         # print(ret)
 
-        try:
-            time_duration = self._meta_file.configuration.get_parameter('TIME_DURATION')
-            if time_duration and time_duration is not 0 and time() - self._start_time >= time_duration:
-                self._queue_msg.put(['ds', self._device, 'interrupt'])
-                return None
-
-            if isinstance(self._decoder, I4V4Z4T4DataDecoder) or isinstance(self._decoder, EISZeroOneDataDecoder):
-                if self._decoder.isFinishMode is not None and self._decoder.isFinishMode() == 1:
-                    self._queue_msg.put(['ds', self._device, 'interrupt'])
-                    return None
-                    # content = {}
-                    # content['header'] = 'device_instruction/0'
-                    # content['device'] = result.device
-                    # content['instruction'] = 'interrupt'
-                    # self._mqtt_thread.publish('device_instruction',json_stringify(content), True)
-                    # self.server.stop_sync(self.device)
-        except RuntimeError as e:
-            print(e)
-
         del ret
         del data
         return 
@@ -606,7 +607,7 @@ class RecordingProcess(Process):
 
     def final_write(self):
         if self._writer is not None:
-            return self._writer.close(self._mqtt_send_data_ch_level)
+            return self._writer.close()
         else:
             return False
     

python/res/devlib/json/ELITE_BAT_1_0.devlib.json

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_BAT_1.0",
+  "name": "EliteZM15",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
@@ -1633,6 +1633,16 @@
     "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

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_EDC_1.4",
+  "name": "Elite_EDC1",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
@@ -492,6 +492,14 @@
         "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

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_EDC_1.5",
+  "name": "EliteZM15",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
@@ -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,17 @@
       ],
       "on_change": "set_dac_gain_Vout"
     },
+    "DAC_VOLT_BUTTON": {
+      "description": "DAC volt",
+      "record_meta": true,
+      "initial": 1,
+      "value": [
+        "10000",
+        "25000",
+        "50000",
+        "60000"
+      ]
+    },
     "CTRL_HIGH_Z_15": {
       "description": "ctrl highZ level",
       "record_meta": true,
@@ -851,7 +873,8 @@
       "initial": 0,
       "value": [
         "Iin",
-        "Vin"
+        "Vin",
+        "Vout"
       ]
     },
     "BLE_WRITE": {
@@ -912,11 +935,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 +1032,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 +1044,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 +1077,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",
+        "vd": "STEP_TIME * 0x12",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1079,7 +1113,7 @@
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME",
+        "vd": "STEP_TIME * 0x12",
         "ve": "CYCLE_NUMBER",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
@@ -1633,6 +1667,16 @@
     "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_5_R2.devlib.json

@@ -1,12 +1,12 @@
 {
-  "name": "Elite_EDC_1.5r2",
+  "name": "EliteZM15",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
     "major_product_number": 0,
     "minor_product_number": 2,
     "major_version_number": 1,
-    "minor_version_number": 8
+    "minor_version_number": 6
   },
   "constant": {
     "TIME_MAX": 100000,
@@ -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,17 @@
       ],
       "on_change": "set_dac_gain_Vout"
     },
+    "DAC_VOLT_BUTTON": {
+      "description": "DAC volt",
+      "record_meta": true,
+      "initial": 1,
+      "value": [
+        "10000",
+        "25000",
+        "50000",
+        "60000"
+      ]
+    },
     "CTRL_HIGH_Z_15": {
       "description": "ctrl highZ level",
       "record_meta": true,
@@ -851,7 +873,8 @@
       "initial": 0,
       "value": [
         "Iin",
-        "Vin"
+        "Vin",
+        "Vout"
       ]
     },
     "BLE_WRITE": {
@@ -912,11 +935,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 +1032,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 +1044,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 +1077,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",
+        "vd": "STEP_TIME * 0x12",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1079,7 +1113,7 @@
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME",
+        "vd": "STEP_TIME * 0x12",
         "ve": "CYCLE_NUMBER",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
@@ -1633,6 +1667,16 @@
     "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_5_RE.devlib.json

@@ -1,12 +1,12 @@
 {
-  "name": "Elite_EDC_1.5re",
+  "name": "EliteZM15",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
     "major_product_number": 0,
     "minor_product_number": 2,
     "major_version_number": 1,
-    "minor_version_number": 7
+    "minor_version_number": 6
   },
   "constant": {
     "TIME_MAX": 100000,
@@ -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,17 @@
       ],
       "on_change": "set_dac_gain_Vout"
     },
+    "DAC_VOLT_BUTTON": {
+      "description": "DAC volt",
+      "record_meta": true,
+      "initial": 1,
+      "value": [
+        "10000",
+        "25000",
+        "50000",
+        "60000"
+      ]
+    },
     "CTRL_HIGH_Z_15": {
       "description": "ctrl highZ level",
       "record_meta": true,
@@ -851,7 +873,8 @@
       "initial": 0,
       "value": [
         "Iin",
-        "Vin"
+        "Vin",
+        "Vout"
       ]
     },
     "BLE_WRITE": {
@@ -912,11 +935,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 +1032,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 +1044,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 +1077,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",
+        "vd": "STEP_TIME * 0x12",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1079,7 +1113,7 @@
         "va": "VOLT_ORIGIN",
         "vb": "VOLT_FINAL",
         "vc": "VOLT_STEP",
-        "vd": "STEP_TIME",
+        "vd": "STEP_TIME * 0x12",
         "ve": "CYCLE_NUMBER",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
@@ -1203,7 +1237,7 @@
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "X0C;",
+        "X07;",
         "B>va;4B>vb;2B>vc;2B>vd;",
         "4b>pa;4b>pb;",
         "4b>pc;4b>pd;",
@@ -1633,6 +1667,16 @@
     "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

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_EIS_1.0",
+  "name": "EliteEIS",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
@@ -424,6 +424,14 @@
         "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"
+    ],
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

python/res/devlib/json/ELITE_EIS_1_1.devlib.json

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_EIS_1.1",
+  "name": "EliteEIS",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
@@ -424,6 +424,14 @@
         "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"
+    ],
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

python/res/devlib/json/ELITE_MEGAFLY_0_1.devlib.json

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_MEGAFLY_0.1",
+  "name": "Elite_MEGAFLY1",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Elite.*",
@@ -1426,6 +1426,14 @@
         "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",

python/res/devlib/json/ELITE_TRIG_0_1.devlib.json

@@ -1,5 +1,5 @@
 {
-  "name": "Elite_TRIG_0.1",
+  "name": "Elite_TRIG1",
   "version": "1.2.30",
   "match_rule": {
     "local_name_pattern": "Trigger.*",

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

@@ -1,451 +0,0 @@
-{
-  "name": "Elite_EIS_MINI_1.0",
-  "version": "1.2.30",
-  "match_rule": {
-    "local_name_pattern": "Elite.*",
-    "major_product_number": 0,
-    "minor_product_number": 4,
-    "major_version_number": 1,
-    "minor_version_number": 2
-  },
-  "constant": {
-    "FREQ_MAX": 4294967296,
-    "VOLT_MAX": 65536,
-    "BLE_WRITE_MAX": 255,
-    "TIME_MAX": 100000
-  },
-  "parameters": {
-    "TIME_DURATION": {
-      "description": "Run duration",
-      "record_meta": true,
-      "initial": 0,
-      "domain": [
-        "TIME_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "CHANNEL": {
-      "derzteription": "record channels",
-      "record_meta": true,
-      "domain": "property",
-      "value": "[0, 1, 2]"
-    },
-    "CHANNEL_LABEL": {
-      "description": "channel label",
-      "record_meta": true,
-      "domain": "property",
-      "value": "['current', 'voltage', 'impedance']"
-    },
-    "SAMPLE_RATE": {
-      "description": "data sampling rate",
-      "record_meta": true,
-      "initial": 1000,
-      "domain": [
-        1001
-      ],
-      "value": {
-        "expression": "VALUE"
-      },
-      "on_change": "set_sample_rate"
-    },
-    "AMP_GAIN": {
-      "description": "amp gain",
-      "record_meta": true,
-      "domain": "constant",
-      "value": 1
-    },
-    "MODE": {
-      "description": "working mode",
-      "record_meta": true,
-      "value": [
-        "EIS CURVE",
-        "Cyclic Voltammetry",
-        "Dev Mode"
-      ]
-    },
-    "FREQ": {
-      "description": "DPV current recording period start",
-      "record_meta": true,
-      "initial": [
-        13422819,
-        7
-      ],
-      "domain": {
-        "list": [
-          "FREQ_MAX"
-        ]
-      },
-      "value": "VALUE"
-    },
-    "FREQ_START": {
-      "description": "Start of Freq Scan",
-      "record_meta": true,
-      "initial": 13422819,
-      "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "FREQ_STOP": {
-      "description": "End of Freq Scan",
-      "record_meta": true,
-      "initial": 7,
-      "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "DELAY": {
-      "description": "Wait x peroid before start taking measurements",
-      "record_meta": true,
-      "initial": 0,
-      "domain": [
-        101
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "AVERAGE_NUM": {
-      "description": "Number of sample used for average funciton",
-      "record_meta": true,
-      "initial": 8,
-      "value": [
-        2,
-        4,
-        8,
-        16
-      ]
-    },
-    "DC_BIAS": {
-      "description": "DC voltage bias in mV",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "AC_AMP": {
-      "description": "AC Amplitude in mV",
-      "record_meta": true,
-      "initial": 25,
-      "domain": [
-        2048
-      ]
-    },
-    "SCALE": {
-      "description": "Point spacing pattern",
-      "record_meta": true,
-      "initial": 0,
-      "value": [
-        0,
-        1
-      ]
-    },
-    "PPD": {
-      "description": "Point per decades",
-      "record_meta": true,
-      "initial": 10,
-      "domain": [
-        11
-      ]
-    },
-    "RTIA": {
-      "description": "High speed tia gain",
-      "record_meta": true,
-      "initial": 4,
-      "value": [
-        0,
-        1,
-        2,
-        3,
-        4
-      ]
-    },
-    "ADC_VALUE_I": {
-      "description": "ADC value current value",
-      "domain": "int"
-    },
-    "Scan_Rate": {
-      "description": "Voltage Scan Rate",
-      "record_meta": true,
-      "initial": 10000,
-      "domain": [
-        100001
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "CTRL_HIGH_Z_15": {
-      "description": "ctrl highZ level",
-      "record_meta": true,
-      "initial": 1,
-      "value": [
-        "On",
-        "Off"
-      ],
-      "on_change": "set_ctrl_highZ"
-    },
-    "ADC_LEVEL_I_15": {
-      "description": "ADC level",
-      "record_meta": true,
-      "initial": 4,
-      "value": [
-        "0",
-        "1",
-        "2",
-        "3",
-        "auto"
-      ],
-      "on_change": "set_adc_gain_I"
-    },
-    "ADC_LEVEL_V_IN_15": {
-      "description": "ADC level",
-      "record_meta": true,
-      "initial": 3,
-      "value": [
-        "0",
-        "1",
-        "2",
-        "auto"
-      ],
-      "on_change": "set_adc_gain_Vin"
-    },
-    "VOLT_INITIAL": {
-      "description": "Initial Voltage of Scan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "VOLT_MAX": {
-      "description": "Max Voltage of Scan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "VOLT_MIN": {
-      "description": "Min Voltage of Scan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "CYCLE_NUMBER": {
-      "description": "CV cycle number",
-      "record_meta": true,
-      "initial": 1,
-      "domain": [
-        65536
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
-    },
-    "BLE_WRITE": {
-      "description": "send msg to elite",
-      "domain": {
-        "list": [
-          "BLE_WRITE_MAX"
-        ]
-      },
-      "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]",
-      "value": "VALUE"
-    },
-    "BLE_READ": {
-      "description": "receive msg from elite",
-      "domain": "int"
-    }
-  },
-  "instruction": {
-    "start": [
-      {
-        "expression": "MODE",
-        "when": {
-          "*": "start_data"
-        }
-      }
-    ],
-    "start_data": [
-      "data_format_cali",
-      "_notify(True)",
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_I"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_Vin"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "curve_eis",
-          "1": "curve_cv3"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "curve_eis_para2",
-          "1": "curve_cv3_para2"
-        }
-      },
-      "_sync(True)",
-      "VIS_STI"
-    ],
-    "data_format": [
-      "_data_format('EISZeroOne')",
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "_disable_cache(True)",
-          "1": "_disable_cache(True)",
-          "*": "_disable_cache(False)"
-        }
-      }
-    ],
-    "data_format_cali": [
-      "_data_format_cali('EISZeroOne')"
-    ],
-    "set_sample_rate": {
-      "type": "RIS",
-      "parameter": {
-        "va": "SAMPLE_RATE"
-      },
-      "data": [
-        "XE0;2B>va"
-      ]
-    },
-    "set_adc_gain_I": {
-      "type": "RIS",
-      "data": [
-        "XE1;X05;B>ADC_LEVEL_I_15"
-      ]
-    },
-    "set_adc_gain_Vin": {
-      "type": "RIS",
-      "data": [
-        "XE1;X06;B>ADC_LEVEL_V_IN_15"
-      ]
-    },
-    "set_ctrl_highZ": {
-      "type": "RIS",
-      "data": [
-        "XE1;X03;B>CTRL_HIGH_Z_15"
-      ]
-    },
-    "curve_eis": {
-      "type": "RIS",
-      "parameter": {
-        "fa": "FREQ[0]",
-        "fb": "FREQ[1]",
-        "dp": "DELAY",
-        "dc": "DC_BIAS",
-        "am": "AC_AMP",
-        "an": "AVERAGE_NUM",
-        "rt": "RTIA",
-        "pp": "PPD",
-        "sp": "SCALE"
-      },
-      "data": [
-        "1XD1;1X01;4B>fa;4B>fb;2B>dp"
-      ]
-    },
-    "curve_eis_para2": {
-      "type": "RIS",
-      "parameter": {
-        "fa": "FREQ[0]",
-        "fb": "FREQ[1]",
-        "dp": "DELAY",
-        "dc": "DC_BIAS",
-        "am": "AC_AMP",
-        "an": "AVERAGE_NUM",
-        "rt": "RTIA",
-        "pp": "PPD",
-        "sp": "SCALE"
-      },
-      "data": [
-        "1XD1;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
-      ]
-    },
-    "curve_cv3": {
-      "type": "RIS",
-      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
-        "vf": "SAMPLE_RATE",
-        "cn": "CYCLE_NUMBER"
-      },
-      "data": [
-        "1XD2;1X01;2B>va;2B>vb;2B>vc;"
-      ]
-    },
-    "curve_cv3_para2": {
-      "type": "RIS",
-      "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
-        "vf": "SAMPLE_RATE",
-        "cn": "CYCLE_NUMBER"
-      },
-      "data": [
-        "1XD2;1X02;4B>ve;2B>vf;2B>cn"
-      ]
-    },
-    "ble_instru_send": [
-      "ble_write",
-      "_cdr('20X>ADC_VALUE_I')"
-    ],
-    "ble_write": {
-      "type": "RIS",
-      "data": [
-        "XFF;",
-        "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];",
-        "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];",
-        "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];",
-        "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];",
-        "1B>BLE_WRITE[16];"
-      ]
-    },
-    "dev_version": [
-      "CIS_VERSION",
-      "_cdr('20X>ADC_VALUE_I')"
-    ],
-    "dev_battery": [
-      "CIS_VOLT",
-      "_cdr('20X>ADC_VALUE_I')"
-    ]
-  }
-}