[update] gitignore log

.gitignore

@@ -7,3 +7,4 @@
 /.vscode
 /media
 python/biopro/sever/_identify.py
+*.log

README.md

@@ -78,6 +78,8 @@ add ssh.txt in boot folder
 
 ###### Install dependencies
     sudo apt-get install vim git wiringpi build-essential libi2c-dev i2c-tools python-dev libffi-dev python3-pip postgresql npm
+    sudo apt-get install libatlas-base-dev
+    sudo apt-get install python3-numpy
 
 ###### wiringpi conflict
 need to install wiringpi:  https://github.com/WiringPi/WiringPi
@@ -94,6 +96,7 @@ git clone https://gitlab.com/wisetop/controller/wisetopdataserver.git
 ```
  cd ~/wisetopdataserver
 pip3 install -r requirements.txt
+pip3 install SQLAlchemy
 ```
 ##### Packages version
 ```
@@ -358,3 +361,22 @@ $sudo vim ./sites-available/000-default.conf
 
 ##### raspberry website document:
 > https://www.raspberrypi.org/documentation/configuration/wireless/access-point-routed.md
+
+# ChangeLog
+[2022.11.16]
+add python package SQLAlchemy
+add new column project(int4) in postgresSQL table recording_meta_datas
+add new postgresSQL table project_report
+add new postgresSQL table meta_project_info
+
+[2022.10.18]
+socektTimeout from 1s -> 5s
+socketListen from 3 -> 20
+
+[2022.09.30]
+add new column cycle(jsonb) in postgresSQL table projects
+
+[2022.9.28]
+add python package numpy
+
+

python/biopro/controller.py

@@ -1589,6 +1589,9 @@ class ControlAPI(metaclass=Router):
     def set_project(self, project, content) -> bool:
         raise NotImplementedError()
     
+    def set_project_cycle(self, project, index, content) -> bool:
+        raise NotImplementedError()
+    
     def show_device_data(self, device) -> bool:
         raise NotImplementedError()
 

python/biopro/data.py

@@ -87,7 +87,8 @@ 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]):
+                                    data_format: Union[AnyStr, DataDecodeFormat],
+                                    project_info: str):
         """set device configuration.
 
         :param device: device ID
@@ -154,7 +155,8 @@ 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]):
+                                    data_format: Union[AnyStr, DataDecodeFormat],
+                                    project_info: str):
 
         # meta file
         if isinstance(meta_file, str):
@@ -186,7 +188,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)
+        self.send_command('update_device_configuration', device, meta_file, data_format, project_info)
 
     def is_sync(self, device: Union[None, int, Device] = None) -> bool:
         if isinstance(device, Device):

python/biopro/db/base.py

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,24 @@
+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/device_cc2650.py

@@ -662,7 +662,7 @@ class CC2650Device(Device):
         elif device_type == 'EISZeroOne':
             i = 0
             request_times = 0
-            while i < 7:
+            while i < 13:
                 try:
                     # send
                     code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, i)

python/biopro/device/manager.py

@@ -574,20 +574,23 @@ class DeviceManager(MasterDevice, Synchronized):
         :param device: device ID or response info
         :return: CompletedDevice, None if not found.
         """
-        if isinstance(device, int):
-            for slave in self._device:
-                if slave.device_id == device:
-                    return slave
+        try:
+            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
+            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))
 
         return None
 
@@ -829,6 +832,9 @@ class DeviceManager(MasterDevice, Synchronized):
 
         elif func == InternalInstruction.PREDEFINED_DISABLE_CACHE:
             self._device_disable_cache(device, *para)
+        
+        elif func == InternalInstruction.PREDEFINED_IDLE:
+            self._idle(device, *para)
 
         elif isinstance(device, DebugDevice):
             if func == InternalInstruction.PREDEFINED_NOTIFY:
@@ -848,6 +854,11 @@ class DeviceManager(MasterDevice, Synchronized):
                                               InternalInstruction.PREDEFINED_DATA_FORMAT,
                                               f)
 
+    def _idle(self, device: Device, expr: AnyStr):
+        self._handler.device_internal_command(device.device_id,
+                                                InternalInstruction.PREDEFINED_IDLE,
+                                                None)
+
     def _device_data_format_cali(self, device: Device, expr: str, cali: bytes = None):
         if cali is None:
             cali = device.calibration_info(expr)

python/biopro/devlib/data.py

@@ -1,6 +1,7 @@
 import abc
 import struct
 import math
+import numpy
 from typing import Optional, TypeVar, Generic, Tuple, Dict, List, AnyStr
 from datetime import datetime
 
@@ -1345,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__()
@@ -1361,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
 
@@ -1380,12 +1378,27 @@ class EISZeroOneDataDecoder(RecDataDecoder):
     def _decode_cali_coeff(cali_coeff: bytes) -> Optional[List[Tuple[int, int]]]:
         if cali_coeff != b'':
             cali_table = []
-            phase_para_a = []
-            phase_para_b = []
             hsrtia_a = []
             hsrtia_b = []
             hsrtia_c = []
             hsrtia_d = []
+            phase_coeff = []
+            phase_offset = []
+            
+            # phase_coeff = [[0]*4 for i in range(4)]
+            # phase_offset = [[0]*4 for i in range(4)]
+
+            phase_coeff = numpy.zeros([4, 4], dtype = int)
+            phase_offset = numpy.zeros([4, 4], dtype = int)  
+
+            ########################################
+            # phase_coeff
+            # [[gain0, g1, g2, g3] ----->最高頻
+            #  [gain0, g1, g2, g3] ----->中頻
+            #  [gain0, g1, g2, g3] ----->低頻
+            #  [gain0, g1, g2, g3] ----->最低頻
+            # ]
+            #######################################
 
             # print('cali_coeff', cali_coeff)
             cutoff_freq = struct.unpack('>I', cali_coeff[1:5])[0] * 100     #4
@@ -1396,51 +1409,95 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             # hsrtia_160k = struct.unpack('>I', cali_coeff[8:12])[0]         #4
 
             index = 20
-            for i in range(index, index+16, 8):
-                phase_para_a.append(struct.unpack('>i', cali_coeff[i+1:i+5])[0])
-                phase_para_b.append(struct.unpack('>i', cali_coeff[i+5:i+9])[0])
-
+            g = 0
+            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            
             index = 40
-            for i in range(index, index+16, 8):
-                phase_para_a.append(struct.unpack('>i', cali_coeff[i+1:i+5])[0])
-                phase_para_b.append(struct.unpack('>i', cali_coeff[i+5:i+9])[0]) 
-
+            g = 0
+            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            
             #Lv[0] 160k
             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])
 
-            # hsrtia_a.append(struct.unpack('>I', cali_coeff[index+1:index+5])[0])
-            # hsrtia_b.append(struct.unpack('>I', cali_coeff[index+5:index+9])[0]/1e6)
-            # hsrtia_c.append(struct.unpack('>I', cali_coeff[index+9:index+13])[0]/1e5)
+            index = 140
+            g = 1
+            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            
+            index = 160
+            g = 1
+            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            
+            index = 180
+            g = 2
+            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            
+            index = 200
+            g = 2
+            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            
+            index = 220
+            g = 3
+            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            
+            index = 240
+            g = 3
+            phase_coeff[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
             # print('cutoff_freq', cutoff_freq)
             # print('hsrtia_a', hsrtia_a)
             # print('hsrtia_b', hsrtia_b)
             # print('hsrtia_c', hsrtia_c)
-            # print('phase_para_a', phase_para_a)
-            # print('phase_para_b', phase_para_b)
+            # print('phase_coeff')
+            # print(phase_coeff)
+            # print('phase_offset')
+            # print(phase_offset)
 
-            cali_table.append((cutoff_freq, phase_para_a, phase_para_b, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d))
+            cali_table.append((cutoff_freq, phase_coeff, phase_offset, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d))
 
             return cali_table
         else:
@@ -1470,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:
@@ -1480,7 +1537,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             return None
 
         if time_stamp != 0 and self._start_return_data == True:
-            if (self._mode == 0):
+            if (self._mode == 0 or self._mode == 5):
                 time_stamp, delta, ret_get_time_stamp = self.eis_get_time_stamp(time_stamp)
             else:
                 time_stamp, delta, ret_get_time_stamp = self.get_time_stamp(time_stamp)
@@ -1489,31 +1546,33 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                 print("error timeStamp full data:", list(data), datetime.now(), '\n')
                 return None
             else:
-                if self.cali_coeff is not None and self._mode == 0:
-                    phase_para_a = []
-                    phase_para_b = []
+                if self.cali_coeff is not None and (self._mode == 0 or self._mode == 5):
                     hsrtia_a = []
                     hsrtia_b = []
                     hsrtia_c = []
                     hsrtia_d = []
-                    cutoff_freq, phase_para_a, phase_para_b, 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
+                    cutoff_freq, phase_coeff, phase_offset, hsrtia_a, hsrtia_b, hsrtia_c, hsrtia_d = self.cali_coeff[0]
 
-                if (self._mode == 0):
+                    voltage_amp = round(self._ac_amp * 800 / 2047) # use UI value
+
+                if (self._mode == 0 or self._mode == 5):
                     img = ch1
                     real = ch2
                     freq = ch3
+                    fre_idx = 0
 
-                    voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 / cutoff_freq ** 2)
+                    # rolloff_cali = cutoff_freq/1e5
+                    rolloff_cali = hsrtia_c[gain]
+                    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])
@@ -1526,38 +1585,38 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                     else:
                         impedance = 0
 
-                    if (real > 0):
-                        raw_phase = math.atan(img / real) * 180 / math.pi
-                    elif (real == 0):
-                        raw_phase = 90
-                    else:
-                        raw_phase = math.atan(img / real) * 180 / math.pi + 180
+                    raw_phase = math.atan2(img , real) * 180 / math.pi
 
                     if (freq >= 1000000): # 10000 Hz
-                        i = 0
+                        fre_idx = 0
                     elif (freq >= 10000): # 100 Hz
-                        i = 1
+                        fre_idx = 1
                     elif (freq >= 1000): # 10 Hz
-                        i = 2
+                        fre_idx = 2
                     elif (freq >= 1): # 0.01 Hz
-                        i = 3
+                        fre_idx = 3
                     
-                    ideal_raw_phase = phase_para_a[i] /1e10 * freq + phase_para_b[i] / 1e6
-
+                    ideal_raw_phase = phase_coeff[gain][fre_idx] /1e10 * freq + phase_offset[gain][fre_idx] / 1e6
                     phase = raw_phase - ideal_raw_phase
+                    phase = phase % 180 if phase % 180<=90 else phase % 180-180
 
-                    if (self._first_phase_flag):
-                        self._last_phase = phase
-                        self._first_phase_flag = 0
-                    elif (abs(phase - self._last_phase) >= 200):
-                        phase -= 360
-                        self._last_phase = phase
+                    # last_phase_to90 = self._last_phase % 180 if self._last_phase % 180<=90 else self._last_phase % 180-180
+                    # diff = phase - last_phase_to90
+
+                    # if (self._first_phase_flag):
+                    #     # self._last_phase = phase
+                    #     self._first_phase_flag = 0
+                    # elif (abs(diff) >= 90):
+                    #     phase = self._last_phase + diff + (180 if diff<0 else-180)
+                    # else:
+                    #     phase = self._last_phase + diff
+                    # self._last_phase = phase
 
                     imag_after_cal = impedance * math.sin(round(phase) * math.pi / 180)
                     real_after_cal = impedance * math.cos(round(phase) * math.pi / 180)
 
                 if self._show_data:
-                    if (self._mode == 0):
+                    if (self._mode == 0 or self._mode == 5):
                         print('|', '{:10}'.format(time_stamp),
                             '|', '{:5}'.format(delta),
                             '|', '{:6}'.format(ch1),
@@ -1571,7 +1630,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),
@@ -1582,7 +1641,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:
@@ -1592,7 +1651,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             self._mode_stop = 0
 
         ret = RecordingData(self.device, int(time_stamp * 1000 / 2), 0)
-        if (self._mode == 0):                           #EIS Mode
+        if self._mode == 0 or self._mode == 5:                           #EIS Mode
             ret.append_data(0, ch1)                     #Raw Imag  
             ret.append_data(1, ch2)                     #Raw Real
             ret.append_data(2, ch3 * 10)                #Frequency [mHz]

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 '_sync(False)', '_notify(False)', 'VIS_INT'
+            return '_notify(False)', 'VIS_INT', '_sync(False)'
         elif instruction == cls.CLOSE:
             return '_sync(False)', '_notify(False)', 'VIS_INT'
         elif instruction == cls.CALL:

python/biopro/devlib/instruction.py

@@ -283,6 +283,7 @@ class InternalInstruction(SingleInstruction):
     PREDEFINED_SET = '_set'
     PREDEFINED_CDR = '_cdr'
     PREDEFINED_DISABLE_CACHE = '_disable_cache'
+    PREDEFINED_IDLE = '_idle'
 
     PREDEFINED = (
         PREDEFINED_SLEEP,
@@ -294,6 +295,7 @@ class InternalInstruction(SingleInstruction):
         PREDEFINED_SET,
         PREDEFINED_CDR,
         PREDEFINED_DISABLE_CACHE,
+        PREDEFINED_IDLE,
     )
 
     __slots__ = ('_expr', '_para')

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')
+                 '_cache_battery', '_cache_battery_timestamp', '_coeff', '_status', '_occupied_by_project')
 
     def __init__(self, master: MasterDevice, library: DeviceLibrary, device_id: int, device: Device):
         """
@@ -986,6 +986,8 @@ 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
@@ -1032,7 +1034,7 @@ class CompletedDevice(Device):
 
     @property
     def mac_address_in_str(self) -> str:
-        return ':'.join('{:02x}'.format(b) for b in self._device.mac_address)
+        return ':'.join('{:02x}'.format(b) for b in self._device.mac_address).upper()
 
     @property
     def device(self) -> Device:
@@ -1082,6 +1084,14 @@ 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]:
@@ -1131,7 +1141,7 @@ class CompletedDevice(Device):
                 # raise RuntimeError('illegal parameter value : ' + value) from e
             else:
                 if name == 'MODE':
-                    if self.library_name.startswith('Elite_EDC'):
+                    if self.library_name.startswith('Elite_EDC') or 'EIS' in self.library_name:
                         self.set_parameter('CTRL_HIGH_Z_15', self.get_parameter('HIGHZ_TABLE')[value])
                         self.set_parameter('TIME_DURATION', 0)
 
@@ -1303,6 +1313,7 @@ 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/impl/ext_mem.py

@@ -35,7 +35,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                  '_pin_ram_sel_value', '_pin_mem_sel_value', '_pin_mem_req_value',
                  '_read_green_times','_read_red_times',
                  '_elite_data_len', '_mem_header_len', '_mem_tailer_len', '_single_data_len',
-                 '_head_wrong_cnt')
+                 '_head_wrong_cnt', '_pin_busy_value')
 
     def __init__(self,
                  select: Selector,
@@ -50,11 +50,11 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         self._single_data_len = self._elite_data_len + self._mem_header_len + self._mem_tailer_len
 
         # buffer
-        self._tx_buffer_header = [0] * 19
+        self._tx_buffer_header = [0] * 64
         self._tx_buffer_data = [0] * (self._single_data_len * 10 + 3)
 
         # memory control pin
-        self.pin_busy = OutputPin.get_used(P3Pin.MEM_BZY, True)
+        self.pin_busy: Optional[InputPin] = InputPin.get_used(P3Pin.MEM_BZY)
         self.pin_mem_req = OutputPin.get_used(P3Pin.MEM_REQ, False)
         self.pin_mem_sel = OutputPin.get_used(P3Pin.MEM_RST, True) # MEM_RST -> actually which memory board is assign
         self.pin_ram_sel: Optional[InputPin] = InputPin.get_used(P3Pin.MEM_SEL) # MEM_SEL -> actually is RAM_SEL, which RAM is assign
@@ -62,6 +62,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         self._pin_ram_sel_value = [bool(self.pin_ram_sel) for _ in range(Selector.SIZE)]
         self._pin_mem_sel_value = [bool(self.pin_mem_sel) for _ in range(Selector.SIZE)]
         self._pin_mem_req_value = [bool(self.pin_mem_req) for _ in range(Selector.SIZE)]
+        self._pin_busy_value = [bool(self.pin_busy) for _ in range(Selector.SIZE)]
 
         self._read_green_times = 0
         self._read_red_times = 0
@@ -98,6 +99,14 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             self._pin_ram_sel_value[channel] = True
         return self._pin_ram_sel_value[channel]
 
+    def get_pin_busy(self):
+        channel = self.select
+        if self.pin_busy.input() == 0:
+            self._pin_busy_value[channel] = False
+        else:
+            self._pin_busy_value[channel] = True
+        return self._pin_busy_value[channel]
+
     @property
     def select(self) -> int:
         return self._selector.channel
@@ -216,7 +225,9 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         return
 
     def recv_memory(self, device: int) -> Optional[bytes]:
-        self.pin_busy.output(False)
+        # self.pin_busy.output(False)
+
+        # print('mem_req==ram_sel,[', self._pin_mem_req_value[device], ',', self._pin_ram_sel_value[device], ']')
 
         rx = []
 
@@ -300,6 +311,9 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                 print("green data print:", data, device, datetime.now())
                 return None
 
+            # print('data=', list(data))
+            # print('Ram:', data[62])
+
             if (length >= 4000):
                 flag_print = True
                 print("green data: big length:", length)
@@ -415,9 +429,9 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         except BaseException as e:
             print(e)
 
-        finally:
-            # print("\n")
-            self.pin_busy.output(True)
+        # finally:
+        #     # print("\n")
+        #     self.pin_busy.output(True)
 
         return bytes(rx)
 

python/biopro/impl/interface_uart.py

@@ -28,7 +28,7 @@ class UARTInterface(LowLevelHardwareInterface):
         self._serial = serial.Serial(self._port,
                                      baudrate=self._baudrate,
                                      timeout=0,
-                                     writeTimeout=0.01)
+                                     writeTimeout=1)
         # deprecate function name which change at version 3.0
         self._serial.flushInput()
         self._serial.flushOutput()

python/biopro/project/condition.py

@@ -45,8 +45,8 @@ class Condition():
         # print(operator, x, y)
         cases = {
             "equal": lambda a, b: a == b,
-            "bigger": lambda a, b: a > b,
-            "smaller": lambda a, b: a < b,
+            "bigger": lambda a, b: a >= b,
+            "smaller": lambda a, b: a <= b,
         }
 
         return cases[operator](x, y)
@@ -71,14 +71,23 @@ class Condition():
         return self.compareWith(self.comparsion, time_diff, round(int(self._value), 1))
     
     def after_task_run(self, **kwargs):
-        # print('relative_time_from_task', kwargs,kwargs['task_start_time'],kwargs['delay_time'])
+        # print('relative_time_from_task', kwargs['task_start_time'],kwargs['delay_time'])
         if len(kwargs['task_start_time']) == 0:
             return False
+        task = kwargs['self_task']
+        running_task = kwargs['running_task']
         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))
+        # print('real_diff', time() - task_start_time - delay_time)
+        # print(task.name, task.uuid, time_diff, round(int(self._value), 1), running_task.name, running_task.uuid)
+        # if round(int(self._value), 1) == 0 and time_diff == 0.1:
+        #     return True
+        if task.uuid != running_task.uuid:
+            return False
+        return self.compareWith('bigger', time_diff, round(int(self._value), 1))
+        # return self.compareWith(self.comparsion, time_diff, round(int(self._value), 1))
     
     def device(self, **kwargs):
         print('device')

python/biopro/project/project.py

@@ -1,6 +1,7 @@
 import sys
 import json
 import threading
+import logging
 
 from time import time, sleep
 from datetime import datetime
@@ -19,7 +20,7 @@ key_list = {
 }
 
 class Project(threading.Thread):
-  def __init__(self, project, device_manager: DeviceManager, mqttThread = None, name="project"):
+  def __init__(self, project, device_manager: DeviceManager, mqttThread = None, log_verbose = None, name="project"):
     super(Project, self).__init__(name = name)
     self._project = project
     self._device_manager = device_manager
@@ -33,7 +34,7 @@ class Project(threading.Thread):
     self._name = None
     self._desc = None
     self._device = None
-    self._complete_device = []
+    self._complete_device = {}
     self._status = 0
 
     self._instruction_set = Instruction()
@@ -41,16 +42,32 @@ class Project(threading.Thread):
 
     self._task_manager = None
 
+    self._cycle = []
+
+    self._count = 1 #流水號
+
+    self.log_verbose = log_verbose
+    self._logger = logging.getLogger('project')
+    self._logger.setLevel('DEBUG')
+
+    self._formatter = logging.Formatter('[%(asctime)s.%(msecs)03d] %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
+    self._formatter_with_nothing = logging.Formatter('%(message)s')
+
     self.setup_project(project)
     self.setup_device(self._device)
-  
+
+    # create log file handler
+    fh = logging.FileHandler(f'{self.uuid}.log', mode="w")
+    fh.setFormatter(self._formatter)
+    self._logger.addHandler(fh)
+    
   def setup_project(self, project):
     for (key, value) in project.items():
       if key in key_list.keys():
         key = key_list[key]
 
       if key == 'task':
-        self._task_manager = TaskManager(project['task'])
+        self._task_manager = TaskManager(project['task'], project['cycle'])
       elif key == 'uuid':
         pass
       else:
@@ -58,8 +75,10 @@ class Project(threading.Thread):
       
   def setup_device(self, device_list):
     for device in device_list:
-      complete_device = self._device_manager.get_device(device['connectDevice']['device_address'])
-      self._complete_device.append(complete_device)
+      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
   def id(self) -> int:
@@ -84,6 +103,14 @@ class Project(threading.Thread):
   @name.setter
   def name(self, new_name):
     self._name = new_name
+  
+  @property
+  def cycle(self) -> list:
+    return self._cycle
+  
+  @cycle.setter
+  def cycle(self, new_cycle):
+    self._cycle = new_cycle
 
   @property
   def desc(self) -> str:
@@ -121,9 +148,24 @@ 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 get_cycle(self, task):
+      for index, _cycle in enumerate(self.cycle):
+        if task.uuid in _cycle['range']:
+          return _cycle
+
   def run(self):
+      # project status change running (1)
       self._status = 1
+      # save start time
       self._start_time = time()
+
+      # saving & broadcast message
+      self._logger.info('Project ' + self.name + ' start')
+      self.log_verbose('Project ' + self.name + ' start')
       self.mqtt_thread.broadcast_command('project:' + self._name + ' start at ' + datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3])
       
       while not self._stop_flag :
@@ -134,10 +176,6 @@ class Project(threading.Thread):
         for task in check_list:
           if task != None:
             now = time()
-            # print('round task', task.name)
-            # print('running task', self._task_manager.running_task.name, self._task_manager.running_task.status)
-            # if self._task_manager.prev_task != None:
-            #   print('previous_task', self._task_manager.prev_task.name, self._task_manager.prev_task.status)
 
             match_condition_list = task.check_condition(
               project_start_time = self._start_time,
@@ -146,56 +184,103 @@ class Project(threading.Thread):
               previous_task =  self._task_manager.prev_task,
               self_task = 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)
+              print('match_action_list', 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))
-                if action.type == 'start' and task.status != 1:
-                  self._task_manager.set_running_task(task)
-                  # Trace
+                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])
-                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])
+                  cycle_info = self.get_cycle(task)
+                  if cycle_info['useID'] == False:
+                    self._logger.info(f'---------- Cycle {task.name} Round {cycle_info["count"]} -----------')
+                if action.type == 'cycle' and condition.type == 'until_button_trigger':
                   self._task_manager.running_task.stop()
+                  self._logger.info(f'---------- Cycle {cycle_info["id"]} Round {cycle_info["count"]} -----------')
+
+                if self._task_manager.running_task != None:
+                  if self._task_manager.running_task.uuid == task.uuid and action.type == 'cycle' and condition.type == 'after_task_run':
+                    self._task_manager.running_task.stop()
+
+                if action.type == 'start':
+                  if task.status != 1:
+                    self._task_manager.set_running_task(task)
+                    self._logger.info(f'Task {str(self._task_manager.running_task.name)} start')
+                    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 == '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._count += 1
+                  # if self.check_running_task_not_run() == True:
+                  #   self._task_manager.running_task.stop()
 
                 elif action.type == 'idle':
                   self._task_manager.running_task.stop()
+                # elif action.type == 'stop':
+                #   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:
-                  for instruction in instruction_set:
-                    args = list(map(lambda arg: task_info[arg], instruction['arguments']))
-                    threading.Thread(target=getattr(device, instruction['method'])(*args))
+                instruction_set = None
+
+                if action.target is not None:
+                  device = self._complete_device[action.target]
+                  if ((action.type == 'start' and device.status == 0) or (action.type == 'stop' and device.status == 1)):
+                    self._logger.info(f'Device {device.mac_address_in_str} {action.type}')
+                    self.log_verbose('Project' + self.name + 'Task ' + task.name + ' match_condition ' + condition.type + ' trigger_action ' + action.type + ' ' + str(action.target))
+                    task_info = task.get_task_info(action)
+                    instruction_set = getattr(self._instruction_set, action.type, None)
+                    
+                    # 檔名修正
+                    # device
+                    task_info['file_name'] += '#' + device.mac_address_in_str[12:].upper()
+                    # 流水號
+                    task_info['file_name'] += '#' + str(self._count)
+
+                    # 添加cycle資訊
+                    if len(self.cycle) > 0:
+                      index = self._task_manager.get_index_by_task(task)
+                      # get list of cycle determine by index of task
+                      filtered = list(filter(lambda info: self._task_manager.get_index_by_uuid(info['range'][0]) < index and self._task_manager.get_index_by_uuid(info['range'][1]) > index, self.cycle))
+                      
+                      if len(filtered) == 0:
+                        pass
+                      elif len(filtered) == 1:
+                        if filtered[0]['useID'] == True:
+                          task_info['file_name'] += '#' + str(filtered[0]['id'])
+                        else:
+                          task_info['file_name'] += '#' + str(filtered[0]['name']) + '-' + str(filtered[0]['count'])
+                      else:
+                        # if multi cycle, then sort by range from task index to cycle start index, then loop concat filename
+                        filtered.sort(key=lambda info: abs(self._task_manager.get_index_by_uuid(info['range'][0]) - index))
+                        for cycle_info in filtered:
+                          if cycle_info['useID'] == True:
+                            task_info['file_name'] += '#' + str(cycle_info['id'])
+                          else:
+                            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 action.type == 'start':
+                      self._count += 1
+                    for instruction in instruction_set:
+                      print('instruction 1', device, instruction, datetime.now())
+                      args = list(map(lambda arg: task_info[arg], instruction['arguments']))
+                      target=getattr(device, instruction['method'])(*args)
+                      print('instruction 2', device, instruction, datetime.now())
             
             delay_time += (time() - now)
 
         # check task not running then stop
         if self.check_running_task_not_run() == True:
-          if self._task_manager.running_task.cycle == -1:
+          # self._logger.info(f'taskType {self._task_manager.running_task.name} {self._task_manager.running_task.type}')
+          if self._task_manager.running_task.type == '':
+            self._logger.info(f'Task {self._task_manager.running_task.name} 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._task_manager.running_task.stop()
-          # self._task_manager.set_running_task(task)
         
         # check project done then close project
         if self.check_project_done() == True:
           print('project stop at', datetime.now())
-          self.close()
+          self.stop()
         
         if self._time_interval - delay_time > 0:
           sleep(self._time_interval - delay_time)
@@ -205,14 +290,19 @@ 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
     self._end_time = time()
     self._stop_flag  = True
+    self._logger.info('Project ' + self.name + ' stop')
     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
@@ -228,11 +318,24 @@ class Project(threading.Thread):
   def set_content(self, content):
     self.running_task.button_trigger = True
   
+  def set_cycle(self, index, content):
+    # change cycle name
+    for key in content:
+      self.cycle[index][key] = content[key]
+
+    # change task name
+    # self._task_manager.get_task_by_uuid(self.cycle[index]['range'][0]).name = content['name']
+    # self._task_manager.get_task_by_uuid(self.cycle[index]['range'][1]).name = content['name']
+  
   def check_running_task_not_run(self):
     # if no running task
     if self._task_manager.running_task == None:
       return False
     
+    # if running is cycle then no need to stop by device
+    if self._task_manager.running_task.type == 'cycle':
+      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':
@@ -257,6 +360,19 @@ class Project(threading.Thread):
       'status': self._status,
       'device': self._device,
       'task': self.task_list,
-      'running_task': running_task
+      '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,
     }
     return data

python/biopro/project/project_manager.py

@@ -9,13 +9,14 @@ def json_stringify(o: Any) -> str:
     return _json_stringify(o, separators=(',', ':'))
 
 class ProjectManager():
-    def __init__(self, device_manager: DeviceManager, mqtt_thread=None) :
+    def __init__(self, device_manager: DeviceManager, mqtt_thread=None, log_verbose = None) :
         self._project_list = []
         self._mqtt_thread =  mqtt_thread
         self._device_manager = device_manager
+        self.log_verbose = log_verbose
     
     def create(self, project):
-      new_project = Project(project, self._device_manager, self._mqtt_thread)
+      new_project = Project(project, self._device_manager, self._mqtt_thread, self.log_verbose)
       self._project_list.append(new_project)
       return new_project
 
@@ -41,3 +42,7 @@ class ProjectManager():
     def set_project(self, project_uuid, content):
       _project = self.get(project_uuid)
       _project.set_content(content)
+    
+    def set_project_cycle(self, project_uuid, index, content):
+      _project = self.get(project_uuid)
+      _project.set_cycle(index, content)

python/biopro/project/task.py

@@ -12,6 +12,8 @@ key_list = {
 class Task:
   def __init__(self, task):
     self._id = None
+    self._uuid = None
+    self._type = None
     self._name = None
     self._parent = None
     self._cycle = None
@@ -82,6 +84,14 @@ class Task:
   @uuid.setter
   def uuid(self, new_uuid):
     self._uuid = new_uuid
+
+  @property
+  def type(self):
+    return self._type
+  
+  @type.setter
+  def type(self, new_type):
+    self._type = new_type
   
   @property
   def name(self):
@@ -275,7 +285,7 @@ class Task:
     return {
       'device': action.target,
       'parameter': self.get_parameter_set_by_device(action.target),
-      'file_name': self._name + '-' + str(action.target),
+      'file_name': self._name,
       'parent': self.parent,
       'instruction': _type
     }
@@ -285,6 +295,8 @@ class Task:
       'id': self.id,
       'name': self.name,
       'parent': self.parent,
+      'type': self.type,
+      'uuid': self.uuid,  
       'cycle': self.cycle,
       'cycle_count': self.cycle_count,
       'cycle_next': self.cycle_next,

python/biopro/project/task_manager.py

@@ -12,11 +12,12 @@ def json_stringify(o: Any) -> str:
     return _json_stringify(o, separators=(',', ':'))
 
 class TaskManager():
-    def __init__(self, task_list):
+    def __init__(self, task_list, cycle_list):
       self._task_list = []
       self._next_task = []
       self._prev_task = None
       self._running_task = None
+      self._cycle_list = cycle_list
       
       self.load_task_list(task_list)
 
@@ -44,6 +45,28 @@ class TaskManager():
     def next_task(self):
       return self._next_task
 
+    def get_task_by_index(self, index):
+      return self._task_list[index]
+
+    def get_task_by_uuid(self, uuid):
+      return next((x for x in self.task_list if x.uuid == uuid), None)
+    
+    def get_index_by_task(self, task):
+      return next((i for i, x in enumerate(self.task_list) if x.uuid == task.uuid), None)
+    
+    def get_index_by_uuid(self, uuid):
+      return next((i for i, x in enumerate(self.task_list) if x.uuid == uuid), None)
+    
+    def check_task_is_cycle_start(self, task):
+      for index, cycle in enumerate(self._cycle_list):
+        if cycle['range'][0] == task.uuid:
+          return index
+
+    def check_task_is_cycle_end(self, task):
+      for index, cycle in enumerate(self._cycle_list):
+        if cycle['range'][1] == task.uuid:
+          return index
+
     @property
     def check_list(self):
       return [self._running_task, *self._next_task]
@@ -83,42 +106,57 @@ class TaskManager():
             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
+        # save task
         self._prev_task = self._running_task
         # clear next task list
         self._next_task.clear()
+        # set task to running_task
         self._running_task = task
         self._running_task.run()
 
+        # if previous task is still running, then need to close
         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
+        # if reach cycle end, count < max, then go to cycle start
+        cycle_start_index = self.check_task_is_cycle_start(task)
+        cycle_index = self.check_task_is_cycle_end(task)
+        if cycle_index is None:
+          # print('next', self._running_task.name, self._running_task.next)
           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)
+          # print('self._next_task', self._next_task)
+        else:
+          # print('cycle', self._cycle_list[cycle_index])
+          cycle = self._cycle_list[cycle_index]
+          if int(cycle['count']) < int(cycle['max']):
+            self._next_task.append(self.get_task_by_uuid(cycle['range'][0]))
+            # cycle['count'] += 1
+          else:
+            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)
+            # cycle['count'] = 1
+
+        if cycle_start_index != None:
+            cycle = self._cycle_list[cycle_start_index]
+            if int(cycle['count']) < int(cycle['max']):
+              cycle['count'] += 1
+            else:
+              cycle['count'] = 1
+
       except RuntimeError as e:
         print(e)
 

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')
+                 '_raw_serial_number', '_mini_serial_number', '_device_id', '_project_id')
 
     def __init__(self, filepath: Union[str, Path], data_format: bytes = None, id_db = 0, database = None):
         if isinstance(filepath, str):
@@ -153,6 +153,7 @@ class RecordingMetaFile(JsonSerialize):
         self._parent = ''
         self._recording_file_name = ''
         self._device_id = -1
+        self._project_id = None
 
         # recording parameter
         self._configuration = None
@@ -297,6 +298,7 @@ class RecordingMetaFile(JsonSerialize):
             'uuid': str(self._file_uuid),
             'data_format': 'rec',
             'device': self._device,
+            'project': self._project_id,
         }
 
         if len(self._parent) > 0:
@@ -462,7 +464,7 @@ class RecordingMetaFile(JsonSerialize):
     def parameter(self) -> str:
         return self._parameter
 
-    @device.setter
+    @parameter.setter
     def parameter(self, parameter):
         self._parameter = parameter
         return None
@@ -471,7 +473,7 @@ class RecordingMetaFile(JsonSerialize):
     def parent(self) -> str:
         return self._parent
 
-    @device.setter
+    @parent.setter
     def parent(self, parent):
         self._parent = parent
 
@@ -479,7 +481,7 @@ class RecordingMetaFile(JsonSerialize):
     def recording_file_name(self) -> str:
         return self._recording_file_name
 
-    @device.setter
+    @recording_file_name.setter
     def recording_file_name(self, recording_file_name):
         self._recording_file_name = recording_file_name
 
@@ -492,6 +494,15 @@ 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,7 +4,6 @@ from time import time, sleep
 from typing import Iterable
 from datetime import datetime
 import gc
-
 import base64
 
 from biopro.data import *
@@ -27,7 +26,6 @@ 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
@@ -65,7 +63,7 @@ class DataServer(SocketServer, DataAPI):
         """
         global _FLAG_DATA_LOST_STATS_
 
-        super().__init__(DataAPI, 'DataServer', self.ADDR, socket_listen=3)
+        super().__init__(DataAPI, 'DataServer', self.ADDR, socket_listen=20)
 
         data_options = DataServerOptions.get_options(*options)
 
@@ -317,7 +315,8 @@ class DataServer(SocketServer, DataAPI):
     def update_device_configuration(self,
                                     device: str,
                                     meta_file: Union[str, Path, RecordingMetaFile],
-                                    data_format: Union[AnyStr, DataDecodeFormat]):
+                                    data_format: Union[AnyStr, DataDecodeFormat],
+                                    project_info: str):
         # meta file
 
         device_id = -1
@@ -345,6 +344,8 @@ 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']
@@ -354,13 +355,22 @@ 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)
 
@@ -380,8 +390,6 @@ 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
@@ -406,15 +414,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,
-                                                    database = self.database_process )
-            # data_runtime_process.start()
+                                                    data_format, self.socket_mqtt_ip, self.socket_mqtt_port, 
+                                                    project_id = project_id,
+                                                    database = self.database_process)
 
         # 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)
 
@@ -646,6 +654,7 @@ class DataServer(SocketServer, DataAPI):
     def whether_to_record(self, device):
         # if user click "start", return True; if user click "stop", return False;
         if device in self._configurations.keys() and self._configurations[device] is not None:
+            # print(self._configurations.keys(), ',', device, datetime.now())
             return True
         else:
             return False
@@ -654,6 +663,9 @@ class DataServer(SocketServer, DataAPI):
         ret = False
         sync = self.get_spi_obj()
 
+        busy = sync.get_pin_busy()
+        # print('pin_busy=', busy, device, datetime.now())
+
         if sync.get_pin_mem_req() == sync.get_pin_ram_sel():
             spi_data = sync.recv_memory(device)
             signal = sync.get_pin_mem_req()
@@ -662,15 +674,18 @@ class DataServer(SocketServer, DataAPI):
 
         else:
             data = None
+            print('data=None, mem_req!=ram_sel, [', sync.get_pin_mem_req(), ', ', sync.get_pin_ram_sel(), ']', device, datetime.now())
 
         if data is not None:
-            if self._configurations[device].queue_flag:
-                self._configurations[device].queue_flag = False
-                print("q size= ", self._configurations[device]._queue_rec.qsize())
-
-            self._configurations[device].put_rec_queue(data)
-            # self._no_data_total_duration = 0
-            ret = True
+            if self._configurations.get(device, None) != None:
+                if self._configurations[device].queue_flag:
+                    self._configurations[device].queue_flag = False
+                    print("q size= ", self._configurations[device]._queue_rec.qsize())
+            
+            if self._configurations.get(device, None) != None:
+                self._configurations[device].put_rec_queue(data)
+                # self._no_data_total_duration = 0
+                ret = True
         # else:
         #     time_diff = time() - self._recv_memory_cost_time
         #     self._no_data_total_duration += time_diff

python/biopro/server/database.py

@@ -550,4 +550,33 @@ class DataBaseProcess(Process):
         except psycopg2.Error as e:
             print('e', e)
 
-        return True
+        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()

python/biopro/server/main.py

@@ -1,6 +1,7 @@
 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
@@ -31,8 +32,10 @@ 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
-### do not import Websocket mode
-###from .websocket import WebsocketThread
+from biopro.db.base import Base, Session, engine
+from biopro.db.project_report import ProjectReport
+from biopro.db.meta_project_info import MetaProjectInfo
+
 
 _RUNTIME_COMPILE = False
 
@@ -105,7 +108,7 @@ class ControlServer(SocketServer, ControlServerAPI):
         # device detect
         self._detect_device_thread = RoutineConnectDeviceThread(self._device_manager, self.mqtt_thread, self.led_thread, 3)
 
-        self._project_manager = ProjectManager(self.device_manager, self.mqtt_thread)
+        self._project_manager = ProjectManager(self.device_manager, self.mqtt_thread, self.log_verbose)
 
         if not c.flag_disable_led_control:
             self.led_thread.set_state(LED.COLOR_RED)
@@ -117,8 +120,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
@@ -129,6 +132,10 @@ 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:
@@ -820,16 +827,19 @@ class ControlServer(SocketServer, ControlServerAPI):
 
     @logging_info
     def device_battery(self, device:int) -> List[int]:
-        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
-            }
+        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) 
         return battery
 
     @logging_info
@@ -1021,8 +1031,17 @@ 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()
     
@@ -1037,6 +1056,12 @@ class ControlServer(SocketServer, ControlServerAPI):
         if project is not None:
             self._project_manager.set_project(project, content)
         return True
+    
+    @logging_info
+    def set_project_cycle(self, project, index, content) -> bool:
+        if project is not None:
+            self._project_manager.set_project_cycle(project, index, content)
+        return True
 
     @logging_info
     def get_running_project(self) -> bool:
@@ -1058,6 +1083,10 @@ class ControlServer(SocketServer, ControlServerAPI):
 
         elif oper == InternalInstruction.PREDEFINED_DISABLE_CACHE:
             return True
+        
+        elif oper == InternalInstruction.PREDEFINED_IDLE:
+            device.status = 1
+            return True
 
         else:
             return False
@@ -1072,6 +1101,7 @@ 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)
 
@@ -1082,9 +1112,12 @@ 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)
+                client.update_device_configuration(device, info.meta_file, value, project)
 
     def _device_set_disable_cache(self, device: CompletedDevice, disable):
         if disable:
@@ -1118,7 +1151,6 @@ 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,7 +44,9 @@ 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', database = None):
+                    name = 'Recording-Process', 
+                    project_id = None,
+                    database = None):
         super(RecordingProcess, self).__init__(name = name)
 
         self._database = database
@@ -57,6 +59,7 @@ 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)
 
@@ -155,9 +158,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/biopro/util/socket.py

@@ -93,13 +93,15 @@ class SocketClient(metaclass=abc.ABCMeta):
         if self._socket is None:
             try:
                 self._socket = Socket(AF_UNIX, SOCK_STREAM)
-                self._socket.settimeout(1)
+                self._socket.settimeout(5)
                 self._socket.connect(self._socket_file)
-            except FileNotFoundError as e:
-                raise RuntimeError('server not available') from e
+            except Exception as e:
+                print('open_socket error:', e)
+            # except FileNotFoundError as e:
+            #     raise RuntimeError('server not available') from e
 
-            except ConnectionRefusedError as e:
-                raise RuntimeError('server crash') from e
+            # except ConnectionRefusedError as e:
+            #     raise RuntimeError('server crash') from e
 
     def close_socket(self):
         if self._socket is not None:

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

@@ -33,6 +33,7 @@
         0,
         1,
         1,
+        1,
         1
       ],
       "domain": {
@@ -617,7 +618,8 @@
         "Open Circuit Potential",
         "Pulse Sensing",
         "Differential Pulse Voltammetry (DPV)",
-        "Chronopotentiometry"
+        "Chronopotentiometry",
+        "Idle"
       ]
     },
     "VOLT_ORIGIN": {
@@ -949,6 +951,7 @@
           "10": "cali_dac_test",
           "11": "cali_adc_test",
           "12": "",
+          "17": "idle",
           "*": "start_data"
         }
       }
@@ -976,6 +979,9 @@
       "VIS_STI",
       "_cdr('1X;4X>ADC_VALUE_I')"
     ],
+    "idle": [
+      "_idle()"
+    ],
     "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
@@ -26,17 +26,43 @@
         "expression": "VALUE"
       }
     },
-    "CHANNEL": {
-      "derzteription": "record channels",
-      "record_meta": true,
-      "domain": "property",
-      "value": "[0, 1, 2]"
+    "HIGHZ_TABLE": {
+      "initial": [
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1
+      ],
+      "domain": {
+        "list": [
+          100
+        ]
+      },
+      "value": "VALUE"
     },
-    "CHANNEL_LABEL": {
-      "description": "channel label",
+    "CTRL_HIGH_Z_15": {
+      "description": "ctrl highZ level",
       "record_meta": true,
-      "domain": "property",
-      "value": "['current', 'voltage', 'impedance']"
+      "initial": 1,
+      "value": [
+        "On",
+        "Off"
+      ],
+      "on_change": "set_ctrl_highZ"
+    },
+    "CYCLE_NUMBER": {
+      "description": "CV cycle number",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
     },
     "SAMPLE_RATE": {
       "description": "data sampling rate",
@@ -50,6 +76,12 @@
       },
       "on_change": "set_sample_rate"
     },
+    "CHANNEL": {
+      "derzteription": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
     "AMP_GAIN": {
       "description": "amp gain",
       "record_meta": true,
@@ -63,14 +95,62 @@
         "EIS CURVE",
         "Cyclic Voltammetry",
         "Chronoamperometric",
+        "V-T Graph",
+        "R-T Graph",
+        "EIS constant frequency",
         "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"
+    },
+    "GENERAL_LP_RTIA": {
+      "description": "Low power rtia gain",
+      "record_meta": true,
+      "initial": 4,
+      "value": [
+        "0",
+        "1",
+        "2",
+        "3",
+        "auto"
+      ],
+      "on_change": "set_general_lp_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": [
-        13422819,
+        13333333,
         7
       ],
       "domain": {
@@ -80,29 +160,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,19 +188,19 @@
         "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
+        6,
+        8
       ]
     },
-    "DC_BIAS": {
-      "description": "DC voltage bias in mV",
+    "CF_DC_BIAS": {
+      "description": "DC voltage bias",
       "record_meta": true,
       "initial": 25000,
       "domain": [
@@ -135,15 +210,34 @@
         "expression": "VALUE"
       }
     },
-    "AC_AMP": {
-      "description": "AC Amplitude in mV",
+    "CF_AC_AMP": {
+      "description": "AC Amplitude",
       "record_meta": true,
       "initial": 25,
       "domain": [
         2048
       ]
     },
-    "SCALE": {
+    "CF_FREQ": {
+      "description": "frequency of cf",
+      "record_meta": true,
+      "initial": 13333333,
+      "domain": [
+        "FREQ_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CF_PPD": {
+      "description": "Point per decades",
+      "record_meta": true,
+      "initial": 10,
+      "domain": [
+        11
+      ]
+    },
+    "CF_SCALE": {
       "description": "Point spacing pattern",
       "record_meta": true,
       "initial": 0,
@@ -152,77 +246,29 @@
         1
       ]
     },
-    "PPD": {
-      "description": "Point per decades",
+    "CF_DELAY": {
+      "description": "Wait x peroid before start taking measurements",
       "record_meta": true,
-      "initial": 10,
+      "initial": 0,
       "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
+        101
       ],
       "value": {
         "expression": "VALUE"
       }
     },
-    "CTRL_HIGH_Z_15": {
-      "description": "ctrl highZ level",
+    "CF_AVERAGE_NUM": {
+      "description": "Number of sample used for average funciton",
       "record_meta": true,
-      "initial": 1,
+      "initial": 8,
       "value": [
-        "On",
-        "Off"
-      ],
-      "on_change": "set_ctrl_highZ"
+        2,
+        4,
+        6,
+        8
+      ]
     },
-    "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": {
+    "CV_E_INITIAL": {
       "description": "Initial Voltage of Scan",
       "record_meta": true,
       "initial": 25000,
@@ -233,8 +279,8 @@
         "expression": "VALUE"
       }
     },
-    "VOLT_MAX": {
-      "description": "Max Voltage of Scan",
+    "CV_E1": {
+      "description": "First voltage of Scan",
       "record_meta": true,
       "initial": 25000,
       "domain": [
@@ -244,8 +290,8 @@
         "expression": "VALUE"
       }
     },
-    "VOLT_MIN": {
-      "description": "Min Voltage of Scan",
+    "CV_E2": {
+      "description": "Second voltage of Scan",
       "record_meta": true,
       "initial": 25000,
       "domain": [
@@ -255,27 +301,54 @@
         "expression": "VALUE"
       }
     },
-    "CYCLE_NUMBER": {
-      "description": "CV cycle number",
+    "CV_SCAN_RATE": {
+      "description": "Voltage scan rate",
       "record_meta": true,
-      "initial": 1,
+      "initial": 10000,
+      "domain": [
+        100001
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CA_VOLT": {
+      "description": "Voltage of ca",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "VT_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"
     },
-    "VOLT_VSCAN": {
-      "description": "Voltage of VScan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
     },
     "BLE_WRITE": {
       "description": "send msg to elite",
@@ -307,15 +380,12 @@
       {
         "expression": "MODE",
         "when": {
-          "1": "set_adc_gain_I",
-          "2": "set_adc_gain_I"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_Vin",
-          "2": "set_adc_gain_Vin"
+          "0": "set_general_hs_rtia",
+          "1": "set_general_lp_rtia",
+          "2": "set_general_lp_rtia",
+          "3": "set_general_lp_rtia",
+          "4": "set_general_lp_rtia",
+          "5": "set_general_hs_rtia"
         }
       },
       {
@@ -323,14 +393,25 @@
         "when": {
           "0": "curve_eis",
           "1": "curve_cv3",
-          "2": "curve_const_vscan"
+          "2": "curve_ca",
+          "3": "curve_vt",
+          "4": "curve_rt",
+          "5": "curve_cf"
         }
       },
       {
         "expression": "MODE",
         "when": {
           "0": "curve_eis_para2",
-          "1": "curve_cv3_para2"
+          "1": "curve_cv3_para2",
+          "5": "curve_cf_para2"
+        }
+      },
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "curve_eis_mode",
+          "5": "curve_cf_mode"
         }
       },
       "_sync(True)",
@@ -350,6 +431,18 @@
     "data_format_cali": [
       "_data_format_cali('EISZeroOne')"
     ],
+    "set_general_hs_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X70;1B>GENERAL_HS_RTIA"
+      ]
+    },
+    "set_general_lp_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X71;1B>GENERAL_LP_RTIA"
+      ]
+    },
     "set_sample_rate": {
       "type": "RIS",
       "parameter": {
@@ -359,103 +452,172 @@
         "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"
+        "1XFF;1X72;1B>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"
+        "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_cf": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X01;4B>fa;4B>0;2B>dp"
+      ]
+    },
+    "curve_cf_para2": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+      ]
+    },
+    "curve_cf_mode": {
+      "type": "RIS",
+      "data": [
+        "1X13;1XFF"
       ]
     },
     "curve_cv3": {
       "type": "RIS",
       "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
         "vf": "SAMPLE_RATE",
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X01;2B>va;2B>vb;2B>vc;"
+        "1X09;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",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
         "vf": "SAMPLE_RATE",
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X02;4B>ve;2B>vf;2B>cn"
+        "1X09;1X02;4B>ve;2B>vf;2B>cn"
       ]
     },
-    "curve_const_vscan": {
+    "curve_ca": {
       "type": "RIS",
       "parameter": {
-        "va": "VOLT_VSCAN",
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "va": "CA_VOLT",
+        "pa": "GENERAL_LP_RTIA",
         "pd": "CTRL_HIGH_Z_15",
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "1XD3;",
+        "1X0B;",
         "2B>va;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
         "4b>0;4b>pd;",
         "2B>pe"
       ]
     },
+    "curve_rt": {
+      "type": "RIS",
+      "parameter": {
+        "va": "RT_VOLT_SET",
+        "pa": "GENERAL_LP_RTIA",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE"
+      },
+      "data": [
+        "X04;",
+        "2B>va;",
+        "4b>pa;4b>0;",
+        "4b>0;4b>pd;",
+        "2B>pe"
+      ]
+    },
+    "curve_vt": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "GENERAL_LP_RTIA",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE",
+        "va": "VT_MEASURE_VIN_RANGE"
+      },
+      "data": [
+        "X05;",
+        "4b>pa;4b>0;",
+        "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
@@ -26,17 +26,44 @@
         "expression": "VALUE"
       }
     },
-    "CHANNEL": {
-      "derzteription": "record channels",
-      "record_meta": true,
-      "domain": "property",
-      "value": "[0, 1, 2]"
+    "HIGHZ_TABLE": {
+      "initial": [
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1
+      ],
+      "domain": {
+        "list": [
+          100
+        ]
+      },
+      "value": "VALUE"
     },
-    "CHANNEL_LABEL": {
-      "description": "channel label",
+    "CTRL_HIGH_Z_15": {
+      "description": "ctrl highZ level",
       "record_meta": true,
-      "domain": "property",
-      "value": "['current', 'voltage', 'impedance']"
+      "initial": 1,
+      "value": [
+        "On",
+        "Off"
+      ],
+      "on_change": "set_ctrl_highZ"
+    },
+    "CYCLE_NUMBER": {
+      "description": "CV cycle number",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
     },
     "SAMPLE_RATE": {
       "description": "data sampling rate",
@@ -50,6 +77,12 @@
       },
       "on_change": "set_sample_rate"
     },
+    "CHANNEL": {
+      "derzteription": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
     "AMP_GAIN": {
       "description": "amp gain",
       "record_meta": true,
@@ -63,14 +96,63 @@
         "EIS CURVE",
         "Cyclic Voltammetry",
         "Chronoamperometric",
-        "Dev Mode"
+        "V-T Graph",
+        "R-T Graph",
+        "EIS constant frequency",
+        "Dev Mode",
+        "Idle"
       ]
     },
-    "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"
+    },
+    "GENERAL_LP_RTIA": {
+      "description": "Low power rtia gain",
+      "record_meta": true,
+      "initial": 4,
+      "value": [
+        "0",
+        "1",
+        "2",
+        "3",
+        "auto"
+      ],
+      "on_change": "set_general_lp_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": [
-        13422819,
+        13333333,
         7
       ],
       "domain": {
@@ -80,29 +162,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,19 +190,19 @@
         "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
+        6,
+        8
       ]
     },
-    "DC_BIAS": {
-      "description": "DC voltage bias in mV",
+    "CF_DC_BIAS": {
+      "description": "DC voltage bias",
       "record_meta": true,
       "initial": 25000,
       "domain": [
@@ -135,15 +212,34 @@
         "expression": "VALUE"
       }
     },
-    "AC_AMP": {
-      "description": "AC Amplitude in mV",
+    "CF_AC_AMP": {
+      "description": "AC Amplitude",
       "record_meta": true,
       "initial": 25,
       "domain": [
         2048
       ]
     },
-    "SCALE": {
+    "CF_FREQ": {
+      "description": "frequency of cf",
+      "record_meta": true,
+      "initial": 13333333,
+      "domain": [
+        "FREQ_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CF_PPD": {
+      "description": "Point per decades",
+      "record_meta": true,
+      "initial": 10,
+      "domain": [
+        11
+      ]
+    },
+    "CF_SCALE": {
       "description": "Point spacing pattern",
       "record_meta": true,
       "initial": 0,
@@ -152,77 +248,29 @@
         1
       ]
     },
-    "PPD": {
-      "description": "Point per decades",
+    "CF_DELAY": {
+      "description": "Wait x peroid before start taking measurements",
       "record_meta": true,
-      "initial": 10,
+      "initial": 0,
       "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
+        101
       ],
       "value": {
         "expression": "VALUE"
       }
     },
-    "CTRL_HIGH_Z_15": {
-      "description": "ctrl highZ level",
+    "CF_AVERAGE_NUM": {
+      "description": "Number of sample used for average funciton",
       "record_meta": true,
-      "initial": 1,
+      "initial": 8,
       "value": [
-        "On",
-        "Off"
-      ],
-      "on_change": "set_ctrl_highZ"
+        2,
+        4,
+        6,
+        8
+      ]
     },
-    "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": {
+    "CV_E_INITIAL": {
       "description": "Initial Voltage of Scan",
       "record_meta": true,
       "initial": 25000,
@@ -233,8 +281,8 @@
         "expression": "VALUE"
       }
     },
-    "VOLT_MAX": {
-      "description": "Max Voltage of Scan",
+    "CV_E1": {
+      "description": "First voltage of Scan",
       "record_meta": true,
       "initial": 25000,
       "domain": [
@@ -244,8 +292,8 @@
         "expression": "VALUE"
       }
     },
-    "VOLT_MIN": {
-      "description": "Min Voltage of Scan",
+    "CV_E2": {
+      "description": "Second voltage of Scan",
       "record_meta": true,
       "initial": 25000,
       "domain": [
@@ -255,27 +303,54 @@
         "expression": "VALUE"
       }
     },
-    "CYCLE_NUMBER": {
-      "description": "CV cycle number",
+    "CV_SCAN_RATE": {
+      "description": "Voltage scan rate",
       "record_meta": true,
-      "initial": 1,
+      "initial": 10000,
+      "domain": [
+        100001
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CA_VOLT": {
+      "description": "Voltage of ca",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "VT_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"
     },
-    "VOLT_VSCAN": {
-      "description": "Voltage of VScan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
     },
     "BLE_WRITE": {
       "description": "send msg to elite",
@@ -297,25 +372,26 @@
       {
         "expression": "MODE",
         "when": {
+          "7": "idle",
           "*": "start_data"
         }
       }
     ],
+    "idle": [
+      "_idle()"
+    ],
     "start_data": [
       "data_format_cali",
       "_notify(True)",
       {
         "expression": "MODE",
         "when": {
-          "1": "set_adc_gain_I",
-          "2": "set_adc_gain_I"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_Vin",
-          "2": "set_adc_gain_Vin"
+          "0": "set_general_hs_rtia",
+          "1": "set_general_lp_rtia",
+          "2": "set_general_lp_rtia",
+          "3": "set_general_lp_rtia",
+          "4": "set_general_lp_rtia",
+          "5": "set_general_hs_rtia"
         }
       },
       {
@@ -323,14 +399,25 @@
         "when": {
           "0": "curve_eis",
           "1": "curve_cv3",
-          "2": "curve_const_vscan"
+          "2": "curve_ca",
+          "3": "curve_vt",
+          "4": "curve_rt",
+          "5": "curve_cf"
         }
       },
       {
         "expression": "MODE",
         "when": {
           "0": "curve_eis_para2",
-          "1": "curve_cv3_para2"
+          "1": "curve_cv3_para2",
+          "5": "curve_cf_para2"
+        }
+      },
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "curve_eis_mode",
+          "5": "curve_cf_mode"
         }
       },
       "_sync(True)",
@@ -350,6 +437,18 @@
     "data_format_cali": [
       "_data_format_cali('EISZeroOne')"
     ],
+    "set_general_hs_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X70;1B>GENERAL_HS_RTIA"
+      ]
+    },
+    "set_general_lp_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X71;1B>GENERAL_LP_RTIA"
+      ]
+    },
     "set_sample_rate": {
       "type": "RIS",
       "parameter": {
@@ -359,103 +458,172 @@
         "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"
+        "1XFF;1X72;1B>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"
+        "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_cf": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X01;4B>fa;4B>0;2B>dp"
+      ]
+    },
+    "curve_cf_para2": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+      ]
+    },
+    "curve_cf_mode": {
+      "type": "RIS",
+      "data": [
+        "1X13;1XFF"
       ]
     },
     "curve_cv3": {
       "type": "RIS",
       "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
         "vf": "SAMPLE_RATE",
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X01;2B>va;2B>vb;2B>vc;"
+        "1X09;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",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
         "vf": "SAMPLE_RATE",
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X02;4B>ve;2B>vf;2B>cn"
+        "1X09;1X02;4B>ve;2B>vf;2B>cn"
       ]
     },
-    "curve_const_vscan": {
+    "curve_ca": {
       "type": "RIS",
       "parameter": {
-        "va": "VOLT_VSCAN",
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "va": "CA_VOLT",
+        "pa": "GENERAL_LP_RTIA",
         "pd": "CTRL_HIGH_Z_15",
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "1XD3;",
+        "1X0B;",
         "2B>va;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
         "4b>0;4b>pd;",
         "2B>pe"
       ]
     },
+    "curve_rt": {
+      "type": "RIS",
+      "parameter": {
+        "va": "RT_VOLT_SET",
+        "pa": "GENERAL_LP_RTIA",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE"
+      },
+      "data": [
+        "X04;",
+        "2B>va;",
+        "4b>pa;4b>0;",
+        "4b>0;4b>pd;",
+        "2B>pe"
+      ]
+    },
+    "curve_vt": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "GENERAL_LP_RTIA",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE",
+        "va": "VT_MEASURE_VIN_RANGE"
+      },
+      "data": [
+        "X05;",
+        "4b>pa;4b>0;",
+        "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_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
@@ -26,17 +26,44 @@
         "expression": "VALUE"
       }
     },
-    "CHANNEL": {
-      "derzteription": "record channels",
-      "record_meta": true,
-      "domain": "property",
-      "value": "[0, 1, 2]"
+    "HIGHZ_TABLE": {
+      "initial": [
+        1,
+        1,
+        1,
+        0,
+        1,
+        1,
+        1,
+        1
+      ],
+      "domain": {
+        "list": [
+          100
+        ]
+      },
+      "value": "VALUE"
     },
-    "CHANNEL_LABEL": {
-      "description": "channel label",
+    "CTRL_HIGH_Z_15": {
+      "description": "ctrl highZ level",
       "record_meta": true,
-      "domain": "property",
-      "value": "['current', 'voltage', 'impedance']"
+      "initial": 1,
+      "value": [
+        "On",
+        "Off"
+      ],
+      "on_change": "set_ctrl_highZ"
+    },
+    "CYCLE_NUMBER": {
+      "description": "CV cycle number",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        65536
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
     },
     "SAMPLE_RATE": {
       "description": "data sampling rate",
@@ -50,6 +77,12 @@
       },
       "on_change": "set_sample_rate"
     },
+    "CHANNEL": {
+      "derzteription": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
     "AMP_GAIN": {
       "description": "amp gain",
       "record_meta": true,
@@ -63,14 +96,63 @@
         "EIS CURVE",
         "Cyclic Voltammetry",
         "Chronoamperometric",
-        "Dev Mode"
+        "V-T Graph",
+        "R-T Graph",
+        "EIS constant frequency",
+        "Dev Mode",
+        "Idle"
       ]
     },
-    "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"
+    },
+    "GENERAL_LP_RTIA": {
+      "description": "Low power rtia gain",
+      "record_meta": true,
+      "initial": 4,
+      "value": [
+        "0",
+        "1",
+        "2",
+        "3",
+        "auto"
+      ],
+      "on_change": "set_general_lp_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": [
-        13422819,
+        13333333,
         7
       ],
       "domain": {
@@ -80,29 +162,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,19 +190,19 @@
         "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
+        6,
+        8
       ]
     },
-    "DC_BIAS": {
-      "description": "DC voltage bias in mV",
+    "CF_DC_BIAS": {
+      "description": "DC voltage bias",
       "record_meta": true,
       "initial": 25000,
       "domain": [
@@ -135,15 +212,34 @@
         "expression": "VALUE"
       }
     },
-    "AC_AMP": {
-      "description": "AC Amplitude in mV",
+    "CF_AC_AMP": {
+      "description": "AC Amplitude",
       "record_meta": true,
       "initial": 25,
       "domain": [
         2048
       ]
     },
-    "SCALE": {
+    "CF_FREQ": {
+      "description": "frequency of cf",
+      "record_meta": true,
+      "initial": 13333333,
+      "domain": [
+        "FREQ_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CF_PPD": {
+      "description": "Point per decades",
+      "record_meta": true,
+      "initial": 10,
+      "domain": [
+        11
+      ]
+    },
+    "CF_SCALE": {
       "description": "Point spacing pattern",
       "record_meta": true,
       "initial": 0,
@@ -152,77 +248,29 @@
         1
       ]
     },
-    "PPD": {
-      "description": "Point per decades",
+    "CF_DELAY": {
+      "description": "Wait x peroid before start taking measurements",
       "record_meta": true,
-      "initial": 10,
+      "initial": 0,
       "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
+        101
       ],
       "value": {
         "expression": "VALUE"
       }
     },
-    "CTRL_HIGH_Z_15": {
-      "description": "ctrl highZ level",
+    "CF_AVERAGE_NUM": {
+      "description": "Number of sample used for average funciton",
       "record_meta": true,
-      "initial": 1,
+      "initial": 8,
       "value": [
-        "On",
-        "Off"
-      ],
-      "on_change": "set_ctrl_highZ"
+        2,
+        4,
+        6,
+        8
+      ]
     },
-    "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": {
+    "CV_E_INITIAL": {
       "description": "Initial Voltage of Scan",
       "record_meta": true,
       "initial": 25000,
@@ -233,8 +281,8 @@
         "expression": "VALUE"
       }
     },
-    "VOLT_MAX": {
-      "description": "Max Voltage of Scan",
+    "CV_E1": {
+      "description": "First voltage of Scan",
       "record_meta": true,
       "initial": 25000,
       "domain": [
@@ -244,8 +292,8 @@
         "expression": "VALUE"
       }
     },
-    "VOLT_MIN": {
-      "description": "Min Voltage of Scan",
+    "CV_E2": {
+      "description": "Second voltage of Scan",
       "record_meta": true,
       "initial": 25000,
       "domain": [
@@ -255,27 +303,54 @@
         "expression": "VALUE"
       }
     },
-    "CYCLE_NUMBER": {
-      "description": "CV cycle number",
+    "CV_SCAN_RATE": {
+      "description": "Voltage scan rate",
       "record_meta": true,
-      "initial": 1,
+      "initial": 10000,
+      "domain": [
+        100001
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "CA_VOLT": {
+      "description": "Voltage of ca",
+      "record_meta": true,
+      "initial": 25000,
+      "domain": [
+        "VOLT_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "VT_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"
     },
-    "VOLT_VSCAN": {
-      "description": "Voltage of VScan",
-      "record_meta": true,
-      "initial": 25000,
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": {
-        "expression": "VALUE"
-      }
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
     },
     "BLE_WRITE": {
       "description": "send msg to elite",
@@ -297,25 +372,26 @@
       {
         "expression": "MODE",
         "when": {
+          "7": "idle",
           "*": "start_data"
         }
       }
     ],
+    "idle": [
+      "_idle()"
+    ],
     "start_data": [
       "data_format_cali",
       "_notify(True)",
       {
         "expression": "MODE",
         "when": {
-          "1": "set_adc_gain_I",
-          "2": "set_adc_gain_I"
-        }
-      },
-      {
-        "expression": "MODE",
-        "when": {
-          "1": "set_adc_gain_Vin",
-          "2": "set_adc_gain_Vin"
+          "0": "set_general_hs_rtia",
+          "1": "set_general_lp_rtia",
+          "2": "set_general_lp_rtia",
+          "3": "set_general_lp_rtia",
+          "4": "set_general_lp_rtia",
+          "5": "set_general_hs_rtia"
         }
       },
       {
@@ -323,14 +399,25 @@
         "when": {
           "0": "curve_eis",
           "1": "curve_cv3",
-          "2": "curve_const_vscan"
+          "2": "curve_ca",
+          "3": "curve_vt",
+          "4": "curve_rt",
+          "5": "curve_cf"
         }
       },
       {
         "expression": "MODE",
         "when": {
           "0": "curve_eis_para2",
-          "1": "curve_cv3_para2"
+          "1": "curve_cv3_para2",
+          "5": "curve_cf_para2"
+        }
+      },
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "curve_eis_mode",
+          "5": "curve_cf_mode"
         }
       },
       "_sync(True)",
@@ -350,6 +437,18 @@
     "data_format_cali": [
       "_data_format_cali('EISZeroOne')"
     ],
+    "set_general_hs_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X70;1B>GENERAL_HS_RTIA"
+      ]
+    },
+    "set_general_lp_rtia": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X71;1B>GENERAL_LP_RTIA"
+      ]
+    },
     "set_sample_rate": {
       "type": "RIS",
       "parameter": {
@@ -359,103 +458,172 @@
         "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"
+        "1XFF;1X72;1B>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"
+        "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_cf": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X01;4B>fa;4B>0;2B>dp"
+      ]
+    },
+    "curve_cf_para2": {
+      "type": "RIS",
+      "parameter": {
+        "fa": "CF_FREQ",
+        "dp": "CF_DELAY",
+        "dc": "CF_DC_BIAS",
+        "am": "CF_AC_AMP",
+        "an": "CF_AVERAGE_NUM",
+        "rt": "GENERAL_HS_RTIA",
+        "pp": "CF_PPD",
+        "sp": "CF_SCALE"
+      },
+      "data": [
+        "1X13;1X02;2B>dc;2B>am;B>an;B>rt;2B>pp;B>sp"
+      ]
+    },
+    "curve_cf_mode": {
+      "type": "RIS",
+      "data": [
+        "1X13;1XFF"
       ]
     },
     "curve_cv3": {
       "type": "RIS",
       "parameter": {
-        "va": "VOLT_INITIAL",
-        "vb": "VOLT_MAX",
-        "vc": "VOLT_MIN",
-        "ve": "Scan_Rate",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
         "vf": "SAMPLE_RATE",
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X01;2B>va;2B>vb;2B>vc;"
+        "1X09;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",
+        "va": "CV_E_INITIAL",
+        "vb": "CV_E1",
+        "vc": "CV_E2",
+        "ve": "CV_SCAN_RATE",
         "vf": "SAMPLE_RATE",
         "cn": "CYCLE_NUMBER"
       },
       "data": [
-        "1XD2;1X02;4B>ve;2B>vf;2B>cn"
+        "1X09;1X02;4B>ve;2B>vf;2B>cn"
       ]
     },
-    "curve_const_vscan": {
+    "curve_ca": {
       "type": "RIS",
       "parameter": {
-        "va": "VOLT_VSCAN",
-        "pa": "ADC_LEVEL_I_15",
-        "pb": "ADC_LEVEL_V_IN_15",
+        "va": "CA_VOLT",
+        "pa": "GENERAL_LP_RTIA",
         "pd": "CTRL_HIGH_Z_15",
         "pe": "SAMPLE_RATE"
       },
       "data": [
-        "1XD3;",
+        "1X0B;",
         "2B>va;",
-        "4b>pa;4b>pb;",
+        "4b>pa;4b>0;",
         "4b>0;4b>pd;",
         "2B>pe"
       ]
     },
+    "curve_rt": {
+      "type": "RIS",
+      "parameter": {
+        "va": "RT_VOLT_SET",
+        "pa": "GENERAL_LP_RTIA",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE"
+      },
+      "data": [
+        "X04;",
+        "2B>va;",
+        "4b>pa;4b>0;",
+        "4b>0;4b>pd;",
+        "2B>pe"
+      ]
+    },
+    "curve_vt": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "GENERAL_LP_RTIA",
+        "pd": "CTRL_HIGH_Z_15",
+        "pe": "SAMPLE_RATE",
+        "va": "VT_MEASURE_VIN_RANGE"
+      },
+      "data": [
+        "X05;",
+        "4b>pa;4b>0;",
+        "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')"

update_db_package.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# install python module numpy
+sudo apt-get install libatlas-base-dev
+sudo apt-get install python3-numpy
+
+# install python module SQLAlchemy
+pip3 install SQLAlchemy
+
+# add column cycle in projects
+sudo su -c "psql -d postgres -c \"ALTER TABLE projects ADD COLUMN IF NOT EXISTS cycle JSONB;\"" postgres
+
+# add column project in recording_data_metas
+sudo su -c "psql -d postgres -c \"ALTER TABLE recording_data_metas ADD COLUMN IF NOT EXISTS project Int4;\"" postgres