[update] fix hstia gain

python/biopro/data.py

@@ -87,8 +87,7 @@ class DataAPI(metaclass=abc.ABCMeta):
     def update_device_configuration(self,
                                     device: Union[int, Device],
                                     meta_file: Union[str, Path, RecordingMetaFile],
-                                    data_format: Union[AnyStr, DataDecodeFormat],
-                                    project_info: str):
+                                    data_format: Union[AnyStr, DataDecodeFormat]):
         """set device configuration.
 
         :param device: device ID
@@ -155,8 +154,7 @@ class DataClient(SocketClient, DataAPI, metaclass=SocketClientMacro(DataAPI)):
     def update_device_configuration(self,
                                     device: Union[int, Device],
                                     meta_file: Union[str, Path, RecordingMetaFile],
-                                    data_format: Union[AnyStr, DataDecodeFormat],
-                                    project_info: str):
+                                    data_format: Union[AnyStr, DataDecodeFormat]):
 
         # meta file
         if isinstance(meta_file, str):
@@ -188,7 +186,7 @@ class DataClient(SocketClient, DataAPI, metaclass=SocketClientMacro(DataAPI)):
             raise TypeError('not a data decode format : ' + data_format.__class__.__name__)
 
         # send
-        self.send_command('update_device_configuration', device, meta_file, data_format, project_info)
+        self.send_command('update_device_configuration', device, meta_file, data_format)
 
     def is_sync(self, device: Union[None, int, Device] = None) -> bool:
         if isinstance(device, Device):

python/biopro/db/base.py

@@ -1,10 +0,0 @@
-from sqlalchemy import create_engine
-# from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker, declarative_base
-
-SQLALCHEMY_DATABASE_URL = "postgresql://biopro:BioProControlBox@127.0.0.1:5432/postgres"
-
-engine = create_engine(SQLALCHEMY_DATABASE_URL)
-Session = sessionmaker(bind=engine)
-
-Base = declarative_base()

python/biopro/db/meta_project_info.py

@@ -1,21 +0,0 @@
-from sqlalchemy import Table, Column, String, MetaData, ForeignKey, JSON
-from sqlalchemy.sql import select, func
-from sqlalchemy.types import Integer, BigInteger, String, Boolean, TIMESTAMP, Numeric
-from sqlalchemy.dialects.postgresql import JSONB
-
-from .base import Base
-
-class MetaProjectInfo(Base):
-    __tablename__ = "meta_project_info"
-
-    id = Column(Integer, primary_key=True)
-    project = Column(String(36))
-    cycle = Column(String)
-    task = Column(JSONB)
-    serial_number = Column(Integer)
-    deleted = Column(Boolean, default = False)
-    created_at = Column(TIMESTAMP(timezone=True), server_default=func.now())
-    updated_at = Column(TIMESTAMP(timezone=True), onupdate=func.now())
-
-    # def __repr__(self):
-    #     return f"User(id={self.id!r}, name={self.name!r}, fullname={self.task!r})"

python/biopro/db/project_report.py

@@ -1,24 +0,0 @@
-from sqlalchemy import Table, Column, String, MetaData, ForeignKey, JSON
-from sqlalchemy.sql import select, func
-from sqlalchemy.types import Integer, BigInteger, String, Boolean, TIMESTAMP, Numeric
-from sqlalchemy.dialects.postgresql import JSONB
-
-from .base import Base
-
-class ProjectReport(Base):
-    __tablename__ = "project_report"
-
-    id = Column(Integer, primary_key=True)
-    name = Column(String)
-    desc = Column(String)
-    task = Column(JSONB)
-    cycle = Column(JSONB)
-    device = Column(JSONB)
-    uuid = Column(String(36))
-    user_auth = Column(JSONB)
-    deleted = Column(Boolean, default = False)
-    created_at = Column(TIMESTAMP(timezone=True), server_default=func.now())
-    updated_at = Column(TIMESTAMP(timezone=True), onupdate=func.now())
-
-    # def __repr__(self):
-    #     return f"User(id={self.id!r}, name={self.name!r}, fullname={self.task!r})"

python/biopro/device/manager.py

@@ -574,23 +574,20 @@ class DeviceManager(MasterDevice, Synchronized):
         :param device: device ID or response info
         :return: CompletedDevice, None if not found.
         """
-        try:
-            if isinstance(device, int):
-                for slave in self._device:
-                    if slave.device_id == device:
-                        return slave
+        if isinstance(device, int):
+            for slave in self._device:
+                if slave.device_id == device:
+                    return slave
 
-            elif isinstance(device, str):
-                for slave in self._device:
-                    if ':'.join('{:02x}'.format(b) for b in slave.mac_address) == device.lower():
-                        return slave
+        elif isinstance(device, str):
+            for slave in self._device:
+                if ':'.join('{:02x}'.format(b) for b in slave.mac_address) == device.lower():
+                    return slave
 
-            elif isinstance(device, DeviceInfo):
-                for slave in self._device:
-                    if device.match(slave):
-                        return slave
-        except BaseException as e:
-            self.log_error('device not found', str(device))
+        elif isinstance(device, DeviceInfo):
+            for slave in self._device:
+                if device.match(slave):
+                    return slave
 
         return None
 

python/biopro/devlib/data.py

@@ -1346,8 +1346,8 @@ class EISZeroOneDataDecoder(RecDataDecoder):
     __slots__ = ('_message', '_cycle_number', '_start_return_data', '_time_stamp',
                  '_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', '_show_data')
+                 'cali_coeff', '_ac_amp', '_mode',
+                 '_last_phase', '_first_phase_flag', '_show_data')
 
     def __init__(self, cali_coeff: bytes = None):
         super().__init__()
@@ -1362,9 +1362,6 @@ class EISZeroOneDataDecoder(RecDataDecoder):
         self._cycle_start_time = []
         self._ac_amp: int = 0
         self._mode: int = 0
-        self._freq_start: int = 0
-        self._freq_stop: int = 0
-        self._freq_direction = 0
         self._last_phase = 0
         self._first_phase_flag = 1
 
@@ -1429,25 +1426,25 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             index = 60
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
             hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])
 
             #Lv[1] 20k
             index = 80
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
             hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])
 
             #Lv[2] 5k
             index = 100
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
             hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])
 
             #Lv[3] 200R
             index = 120
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0]/1e8)
             hsrtia_b.append(struct.unpack('>i', cali_coeff[index+5:index+9])[0]/1e8)
-            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0]/1e4)
+            hsrtia_c.append(struct.unpack('>i', cali_coeff[index+9:index+13])[0])
 
             index = 140
             g = 1
@@ -1530,7 +1527,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
         time_stamp: float = struct.unpack('<I', data[13+3:17+3])[0]  # unit: ms
         cycle_number = struct.unpack('>H', data[17+3:19+3])[0]
         d19 = data[19+3]
-        gain = (d19 & 0x0F)
+        gain = data[20+3]
         finishMode = (d19 & 0x80) >> 7        
         
         if time_stamp == 0:
@@ -1557,10 +1554,6 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                     cutoff_freq, phase_coeff, phase_offset, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d = self.cali_coeff[0]
 
                     voltage_amp = round(self._ac_amp * 800 / 2047) # use UI value
-                    if (self._freq_start > self._freq_stop):
-                        self._freq_direction = 0
-                    else:
-                        self._freq_direction = 1
 
                 if (self._mode == 0):
                     img = ch1
@@ -1568,12 +1561,17 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                     freq = ch3
                     fre_idx = 0
 
-                    voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 / cutoff_freq ** 2)
+                    rolloff_cali = cutoff_freq/1e5
+                    voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 /  rolloff_cali ** 2 / 1e4)
 
                     # if (gain == 3):
                     #     current = hsrtia_a[gain] * math.exp(hsrtia_b[gain] * voltage_mag) + hsrtia_c[gain] * math.exp(hsrtia_d[gain] * voltage_mag)
                     # else:
-                    current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain] + hsrtia_c[gain]
+                    
+                    current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain]
+                    # current = voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain] + hsrtia_c[gain]
+                    
+
                     # print(current)
                     # print(voltage_mag)
                     # print(hsrtia_a[gain])
@@ -1631,7 +1629,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                             '|', '{:5}'.format(round(current, 3)),
                             '|', '{:1}'.format(gain),
                             '|', '{:1}'.format(finishMode),
-                            '@', str(self.device), '|')
+                            '@', str(self.device), '|', flush = True)
                         pass
                     else:
                         print('|', '{:10}'.format(time_stamp),
@@ -1642,7 +1640,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                             '|', '{:5}'.format(cycle_number),
                             '|', '{:1}'.format(gain),
                             '|', '{:1}'.format(finishMode),
-                            '@', str(self.device), '|')
+                            '@', str(self.device), '|', flush = True)
                         pass
 
         if finishMode == True:

python/biopro/devlib/device.py

@@ -738,7 +738,7 @@ class DeviceCommonInstruction:
         elif instruction == cls.START:
             return '_data_format("TDC4VAF2")', '_notify(True)', 'VIS_STI', '_sync(True)'
         elif instruction == cls.INTERRUPT:
-            return '_notify(False)', 'VIS_INT', '_sync(False)'
+            return '_sync(False)', '_notify(False)', 'VIS_INT'
         elif instruction == cls.CLOSE:
             return '_sync(False)', '_notify(False)', 'VIS_INT'
         elif instruction == cls.CALL:

python/biopro/devlib/library.py

@@ -968,7 +968,7 @@ class CompletedDevice(Device):
     """
     __slots__ = ('_master', '_device_id', '_device', '_library', '_context',
                  '_parameter', '_configuration', '_lock', '_feature_mask',
-                 '_cache_battery', '_cache_battery_timestamp', '_coeff', '_status', '_occupied_by_project')
+                 '_cache_battery', '_cache_battery_timestamp', '_coeff', '_status')
 
     def __init__(self, master: MasterDevice, library: DeviceLibrary, device_id: int, device: Device):
         """
@@ -986,8 +986,6 @@ class CompletedDevice(Device):
 
         # device status ( 0: idle, 1: working, 2: error, 3: power off)
         self._status = 0
-        # device be occupied by project
-        self._occupied_by_project = None
 
         # context
         s1 = library.constant
@@ -1084,14 +1082,6 @@ class CompletedDevice(Device):
     def status(self, new_status):
         self._status = new_status
 
-    @property
-    def occupied_by_project(self) -> str:
-        return self._occupied_by_project
-    
-    @occupied_by_project.setter
-    def occupied_by_project(self, new_occupied_by_project):
-        self._occupied_by_project = new_occupied_by_project
-
     # device parameter getter/setter
 
     def parameters(self) -> List[str]:
@@ -1313,7 +1303,6 @@ class CompletedDevice(Device):
             'recording_file_name':      self.recording_file_name,
             'library_name':    self._library.name,
             'library_version': str(self._library.version),
-            'occupied_by_project': self._occupied_by_project,
             'configuration':   self.configuration.as_json(list_hide=True),
         }
 

python/biopro/project/project.py

@@ -66,7 +66,6 @@ class Project(threading.Thread):
     for device in device_list:
       mac_address = device_list[device]['pair']
       complete_device = self._device_manager.get_device(mac_address)
-      complete_device.occupied_by_project = self._uuid
       self._complete_device[device] = complete_device
 
   @property
@@ -137,10 +136,6 @@ class Project(threading.Thread):
   def running_task(self):
     return self._task_manager.running_task
 
-  def get_device_parameter_set(self, device_address):
-    parameter_set = self._task_manager.running_task.parameter_set
-    return next((x for x in parameter_set if parameter_set[x]['target'] == device_address), None)
-
   def run(self):
       self._status = 1
       self._start_time = time()
@@ -166,7 +161,6 @@ class Project(threading.Thread):
 
             for condition in match_condition_list:
               match_action_list = task.get_match_action(condition.id)
-              print('match_action_list', match_action_list, match_action_list)
               for action in match_action_list:
                 if action.type == 'cycle' and condition.type == 'previous_task_done':
                   self.mqtt_thread.broadcast_command('project:task ' + task.name + ' start at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
@@ -190,8 +184,6 @@ class Project(threading.Thread):
 
                 elif action.type == 'idle':
                   self._task_manager.running_task.stop()
-                # elif action.type == 'stop':
-                #   self._task_manager.running_task.stop()
 
                 instruction_set = None
 
@@ -231,7 +223,7 @@ class Project(threading.Thread):
                             task_info['file_name'] += '#' + str(cycle_info['name']) + '-' + str(cycle_info['count'])
                     self.log_verbose('file name ' + task_info['file_name'])
                     
-                  if instruction_set != None and self.get_device_parameter_set(action.target) != None:
+                  if instruction_set != None and len(task.parameter_set) > 0:
                     if action.type == 'start':
                       self._count += 1
                     for instruction in instruction_set:
@@ -261,8 +253,6 @@ class Project(threading.Thread):
     pass
 
   def stop(self):
-    for device in self._complete_device:
-      self._complete_device[device].occupied_by_project = None
     self._task_manager.running_task.stop()
     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._status = 2
@@ -271,8 +261,6 @@ class Project(threading.Thread):
     self.mqtt_thread.broadcast_command('project:project ' + str(self._name) + ' stop at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
 
   def close(self):
-    for device in self._complete_device:
-      self._complete_device[device].occupied_by_project = None
     self._status = 2
     self._end_time = time()
     self._stop_flag  = True
@@ -331,18 +319,6 @@ class Project(threading.Thread):
       'device': self._device,
       'task': self.task_list,
       'running_task': running_task,
-      'cycle': self._cycle,
-      'count': self._count,
-    }
-    return data
-  
-  def info_pass_data_server(self):
-    if self._task_manager.running_task is not None:
-      running_task = self._task_manager.running_task.as_json()
-    data = {
-      'project': self._uuid,
-      'task': running_task,
-      'cycle': self._cycle,
-      'serial_number': self._count,
+      'cycle': self._cycle
     }
     return data

python/biopro/recording/file.py

@@ -118,7 +118,7 @@ class RecordingMetaFile(JsonSerialize):
                  '_dirty', '_last_modify_time', '_file_size_cache',
                  '_recording_file_ch', '_recording_sub_file', '_size',
                  '_parameter', '_parent', '_recording_file_name', '_recording_sub_mini', '_recording_mini_ch',
-                 '_raw_serial_number', '_mini_serial_number', '_device_id', '_project_id')
+                 '_raw_serial_number', '_mini_serial_number', '_device_id')
 
     def __init__(self, filepath: Union[str, Path], data_format: bytes = None, id_db = 0, database = None):
         if isinstance(filepath, str):
@@ -153,7 +153,6 @@ class RecordingMetaFile(JsonSerialize):
         self._parent = ''
         self._recording_file_name = ''
         self._device_id = -1
-        self._project_id = None
 
         # recording parameter
         self._configuration = None
@@ -298,7 +297,6 @@ class RecordingMetaFile(JsonSerialize):
             'uuid': str(self._file_uuid),
             'data_format': 'rec',
             'device': self._device,
-            'project': self._project_id,
         }
 
         if len(self._parent) > 0:
@@ -464,7 +462,7 @@ class RecordingMetaFile(JsonSerialize):
     def parameter(self) -> str:
         return self._parameter
 
-    @parameter.setter
+    @device.setter
     def parameter(self, parameter):
         self._parameter = parameter
         return None
@@ -473,7 +471,7 @@ class RecordingMetaFile(JsonSerialize):
     def parent(self) -> str:
         return self._parent
 
-    @parent.setter
+    @device.setter
     def parent(self, parent):
         self._parent = parent
 
@@ -481,7 +479,7 @@ class RecordingMetaFile(JsonSerialize):
     def recording_file_name(self) -> str:
         return self._recording_file_name
 
-    @recording_file_name.setter
+    @device.setter
     def recording_file_name(self, recording_file_name):
         self._recording_file_name = recording_file_name
 
@@ -494,15 +492,6 @@ class RecordingMetaFile(JsonSerialize):
         self._configuration = conf
         self._dirty = True
         return None
-    
-    @property
-    def project_id(self) -> int:
-        return self._project_id
-
-    @project_id.setter
-    def project_id(self, project: int):
-        self._project_id = project
-        return None
 
     @property
     def channels(self) -> List[int]:

python/biopro/server/data.py

@@ -4,6 +4,7 @@ from time import time, sleep
 from typing import Iterable
 from datetime import datetime
 import gc
+
 import base64
 
 from biopro.data import *
@@ -26,6 +27,7 @@ from .mqtt import MqttDataMessageHandler, MqttThread
 from .database import DataBaseProcess
 from .recording import RecordingProcess
 from multiprocessing import Queue
+import queue
 
 from json import loads as json_parse, dumps as _json_stringify
 import json
@@ -315,8 +317,7 @@ class DataServer(SocketServer, DataAPI):
     def update_device_configuration(self,
                                     device: str,
                                     meta_file: Union[str, Path, RecordingMetaFile],
-                                    data_format: Union[AnyStr, DataDecodeFormat],
-                                    project_info: str):
+                                    data_format: Union[AnyStr, DataDecodeFormat]):
         # meta file
 
         device_id = -1
@@ -344,8 +345,6 @@ class DataServer(SocketServer, DataAPI):
         _parent = json_stringify(_device['parent'])
         _recording_file_name = _device['recording_file_name']
         mac_address = json.loads(device)['device_address']
-        device_id = _device['device_id']
-
         del _device['configuration']
         del _device['parent']
         del _device['recording_file_name']
@@ -355,22 +354,13 @@ class DataServer(SocketServer, DataAPI):
         # meta_file.parameter = _parameter
         # meta_file.parent = _parent
         # meta_file.recording_file_name = _recording_file_name
+        device_id = int(json.loads(device)['device_id'])
 
         if device_id < 0:
             raise ValueError('illegal device ID : ' + str(device_id))
 
         self.log_verbose('device ID', device_id)
 
-        # project binding meta file
-        project_id = None
-        _project = None
-        if project_info != None:
-            _project = json.loads(project_info)
-            self.database_process.put_queue(['project_insert', device_id, _project])
-            result = self._queue_ds_dict[int(device_id)].get()
-            if result[0] == 'project_id':
-                project_id =  result[1]
-
         # while len(self._configurations) <= device_id:
         #     self._configurationsappend(None)
 
@@ -390,6 +380,8 @@ class DataServer(SocketServer, DataAPI):
         else:
             data_format = data_format.name
 
+        # self.log_verbose('device data format', data_format)
+
         self.log_verbose('device meta file', meta_file)
 
         # data runtime
@@ -414,15 +406,15 @@ class DataServer(SocketServer, DataAPI):
                 c.shutdown()
                 c.join()
                 self._spi.set_wait_flag(c._device, True)
-
             data_runtime_process = RecordingProcess('data_server', self.log_verbose, device_id, 
                                                     Queue(), self._queue_ds_dict[int(device_id)], self._queue_msg, meta_file,
                                                     json_stringify(_device), _parameter, _parent, _recording_file_name,
-                                                    data_format, self.socket_mqtt_ip, self.socket_mqtt_port, 
-                                                    project_id = project_id,
-                                                    database = self.database_process)
+                                                    data_format, self.socket_mqtt_ip, self.socket_mqtt_port,
+                                                    database = self.database_process )
+            # data_runtime_process.start()
 
         # check channel
+
         if isinstance(data_runtime_process, RecordingProcess) and device_id not in self._available_channel:
             raise RuntimeError('set device configuration on un-available channel', device_id)
 

python/biopro/server/database.py

@@ -550,33 +550,4 @@ class DataBaseProcess(Process):
         except psycopg2.Error as e:
             print('e', e)
 
-        return True
-    
-    def project_insert(self, device_id, _data):
-        sql_str = 'INSERT INTO "public"."meta_project_info" ('
-        sql_set = []
-        for item in _data.keys():
-            sql_str = sql_str + str(item) + ', '
-            if isinstance(_data[item], dict) or isinstance(_data[item], list):
-                sql_set.append(json_stringify(_data[item]))
-            else:
-                sql_set.append(_data[item])
-
-        sql_str = sql_str[0:-2] + ') VALUES ('
-        for item in _data.keys():
-            sql_str = sql_str + '%s, '
-
-        sql_str = sql_str[0:-2] + ') RETURNING id'
-        sql_cursor = self._psql_conn.cursor()
-
-        try:
-            sql_cursor.execute(sql_str, sql_set)
-        except BaseException as e:
-            print('insert error', e)
-            self._psql_conn.commit()
-            sql_cursor.close()
-            self._queue_error.put()
-        finally:
-            self._queue_ds[int(device_id)].put(['project_id', int(sql_cursor.fetchone()[0])])
-            self._psql_conn.commit()
-            sql_cursor.close()
+        return True

python/biopro/server/main.py

@@ -1,7 +1,6 @@
 from time import sleep
 from typing import Iterable
 from datetime import datetime
-import json
 
 import biopro.impl.vcgencmd as vcg
 from biopro.data import DataServerOptions, DataAPI
@@ -32,10 +31,8 @@ from biopro.api.auth import AuthAPI
 from biopro.api.controller import ControllerAPI
 from biopro.api.device import DeviceAPI
 from biopro.project.project_manager import ProjectManager
-from biopro.db.base import Base, Session, engine
-from biopro.db.project_report import ProjectReport
-from biopro.db.meta_project_info import MetaProjectInfo
-
+### do not import Websocket mode
+###from .websocket import WebsocketThread
 
 _RUNTIME_COMPILE = False
 
@@ -120,8 +117,8 @@ class ControlServer(SocketServer, ControlServerAPI):
             self.ups_thread = UPSDetectThread(self, c.flag_ups_wait_time)
 
         # user session
-        # self._session = {}
-        # self._user_session_expire = c.user_session_expire_days * 24 * 60 * 60  # sec
+        self._session = {}
+        self._user_session_expire = c.user_session_expire_days * 24 * 60 * 60  # sec
 
         # indicate those device together
         self._device_instruction_group = None
@@ -132,10 +129,6 @@ class ControlServer(SocketServer, ControlServerAPI):
         # _api request build
         self._api = ApiRequests()
 
-        # sqlalchemy
-        Base.metadata.create_all(engine)
-        self._session = Session()
-
     # init method
 
     def _init_file_manager(self, option: ControlServerOptions) -> FileManager:
@@ -827,19 +820,16 @@ class ControlServer(SocketServer, ControlServerAPI):
 
     @logging_info
     def device_battery(self, device:int) -> List[int]:
-        try:
-            battery = {}
-            if device == 'all':
-                device_list = self.device_manager.list_device()
-                if len(device_list) > 0:
-                    battery = list(map(lambda x: {"device": x.memory_board, "battery":self.device_manager.get_device(x).battery}, device_list))
-            else:
-                battery = {
-                    "device": device,
-                    "battery": self.device_manager.get_device(device).battery
-                }
-        except AttributeError as e:
-            print('device_battery', device, 'not found', e) 
+        battery = {}
+        if device == 'all':
+            device_list = self.device_manager.list_device()
+            if len(device_list) > 0:
+                battery = list(map(lambda x: {"device": x.memory_board, "battery":self.device_manager.get_device(x).battery}, device_list))
+        else:
+            battery = {
+                "device": device,
+                "battery": self.device_manager.get_device(device).battery
+            }
         return battery
 
     @logging_info
@@ -1031,17 +1021,8 @@ 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)
-            with self._session as session:
-                    project_report = ProjectReport(
-                        name = project.name,
-                        uuid = project.uuid,
-                        cycle = project.cycle,
-                        task = project.task_list,
-                        device = project.device
-                    )
-                    session.add(project_report)
-                    session.commit()
             self._project_manager.run_project(project)
         return  project.as_json()
     
@@ -1097,7 +1078,6 @@ class ControlServer(SocketServer, ControlServerAPI):
         self.log_verbose('update data format', value)
 
         client = self.data_server.client()
-        project = None
         if client is not None:
             info = self.file_manager.use(device)
 
@@ -1108,12 +1088,9 @@ class ControlServer(SocketServer, ControlServerAPI):
                 filename = self._file_save_cache.get(device.device_id, self.TEMP_FILENAME_EXPR)
                 filename = format_filename(filename, device)
                 info = self.file_manager.save(device, filename)
-            
-            if device.occupied_by_project != None:
-                project = json.dumps(self.project_manager.get(device.occupied_by_project).info_pass_data_server())
 
             with client:
-                client.update_device_configuration(device, info.meta_file, value, project)
+                client.update_device_configuration(device, info.meta_file, value)
 
     def _device_set_disable_cache(self, device: CompletedDevice, disable):
         if disable:
@@ -1147,6 +1124,7 @@ class ControlServer(SocketServer, ControlServerAPI):
                         filename = format_filename(self.TEMP_FILENAME_EXPR, device)
                         info = self.file_manager.save(device, filename)
                         client.update_device_configuration(device, info.meta_file, RawDataDecoder())
+
                     if self._device_instruction_group is None:
                         client.start_sync(device)
                     

python/biopro/server/recording.py

@@ -44,9 +44,7 @@ class RecordingProcess(Process):
     def __init__(self, client_id: str, log_verbose, device_id, queue_rec, queue_ds, queue_msg, meta_path, 
                     device_info, parameter, parent, recording_file_name, data_format,
                     mqtt_ip, mqtt_port,
-                    name = 'Recording-Process', 
-                    project_id = None,
-                    database = None):
+                    name = 'Recording-Process', database = None):
         super(RecordingProcess, self).__init__(name = name)
 
         self._database = database
@@ -59,7 +57,6 @@ class RecordingProcess(Process):
         self._meta_file._parent = parent
         self._meta_file._recording_file_name = recording_file_name
         self._meta_file._device_id = device_id
-        self._meta_file._project_id = project_id
         print(self._meta_file._device, self._meta_file._parameter, self._meta_file._parent, self._meta_file._filepath)
         self._meta_file.write(self._database)
 
@@ -158,9 +155,7 @@ class RecordingProcess(Process):
         elif isinstance(decoder, EISZeroOneDataDecoder):
             # get amp_gain from meta file
             decoder._mode = self._meta_file.configuration.get_parameter('MODE')
-            decoder._ac_amp = self._meta_file.configuration.get_parameter('AC_AMP')
-            decoder._freq_start = self._meta_file.configuration.get_parameter('FREQ_START')
-            decoder._freq_stop = self._meta_file.configuration.get_parameter('FREQ_STOP')
+            decoder._ac_amp = self._meta_file.configuration.get_parameter('EIS_AC_AMP')
 
         return decoder
 

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

@@ -33,7 +33,6 @@
         0,
         1,
         1,
-        1,
         1
       ],
       "domain": {
@@ -618,8 +617,7 @@
         "Open Circuit Potential",
         "Pulse Sensing",
         "Differential Pulse Voltammetry (DPV)",
-        "Chronopotentiometry",
-        "Idle"
+        "Chronopotentiometry"
       ]
     },
     "VOLT_ORIGIN": {
@@ -951,7 +949,6 @@
           "10": "cali_dac_test",
           "11": "cali_adc_test",
           "12": "",
-          "17": "start_data_with_empty_ins",
           "*": "start_data"
         }
       }
@@ -979,11 +976,6 @@
       "VIS_STI",
       "_cdr('1X;4X>ADC_VALUE_I')"
     ],
-    "start_data_with_empty_ins": [
-      "data_format",
-      "_sync(True)",
-      "VIS_STI"
-    ],
     "start_data": [
       "data_format",
       "_notify(True)",

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

@@ -9,7 +9,7 @@
     "minor_version_number": 0
   },
   "constant": {
-    "FREQ_MAX": 4294967296,
+    "FREQ_MAX": 13333334,
     "VOLT_MAX": 65536,
     "BLE_WRITE_MAX": 255,
     "TIME_MAX": 100000
@@ -32,12 +32,6 @@
       "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,
@@ -63,11 +57,45 @@
         "EIS CURVE",
         "Cyclic Voltammetry",
         "Chronoamperometric",
+        "V-T Graph",
+        "R-T Graph",
         "Dev Mode"
       ]
     },
-    "FREQ": {
-      "description": "DPV current recording period start",
+    "GENERAL_HS_RTIA": {
+      "description": "High speed rtia gain",
+      "record_meta": true,
+      "initial": 4,
+      "value": [
+        0,
+        1,
+        2,
+        3,
+        4
+      ],
+      "on_change": "set_general_hs_rtia"
+    },
+    "EIS_DC_BIAS": {
+      "description": "DC voltage bias",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "EIS_AC_AMP": {
+      "description": "AC Amplitude",
+      "record_meta": true,
+      "initial": 25,
+      "domain": [
+        2048
+      ]
+    },
+    "EIS_FREQ": {
+      "description": "[start, stop] of frequency scan",
       "record_meta": true,
       "initial": [
         13333333,
@@ -80,29 +108,24 @@
       },
       "value": "VALUE"
     },
-    "FREQ_START": {
-      "description": "Start of Freq Scan",
+    "EIS_PPD": {
+      "description": "Point per decades",
       "record_meta": true,
-      "initial": 13422819,
+      "initial": 10,
       "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
+        11
+      ]
     },
-    "FREQ_STOP": {
-      "description": "End of Freq Scan",
+    "EIS_SCALE": {
+      "description": "Point spacing pattern",
       "record_meta": true,
-      "initial": 7,
-      "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
+      "initial": 0,
+      "value": [
+        0,
+        1
+      ]
     },
-    "DELAY": {
+    "EIS_DELAY": {
       "description": "Wait x peroid before start taking measurements",
       "record_meta": true,
       "initial": 0,
@@ -113,65 +136,18 @@
         "expression": "VALUE"
       }
     },
-    "AVERAGE_NUM": {
+    "EIS_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
+        6,
+        8
       ]
     },
+
     "ADC_VALUE_I": {
       "description": "ADC value current value",
       "domain": "int"
@@ -219,8 +195,7 @@
         "1",
         "2",
         "auto"
-      ],
-      "on_change": "set_adc_gain_Vin"
+      ]
     },
     "VOLT_INITIAL": {
       "description": "Initial Voltage of Scan",
@@ -277,6 +252,29 @@
         "expression": "VALUE"
       }
     },
+    "MEASURE_VIN_RANGE": {
+      "description": "measure range of Vin",
+      "record_meta": true,
+      "initial": 0,
+      "value": [
+        "0",
+        "1",
+        "2",
+        "auto"
+      ]
+    },
+    "RT_VOLT_SET": {
+      "description": "DAC output Voltage",
+      "record_meta": true,
+      "initial": 37500,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      },
+      "on_change": "set_para_RT_VOLT_SET"
+    },
     "BLE_WRITE": {
       "description": "send msg to elite",
       "domain": {
@@ -307,15 +305,11 @@
       {
         "expression": "MODE",
         "when": {
+          "0": "set_general_hs_rtia",
           "1": "set_adc_gain_I",
-          "2": "set_adc_gain_I"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_Vin",
-          "2": "set_adc_gain_Vin"
+          "2": "set_adc_gain_I",
+          "3": "set_adc_gain_I",
+          "4": "set_adc_gain_I"
         }
       },
       {
@@ -323,7 +317,9 @@
         "when": {
           "0": "curve_eis",
           "1": "curve_cv3",
-          "2": "curve_const_vscan"
+          "2": "curve_const_vscan",
+          "3": "curve_vt",
+          "4": "curve_rt"
         }
       },
       {
@@ -333,6 +329,12 @@
           "1": "curve_cv3_para2"
         }
       },
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "curve_eis_mode"
+        }
+      },
       "_sync(True)",
       "VIS_STI"
     ],
@@ -350,6 +352,12 @@
     "data_format_cali": [
       "_data_format_cali('EISZeroOne')"
     ],
+    "set_general_hs_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X70;1B>GENERAL_HS_RTIA"
+      ]
+    },
     "set_sample_rate": {
       "type": "RIS",
       "parameter": {
@@ -365,12 +373,6 @@
         "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": [
@@ -380,35 +382,41 @@
     "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"
+        "fa": "EIS_FREQ[0]",
+        "fb": "EIS_FREQ[1]",
+        "dp": "EIS_DELAY",
+        "dc": "EIS_DC_BIAS",
+        "am": "EIS_AC_AMP",
+        "an": "EIS_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "EIS_PPD",
+        "sp": "EIS_SCALE"
       },
       "data": [
-        "1XD1;1X01;4B>fa;4B>fb;2B>dp"
+        "1X12;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"
+        "fa": "EIS_FREQ[0]",
+        "fb": "EIS_FREQ[1]",
+        "dp": "EIS_DELAY",
+        "dc": "EIS_DC_BIAS",
+        "am": "EIS_AC_AMP",
+        "an": "EIS_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "EIS_PPD",
+        "sp": "EIS_SCALE"
       },
       "data": [
-        "1XD1;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+        "1X12;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+      ]
+    },
+    "curve_eis_mode": {
+      "type": "RIS",
+      "data": [
+        "1X12;1XFF"
       ]
     },
     "curve_cv3": {
@@ -422,7 +430,7 @@
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X01;2B>va;2B>vb;2B>vc;"
+        "1X09;1X01;2B>va;2B>vb;2B>vc;"
       ]
     },
     "curve_cv3_para2": {
@@ -436,7 +444,7 @@
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X02;4B>ve;2B>vf;2B>cn"
+        "1X09;1X02;4B>ve;2B>vf;2B>cn"
       ]
     },
     "curve_const_vscan": {
@@ -449,13 +457,53 @@
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "1XD3;",
+        "1X0B;",
         "2B>va;",
         "4b>pa;4b>pb;",
         "4b>0;4b>pd;",
         "2B>pe"
       ]
     },
+    "curve_rt": {
+      "type": "RIS",
+      "parameter": {
+        "va": "RT_VOLT_SET",
+        "pa": "ADC_LEVEL_I_15",
+        "pb": "ADC_LEVEL_V_IN_15",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE"
+      },
+      "data": [
+        "X04;",
+        "2B>va;",
+        "4b>pa;4b>pb;",
+        "4b>0;4b>pd;",
+        "2B>pe"
+      ]
+    },
+    "curve_vt": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "ADC_LEVEL_I_15",
+        "pb": "ADC_LEVEL_V_IN_15",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE",
+        "va": "MEASURE_VIN_RANGE"
+      },
+      "data": [
+        "X05;",
+        "4b>pa;4b>pb;",
+        "4b>0;4b>pd;",
+        "2B>pe;",
+        "1B>va"
+      ]
+    },
+    "set_para_RT_VOLT_SET": {
+      "type": "RIS",
+      "data": [
+        "XE2;X01;2B>RT_VOLT_SET"
+      ]
+    },
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

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

@@ -9,7 +9,7 @@
     "minor_version_number": 1
   },
   "constant": {
-    "FREQ_MAX": 4294967296,
+    "FREQ_MAX": 13333334,
     "VOLT_MAX": 65536,
     "BLE_WRITE_MAX": 255,
     "TIME_MAX": 100000
@@ -32,12 +32,6 @@
       "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,
@@ -68,8 +62,40 @@
         "Dev Mode"
       ]
     },
-    "FREQ": {
-      "description": "DPV current recording period start",
+    "GENERAL_HS_RTIA": {
+      "description": "High speed rtia gain",
+      "record_meta": true,
+      "initial": 4,
+      "value": [
+        0,
+        1,
+        2,
+        3,
+        4
+      ],
+      "on_change": "set_general_hs_rtia"
+    },
+    "EIS_DC_BIAS": {
+      "description": "DC voltage bias",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "EIS_AC_AMP": {
+      "description": "AC Amplitude",
+      "record_meta": true,
+      "initial": 25,
+      "domain": [
+        2048
+      ]
+    },
+    "EIS_FREQ": {
+      "description": "[start, stop] of frequency scan",
       "record_meta": true,
       "initial": [
         13333333,
@@ -82,29 +108,24 @@
       },
       "value": "VALUE"
     },
-    "FREQ_START": {
-      "description": "Start of Freq Scan",
+    "EIS_PPD": {
+      "description": "Point per decades",
       "record_meta": true,
-      "initial": 13422819,
+      "initial": 10,
       "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
+        11
+      ]
     },
-    "FREQ_STOP": {
-      "description": "End of Freq Scan",
+    "EIS_SCALE": {
+      "description": "Point spacing pattern",
       "record_meta": true,
-      "initial": 7,
-      "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
+      "initial": 0,
+      "value": [
+        0,
+        1
+      ]
     },
-    "DELAY": {
+    "EIS_DELAY": {
       "description": "Wait x peroid before start taking measurements",
       "record_meta": true,
       "initial": 0,
@@ -115,65 +136,18 @@
         "expression": "VALUE"
       }
     },
-    "AVERAGE_NUM": {
+    "EIS_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
+        6,
+        8
       ]
     },
+
     "ADC_VALUE_I": {
       "description": "ADC value current value",
       "domain": "int"
@@ -221,8 +195,7 @@
         "1",
         "2",
         "auto"
-      ],
-      "on_change": "set_adc_gain_Vin"
+      ]
     },
     "VOLT_INITIAL": {
       "description": "Initial Voltage of Scan",
@@ -290,7 +263,7 @@
         "auto"
       ]
     },
-    "DAC_VOLT": {
+    "RT_VOLT_SET": {
       "description": "DAC output Voltage",
       "record_meta": true,
       "initial": 37500,
@@ -299,7 +272,8 @@
       ],
       "value": {
         "expression": "VALUE"
-      }
+      },
+      "on_change": "set_para_RT_VOLT_SET"
     },
     "BLE_WRITE": {
       "description": "send msg to elite",
@@ -331,21 +305,13 @@
       {
         "expression": "MODE",
         "when": {
+          "0": "set_general_hs_rtia",
           "1": "set_adc_gain_I",
           "2": "set_adc_gain_I",
           "3": "set_adc_gain_I",
           "4": "set_adc_gain_I"
         }
       },
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_Vin",
-          "2": "set_adc_gain_Vin",
-          "3": "set_adc_gain_Vin",
-          "4": "set_adc_gain_Vin"
-        }
-      },
       {
         "expression": "MODE",
         "when": {
@@ -353,7 +319,7 @@
           "1": "curve_cv3",
           "2": "curve_const_vscan",
           "3": "curve_vt",
-          "4": "curve_zt"
+          "4": "curve_rt"
         }
       },
       {
@@ -363,6 +329,12 @@
           "1": "curve_cv3_para2"
         }
       },
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "curve_eis_mode"
+        }
+      },
       "_sync(True)",
       "VIS_STI"
     ],
@@ -380,6 +352,12 @@
     "data_format_cali": [
       "_data_format_cali('EISZeroOne')"
     ],
+    "set_general_hs_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X70;1B>GENERAL_HS_RTIA"
+      ]
+    },
     "set_sample_rate": {
       "type": "RIS",
       "parameter": {
@@ -395,12 +373,6 @@
         "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": [
@@ -410,35 +382,41 @@
     "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"
+        "fa": "EIS_FREQ[0]",
+        "fb": "EIS_FREQ[1]",
+        "dp": "EIS_DELAY",
+        "dc": "EIS_DC_BIAS",
+        "am": "EIS_AC_AMP",
+        "an": "EIS_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "EIS_PPD",
+        "sp": "EIS_SCALE"
       },
       "data": [
-        "1XD1;1X01;4B>fa;4B>fb;2B>dp"
+        "1X12;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"
+        "fa": "EIS_FREQ[0]",
+        "fb": "EIS_FREQ[1]",
+        "dp": "EIS_DELAY",
+        "dc": "EIS_DC_BIAS",
+        "am": "EIS_AC_AMP",
+        "an": "EIS_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "EIS_PPD",
+        "sp": "EIS_SCALE"
       },
       "data": [
-        "1XD1;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+        "1X12;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+      ]
+    },
+    "curve_eis_mode": {
+      "type": "RIS",
+      "data": [
+        "1X12;1XFF"
       ]
     },
     "curve_cv3": {
@@ -452,7 +430,7 @@
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X01;2B>va;2B>vb;2B>vc;"
+        "1X09;1X01;2B>va;2B>vb;2B>vc;"
       ]
     },
     "curve_cv3_para2": {
@@ -466,7 +444,7 @@
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X02;4B>ve;2B>vf;2B>cn"
+        "1X09;1X02;4B>ve;2B>vf;2B>cn"
       ]
     },
     "curve_const_vscan": {
@@ -479,17 +457,17 @@
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "1XD3;",
+        "1X0B;",
         "2B>va;",
         "4b>pa;4b>pb;",
         "4b>0;4b>pd;",
         "2B>pe"
       ]
     },
-    "curve_zt": {
+    "curve_rt": {
       "type": "RIS",
       "parameter": {
-        "va": "DAC_VOLT",
+        "va": "RT_VOLT_SET",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pd": "CTRL_HIGH_Z_15",
@@ -520,6 +498,12 @@
         "1B>va"
       ]
     },
+    "set_para_RT_VOLT_SET": {
+      "type": "RIS",
+      "data": [
+        "XE2;X01;2B>RT_VOLT_SET"
+      ]
+    },
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"

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

@@ -9,7 +9,7 @@
     "minor_version_number": 2
   },
   "constant": {
-    "FREQ_MAX": 4294967296,
+    "FREQ_MAX": 13333334,
     "VOLT_MAX": 65536,
     "BLE_WRITE_MAX": 255,
     "TIME_MAX": 100000
@@ -32,12 +32,6 @@
       "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,
@@ -64,11 +58,44 @@
         "Cyclic Voltammetry",
         "Chronoamperometric",
         "V-T Graph",
+        "R-T Graph",
         "Dev Mode"
       ]
     },
-    "FREQ": {
-      "description": "DPV current recording period start",
+    "GENERAL_HS_RTIA": {
+      "description": "High speed rtia gain",
+      "record_meta": true,
+      "initial": 4,
+      "value": [
+        0,
+        1,
+        2,
+        3,
+        4
+      ],
+      "on_change": "set_general_hs_rtia"
+    },
+    "EIS_DC_BIAS": {
+      "description": "DC voltage bias",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "EIS_AC_AMP": {
+      "description": "AC Amplitude",
+      "record_meta": true,
+      "initial": 25,
+      "domain": [
+        2048
+      ]
+    },
+    "EIS_FREQ": {
+      "description": "[start, stop] of frequency scan",
       "record_meta": true,
       "initial": [
         13333333,
@@ -81,29 +108,24 @@
       },
       "value": "VALUE"
     },
-    "FREQ_START": {
-      "description": "Start of Freq Scan",
+    "EIS_PPD": {
+      "description": "Point per decades",
       "record_meta": true,
-      "initial": 13422819,
+      "initial": 10,
       "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
+        11
+      ]
     },
-    "FREQ_STOP": {
-      "description": "End of Freq Scan",
+    "EIS_SCALE": {
+      "description": "Point spacing pattern",
       "record_meta": true,
-      "initial": 7,
-      "domain": [
-        "FREQ_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
+      "initial": 0,
+      "value": [
+        0,
+        1
+      ]
     },
-    "DELAY": {
+    "EIS_DELAY": {
       "description": "Wait x peroid before start taking measurements",
       "record_meta": true,
       "initial": 0,
@@ -114,65 +136,18 @@
         "expression": "VALUE"
       }
     },
-    "AVERAGE_NUM": {
+    "EIS_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
+        6,
+        8
       ]
     },
+
     "ADC_VALUE_I": {
       "description": "ADC value current value",
       "domain": "int"
@@ -220,8 +195,7 @@
         "1",
         "2",
         "auto"
-      ],
-      "on_change": "set_adc_gain_Vin"
+      ]
     },
     "VOLT_INITIAL": {
       "description": "Initial Voltage of Scan",
@@ -289,6 +263,18 @@
         "auto"
       ]
     },
+    "RT_VOLT_SET": {
+      "description": "DAC output Voltage",
+      "record_meta": true,
+      "initial": 37500,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      },
+      "on_change": "set_para_RT_VOLT_SET"
+    },
     "BLE_WRITE": {
       "description": "send msg to elite",
       "domain": {
@@ -319,17 +305,11 @@
       {
         "expression": "MODE",
         "when": {
+          "0": "set_general_hs_rtia",
           "1": "set_adc_gain_I",
           "2": "set_adc_gain_I",
-          "3": "set_adc_gain_I"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_Vin",
-          "2": "set_adc_gain_Vin",
-          "3": "set_adc_gain_Vin"
+          "3": "set_adc_gain_I",
+          "4": "set_adc_gain_I"
         }
       },
       {
@@ -338,7 +318,8 @@
           "0": "curve_eis",
           "1": "curve_cv3",
           "2": "curve_const_vscan",
-          "3": "curve_vt"
+          "3": "curve_vt",
+          "4": "curve_rt"
         }
       },
       {
@@ -348,6 +329,12 @@
           "1": "curve_cv3_para2"
         }
       },
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "curve_eis_mode"
+        }
+      },
       "_sync(True)",
       "VIS_STI"
     ],
@@ -365,6 +352,12 @@
     "data_format_cali": [
       "_data_format_cali('EISZeroOne')"
     ],
+    "set_general_hs_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X70;1B>GENERAL_HS_RTIA"
+      ]
+    },
     "set_sample_rate": {
       "type": "RIS",
       "parameter": {
@@ -380,12 +373,6 @@
         "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": [
@@ -395,35 +382,41 @@
     "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"
+        "fa": "EIS_FREQ[0]",
+        "fb": "EIS_FREQ[1]",
+        "dp": "EIS_DELAY",
+        "dc": "EIS_DC_BIAS",
+        "am": "EIS_AC_AMP",
+        "an": "EIS_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "EIS_PPD",
+        "sp": "EIS_SCALE"
       },
       "data": [
-        "1XD1;1X01;4B>fa;4B>fb;2B>dp"
+        "1X12;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"
+        "fa": "EIS_FREQ[0]",
+        "fb": "EIS_FREQ[1]",
+        "dp": "EIS_DELAY",
+        "dc": "EIS_DC_BIAS",
+        "am": "EIS_AC_AMP",
+        "an": "EIS_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "EIS_PPD",
+        "sp": "EIS_SCALE"
       },
       "data": [
-        "1XD1;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+        "1X12;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+      ]
+    },
+    "curve_eis_mode": {
+      "type": "RIS",
+      "data": [
+        "1X12;1XFF"
       ]
     },
     "curve_cv3": {
@@ -437,7 +430,7 @@
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X01;2B>va;2B>vb;2B>vc;"
+        "1X09;1X01;2B>va;2B>vb;2B>vc;"
       ]
     },
     "curve_cv3_para2": {
@@ -451,7 +444,7 @@
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X02;4B>ve;2B>vf;2B>cn"
+        "1X09;1X02;4B>ve;2B>vf;2B>cn"
       ]
     },
     "curve_const_vscan": {
@@ -464,7 +457,24 @@
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "1XD3;",
+        "1X0B;",
+        "2B>va;",
+        "4b>pa;4b>pb;",
+        "4b>0;4b>pd;",
+        "2B>pe"
+      ]
+    },
+    "curve_rt": {
+      "type": "RIS",
+      "parameter": {
+        "va": "RT_VOLT_SET",
+        "pa": "ADC_LEVEL_I_15",
+        "pb": "ADC_LEVEL_V_IN_15",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE"
+      },
+      "data": [
+        "X04;",
         "2B>va;",
         "4b>pa;4b>pb;",
         "4b>0;4b>pd;",
@@ -488,6 +498,12 @@
         "1B>va"
       ]
     },
+    "set_para_RT_VOLT_SET": {
+      "type": "RIS",
+      "data": [
+        "XE2;X01;2B>RT_VOLT_SET"
+      ]
+    },
     "ble_instru_send": [
       "ble_write",
       "_cdr('20X>ADC_VALUE_I')"