chore: comment out unnecessary print messages

2. update PELv3.0 5-channel data

python/biopro/data.py

@@ -122,6 +122,14 @@ class DataAPI(metaclass=abc.ABCMeta):
         """
         pass
 
+    @abc.abstractmethod
+    def tag(self, device: Union[int, Device], data_points: int):
+        """tag data
+
+        :param device: device IDs, empty for all
+        """
+        pass
+
     @abc.abstractmethod
     def sync_file(self):
         """sync file, write-back dirty file. """
@@ -202,6 +210,10 @@ class DataClient(SocketClient, DataAPI, metaclass=SocketClientMacro(DataAPI)):
     def stop_sync(self, *device: Union[int, Device]):
         self.send_command('stop_sync', *self._to_device_id(*device))
     
+    def tag(self, device: Union[int, Device], data_points: int):
+        device = device.device_id
+        self.send_command('tag', device, data_points)
+    
     def show_data(self, device: int):
         self.send_command('show_data', device)
 

python/biopro/db/collection.py

@@ -0,0 +1,60 @@
+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 biopro.db.base import Session
+
+from .base import Base
+
+class Collection(Base):
+    __tablename__ = "collections"
+
+    id = Column(Integer, primary_key=True)
+    name = Column(String(255))
+    parent = Column(JSONB)
+    controller_id = Column(Integer)
+    type = Column(String(255))
+    description = Column(String(255))
+    deleted = Column(Boolean)
+    created_at = Column(TIMESTAMP(timezone=True), server_default=func.now())
+    updated_at = Column(TIMESTAMP(timezone=True), onupdate=func.now())
+
+    @classmethod
+    def create_collection(cls, collection_name, parent):
+        with Session() as session:
+            name = cls.check_name_duplicate(collection_name, parent, 0)
+            collection = Collection(
+                name = name,
+                parent = parent,
+                type= "folder",
+            )
+            session.add(collection)
+            session.commit()
+            print('a', collection.id)
+            return collection
+
+    @classmethod
+    def check_name_duplicate(cls, collection_name, parent, n):
+        with Session() as session:
+            result = session.query(Collection).filter(Collection.name == cls.generate_name(collection_name, n), Collection.parent == parent).first()
+            if result is None:
+                return cls.generate_name(collection_name, n)
+            else:
+                new_num = n + 1
+                # new_name =  f"{collection_name}({new_num})" 
+                return cls.check_name_duplicate(collection_name, parent, new_num)
+
+    @classmethod
+    def generate_name(cls, collection_name, n):
+        if n==0:
+            return collection_name
+        else:
+            return f"{collection_name}({n})" 
+    
+    @classmethod
+    def find_collection(cls, collection_name, parent):
+        with Session() as session:
+            result = session.query(Collection).filter(Collection.name == collection_name, Collection.parent == parent).first()
+            return result
+    
+        

python/biopro/db/device.py

@@ -0,0 +1,51 @@
+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, Float, BINARY, LargeBinary
+from sqlalchemy.dialects.postgresql import JSONB
+
+from .base import Base, Session
+
+class Device(Base):
+    __tablename__ = "devices"
+
+    id = Column(Integer, primary_key=True)
+    name = Column(String(255))
+    mac_address = Column(String(255))
+    serial_number = Column(String(255))
+    configuration = Column(JSONB)
+    library = Column(String(255))
+    library_version = Column(String(255))
+    device_version = Column(String(255))
+    type = Column(String(255))
+    battery = Column(Integer)
+    temperature = Column(Float)
+    auto_connect = Column(Boolean)
+    connect_priority = Column(Integer)
+    connect_time = Column(BigInteger)
+    parameter_set = Column(JSONB)
+    running = Column(Boolean)
+    calibration = Column(LargeBinary)
+    calibration_version = Column(Integer, default=-1)
+    user_auth = Column(JSONB)
+    deleted = Column(Boolean)
+    created_at = Column(TIMESTAMP(timezone=True), server_default=func.now())
+    updated_at = Column(TIMESTAMP(timezone=True), onupdate=func.now())
+
+    @classmethod
+    def update_device(cls, device, options):
+        with Session() as session:
+            result = session.query(Device).filter(Device.mac_address == device['mac_address']).first()
+            for key, value in options.items():
+                setattr(result, key, value)
+            session.commit()
+    
+    @classmethod
+    def get_device(cls, device):
+        with Session() as session:
+            result = session.query(Device).filter(Device.mac_address == device['mac_address']).first()
+            return result
+            
+
+
+    # def __repr__(self):
+    #     return f"User(id={self.id!r}, name={self.name!r}, fullname={self.task!r})"

python/biopro/db/project.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 Project(Base):
+    __tablename__ = "project"
+
+    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/db/project_meta.py

@@ -3,7 +3,7 @@ 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
+from .base import Base, Session
 
 class MetaProjectInfo(Base):
     __tablename__ = "project_metas"
@@ -17,5 +17,13 @@ class MetaProjectInfo(Base):
     created_at = Column(TIMESTAMP(timezone=True), server_default=func.now())
     updated_at = Column(TIMESTAMP(timezone=True), onupdate=func.now())
 
+    @classmethod
+    def create_project_meta(cls, project):
+        with Session() as session:
+            project_meta = MetaProjectInfo(project = project['project'], cycle= project['cycle'], task=project['task'], serial_number=int(project['serial_number']))
+            session.add(project_meta)
+            session.commit()
+            return project_meta.id
+
     # def __repr__(self):
     #     return f"User(id={self.id!r}, name={self.name!r}, fullname={self.task!r})"

python/biopro/device/device_cc2650.py

@@ -350,6 +350,7 @@ class CC2650Device(Device):
         self._recording_file_name: str = 'recording_data'
         self._coeff: bytes = b''
         self._device_version = ""
+        self._cali_version = -1
 
     @property
     def device_id(self) -> int:
@@ -428,17 +429,20 @@ class CC2650Device(Device):
                     self._start_flag = False
 
     def _encode_instruction(self, ins_type: int, ins_oper: int, *instruction: int) -> bytes:
+        # print('_encode_instruction', ins_type, ins_oper, instruction)
         length = len(instruction)
         if length == 1 and instruction[0] < 0:
             return struct.pack('2B1b',
                            (ins_type & 0xF0) | (self.device_id & 0x0F),
-                           (ins_oper & 0xF0) | (length & 0x0F),
-                           *instruction)
-
-        return struct.pack('%dB' % (length + 2),
-                           (ins_type & 0xF0) | (self.device_id & 0x0F),
-                           (ins_oper & 0xF0) | (length & 0x0F),
+                           (ins_oper & 0xFF),
                            *instruction)
+        if ins_type == None:
+            return struct.pack('%dB' % length, *instruction)
+        else:
+            return struct.pack('%dB' % (length + 2),
+                            (ins_type & 0xF0) | (self.device_id & 0x0F),
+                            (ins_oper & 0xFF),
+                            *instruction)
 
     def _decode_data(self, ins_oper: int, data: bytes) -> bytes:
         """CIS data decoder.
@@ -477,22 +481,24 @@ class CC2650Device(Device):
 
         else:
             if data is not None and len(data) > 0:
-                year = struct.unpack('<B', data[0:1])[0]
-                month = struct.unpack('<B', data[1:2])[0]
-                day = struct.unpack('<B', data[2:3])[0]
-                hour = struct.unpack('<B', data[3:4])[0]
-                minute = struct.unpack('<B', data[4:5])[0]
-                mac1 = struct.unpack('<B', data[5:6])[0]
-                mac2 = struct.unpack('<B', data[6:7])[0]
-                mac1 = "%02X" % mac1
-                mac2 = "%02X" % mac2
+                year = struct.unpack('<B', data[2:3])[0]
+                month = struct.unpack('<B', data[3:4])[0]
+                day = struct.unpack('<B', data[4:5])[0]
+                hour = struct.unpack('<B', data[5:6])[0]
+                minute = struct.unpack('<B', data[6:7])[0]
+                # mac1 = struct.unpack('<B', data[7:8])[0]
+                # mac2 = struct.unpack('<B', data[8:9])[0]
+                # mac1 = "%02X" % mac1
+                # mac2 = "%02X" % mac2
 
                 self._device_version = str(year) + '/' + str(month) + '/' + str(day) + " " + str(hour) + ":" + str(
-                    minute) + " | " + str(mac1) + ":" + str(mac2)
+                    minute)
+                    #  + " | " + str(mac1) + ":" + str(mac2)
 
     @property
     def battery(self) -> int:
-        self.update_battery_info()
+        if self._start_flag == False:
+            self.update_battery_info()
         return self._battery
 
     @property
@@ -537,7 +543,7 @@ class CC2650Device(Device):
 
         else:
             if data is not None and len(data) > 2 :
-                battery = struct.unpack('<H', data[1:3])[0]
+                battery = struct.unpack('<H', data[2:4])[0]
                 if battery is not None:
                     self._battery = battery
 
@@ -549,6 +555,39 @@ class CC2650Device(Device):
             self.update_calibration_info(device_type)
 
         return self._coeff
+    
+    def _check_crc(self, data):
+        data_chk_sum = data[-1]
+
+        # print('data:', list(data), 'data_chk_sum:', data_chk_sum)
+        # print('data[0:-1]:', list(data[0:-1]), 'check_sum:', sum(data[0:-1]) & 0b11111111)
+        
+        if data_chk_sum == sum(data[0:-1]) & 0b11111111:
+            return True
+        
+        return False
+
+    def update_cali_version(self) -> bool:
+        for _ in range(5): 
+            try:
+                code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, 0)
+                self._master.write_characteristic(self.device_id, CC2650MasterDevice.COMMAND_HANDLE, code)
+            except SendInstructionTimeoutError:
+                self._master.log_warn('device', self.device_id, 'update cali version error')
+                return False
+            except RuntimeError:
+                self._master.log_warn('device', self.device_id, 'update cali version error')
+                return False
+            else:
+                version = self._master.read_characteristic(self.device_id,CC2650MasterDevice.RETURN_HANDLE)
+
+                if self._check_crc(version):
+                    self._cali_version = struct.unpack('<H', version[2:4])[0]
+                    print('self._cali_version=', self._cali_version)
+                    return True
+                
+        self._master.log_warn('device', self.device_id, 'update cali version error')
+        return False
 
     def update_calibration_info(self, device_type: str):
         """ get device calibration info """
@@ -556,147 +595,36 @@ class CC2650Device(Device):
         # self.ensure_feature_support(DeviceFeature.CALIBRATION)
 
         coeff = []
+             
+        if device_type == 'EISZeroOne':
+            i = 1
+            while i <= 24:
+                for _ in range(5): 
+                    try:
+                        # send
+                        code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, i)
+                        self._master.write_characteristic(self.device_id, CC2650MasterDevice.COMMAND_HANDLE, code)
 
-        if device_type == 'TDC4VAF2':
-            # neulive 1.3, 1.6
-            for i in range(24):
-                # send
-                code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, i)
-                self._master.write_characteristic(self.device_id, CC2650MasterDevice.COMMAND_HANDLE, code)
-
-                # receive
-                data = self._master.read_characteristic(self.device_id, CC2650MasterDevice.RETURN_HANDLE)
-                coeff.append(self._decode_data(DeviceInstruction.CIS_CALI, data))
-
-        elif device_type == 'TDC4VC':
-            i = 0
-            request_times = 0
-            # neulive 2.1 (only support ch1~ch8)
-            # try:
-            #     # send
-            #     code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, 0)
-            #     self._master.write_characteristic(self.device_id, CC2650MasterDevice.COMMAND_HANDLE, code)
-            #     # receive
-            #     data = self._master.read_characteristic(self.device_id, CC2650MasterDevice.RETURN_HANDLE)
-            #
-            #     coeff.append(self._decode_data(DeviceInstruction.CIS_CALI, data))
-            # except SendInstructionTimeoutError:
-            #     self._master.log_warn('device', self.device_id, 'update_calibration_info no response')
-            # except RuntimeError:
-            #     self._master.log_warn('device', self.device_id, 'update_calibration_info no response')
-
-            while i < 4:
-                try:
-                    # print('i', i)
-                    # send
-                    code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, i)
-                    self._master.write_characteristic(self.device_id, CC2650MasterDevice.COMMAND_HANDLE, code)
-
-                    # receive
-                    data = self._master.read_characteristic(self.device_id,
-                                                            CC2650MasterDevice.RETURN_HANDLE)
-
-                    # print('code3', code)
-                    # print('data3', data)
-
-                    coeff.append(self._decode_data(DeviceInstruction.CIS_CALI, data))
-
-                except SendInstructionTimeoutError as e:
-                    print(e)
-                    self._master.log_warn('device', self.device_id, 'update_calibration_info no response', i)
-                    raise BaseException
-                except RuntimeError as e:
-                    print(e)
-                    self._master.log_warn('device', self.device_id, 'update_calibration_info no response - 2', i)
-                    request_times += 1
-                    if request_times > 3:
-                        self._master.reset(self.device_id)
-                        break
-                else:
-                    # print('data success')
-                    if len(data) > 0:
-                        i += 1
+                    except SerialTimeoutException:
+                        self._master.log_warn('device', self.device_id, 'send update_calibration_info instruction fail')
+                        continue
+                    
                     else:
-                        request_times += 1
-                        if request_times > 3:
-                            self._master.reset(self.device_id)
-                            break
+                        try:
+                            # receive
+                            data = self._master.read_characteristic(self.device_id,
+                                                                CC2650MasterDevice.RETURN_HANDLE)
+                        except RecvTimeout:
+                            self._master.log_warn('device', self.device_id, 'update_calibration_info no response')
+
+                        else:
+                            if self._check_crc(data) and data is not None:
+                                coeff.append(self._decode_data(DeviceInstruction.CIS_CALI, data))
+                                i += 1
+                            else:
+                                self._master.log_warn('device', self.device_id, 'update_calibration_info crc wrong')
+                                continue
                             
-        elif device_type == 'NeuliveThreeOne':
-            i = 0
-            request_times = 0
-            while i < 8:
-                try:
-                    # print('i', i)
-                    # send
-                    code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, i)
-                    self._master.write_characteristic(self.device_id, CC2650MasterDevice.COMMAND_HANDLE, code)
-
-                    # receive
-                    data = self._master.read_characteristic(self.device_id,
-                                                            CC2650MasterDevice.RETURN_HANDLE)
-
-                    coeff.append(self._decode_data(DeviceInstruction.CIS_CALI, data))
-
-                except SendInstructionTimeoutError as e:
-                    print(e)
-                    self._master.log_warn('device', self.device_id, 'update_calibration_info no response', i)
-                    raise BaseException
-                except RuntimeError as e:
-                    print(e)
-                    self._master.log_warn('device', self.device_id, 'update_calibration_info no response - 2', i)
-                    request_times += 1
-                    if request_times > 3:
-                        self._master.reset(self.device_id)
-                        break
-                else:
-                    # print('data success')
-                    if len(data) > 0:
-                        i += 1
-                    else:
-                        request_times += 1
-                        if request_times > 3:
-                            self._master.reset(self.device_id)
-                            break
-
-        elif device_type == 'EISZeroOne':
-            i = 0
-            request_times = 0
-            while i < 13:
-                try:
-                    # send
-                    code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, i)
-                    self._master.write_characteristic(self.device_id, CC2650MasterDevice.COMMAND_HANDLE, code)
-
-                    sleep(0.1)
-
-                    # receive
-                    data = self._master.read_characteristic(self.device_id,
-                                                            CC2650MasterDevice.RETURN_HANDLE)
-                    coeff.append(self._decode_data(DeviceInstruction.CIS_CALI, data))
-
-                except SendInstructionTimeoutError as e:
-                    print(e)
-                    self._master.log_warn('device', self.device_id, 'update_calibration_info no response')
-                    raise BaseException
-                except RuntimeError as e:
-                    print(e)
-                    self._master.log_warn('device', self.device_id, 'update_calibration_info no response - 2')
-                    request_times += 1
-                    if request_times > 3:
-                        self._master.reset(self.device_id)
-                        break
-                else:
-                    # print('data success')
-                    if len(data) > 0:
-                        i += 1
-                    else:
-                        request_times += 1
-                        if request_times > 3:
-                            self._master.reset(self.device_id)
-                            break
-
-
         else:
             # default: neulive 2.1
             for i in range(1):
@@ -1950,120 +1878,6 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
         """initialize cc2650 (master)"""
         pass
 
-    def scan_send_ins(self):
-        # send scan command
-        try:
-            print(':: scan_send_ins ::', self.CC2650_COMMAND_LEN, 3, 0, 0)
-            self._cc2650.send(self.CC2650_COMMAND_LEN, 3, 0, 0)
-
-        except SerialTimeoutException as e:
-            raise RecvTimeout('send scan fail') from e
-
-        else:
-            # wait scanning
-            # sleep(2)
-            clean_buf = self._cc2650.receive_timeout("20B", timeout=3)
-            print("clean_buf = ", clean_buf)
-
-    # def cc2650_uart_irq(self):
-    #     uart_irq = self.get_uart_irq_pin()
-    #     uart_irq.output(False)
-    #     sleep(0.001)
-    #     uart_irq.output(True)
-
-    @synchronized
-    def scan_callback(self, callback: Callable[[DeviceResponseInfo], None], timeout=5, all_device=False) -> bool:
-        self._found = found = []
-        self._found_with_id = []
-        hdr_BPHS = [66, 80, 72, 83]
-        scan_response: Union[Optional[tuple], Any] = None
-
-        # build scan instruction
-        scan_ins = bytearray()
-        scan_ins.append(3) #scan instruction
-        scan_ins.append(1) #length
-        scan_ins.append(0xF1)
-
-        # print('send_scan', bytes(scan_ins))
-        self._cc2650.send("bytes", bytes(scan_ins))
-
-        try:    
-            scan_response = self._cc2650.recv_uart(timeout)
-        except RecvTimeout:
-            # self.reset_internal()
-            # self.reset_hardware()
-            # self._interface.flush()
-            return False
-
-        # instruction format:
-        # ins[0]: get_scan_response = 0x04
-        #  ins[1]: number of scanned device=0; a certain device = device_id (could be 1~8)
-        #   ins[2]: addr=MAC=1, localName=2, company_code=3, version_info=4, battery_info=5, all_info=6;
-        #           attr_length=0, e.g. len(addr)=6, len(company_code)=4
-        local_mac = None
-        local_cc = None
-        local_ver = None
-        local_bat = None
-        local_name = None
-
-        local_addr_type = None
-
-        # get device attribute length
-        attr_length = [6, 4, 6, 5, 20]
-        index = 0
-
-        local_mac = get_device_mac_in_address_format(scan_response[index:index + 6])
-        index = index + 6
-        # print("local_mac = ", hex(local_mac[0]), hex(local_mac[1]),
-        #       hex(local_mac[2]), hex(local_mac[3]),
-        #       hex(local_mac[4]), hex(local_mac[5]))
-
-        local_cc = get_device_company_code(scan_response[index:index + 4])
-        index = index + 4
-        # print("local_cc = ", local_cc)
-
-        local_ver = scan_response[index:index + 6]
-        index = index + 6
-        # print("local_ver = ", local_ver)
-
-        local_bat = get_device_battery_info(scan_response[index:index + 5])
-        index = index + 5
-        # print("local_bat = ", local_bat)
-
-        local_name = get_device_name_in_string_format(list(scan_response[index:index + 20]))
-        index = index + 20
-        # print("local_name = ", local_name)
-
-        # addr type is don't care in BMD380
-        print('scan_response:', list(scan_response))
-        local_addr_type = int(scan_response[index:index + 1][0])
-        # local_addr_type = 0xFF
-        index = index + 1
-        # print("local_addr_type = ", local_addr_type)
-
-        response = is_headstage_device_central_version(local_mac,
-                                                       local_addr_type,
-                                                       local_name,
-                                                       local_cc,
-                                                       local_ver,
-                                                       local_bat)
-        if response is not None:
-            self.log_info('found', address_str(response.mac_address), response.serial_number)
-            self._interface.flush_input()               
-
-            # apppend into db
-            devicesList = DeviceAPI.getByMac(address_str(response.mac_address))
-            if devicesList is not None:
-                if len(devicesList) == 0:
-                    DeviceAPI.create(response.device_name, local_ver, address_str(response.mac_address))
-
-            found.append(response)
-            # print('scan_done_found', found)
-            self._found_with_id.append((response, 0 + 1))
-            callback(response)
-
-        return True
-
     def decode_uart_preamble(self, raw_uart: tuple, expect_ret_len: int = 0) -> Optional[list]:
         # print("decode_uart_preamble: raw_uart = ", raw_uart)
         if raw_uart is None:
@@ -2090,34 +1904,154 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
         return self._found
 
     def check_mem_survive(self) -> Optional[CC2650Device]:
-        ack = []
+        chk_mem_response = None
         ins = bytearray()
-        ins.append(10)
-        ins.append(1) #length
+
+        ins.append(0x0A)
+        ins.append(0x01) #length
         ins.append(0xF1)
-        # print('ins', list(ins))
+        self._interface.flush_input()
 
         try:
+            self.log_verbose('[CC2650]', 'check_mem_survive att_write','0x'+str.upper(ins.hex()))
             self._cc2650.send("bytes", bytes(ins))
 
-        except SerialTimeoutException as e:
-            raise RecvTimeout('device CC2650 check_mem_survive timeout') from e
+        except SerialTimeoutException:
+            self.log_verbose('[CC2650]', 'check_mem_survive send fail')
 
         else:
             try:
-                ack = self._cc2650.recv_uart(0.001)
+                chk_mem_response = self._cc2650.recv_uart(0.001)
 
             except RecvTimeout:
-                self.log_info("no memory board")
+                self.log_verbose('[CC2650]', 'check_mem_survive response timeout, no memory board')
 
-            # else:
-            #     print('ack=', ack)
+        if chk_mem_response is None:
+            return False
 
-        if ack == [3]:
+        pack_len = chk_mem_response[0]
+        mem_ack = chk_mem_response[1:pack_len+1]
+
+        if mem_ack == [3]:
+            chk_mem_response_hex = ''.join(format(i, '02X') for i in chk_mem_response)
+            self.log_verbose('[CC2650]', 'check_mem_survive success', '0x'+chk_mem_response_hex)
             return True
 
         return False
 
+    @synchronized
+    def scan_callback(self, callback: Callable[[DeviceResponseInfo], None], timeout=5, all_device=False) -> bool:
+        self._found = found = []
+        self._found_with_id = []
+        scan_response = None
+        ins = bytearray()
+
+        ins.append(0x03)
+        ins.append(0x01) #length
+        ins.append(0xF1)
+        self._interface.flush_input()
+
+        for _ in range(5):
+            try:
+                self.log_verbose('[CC2650]', 'scan_callback att_write','0x'+str.upper(ins.hex()))
+                self._cc2650.send("bytes", bytes(ins))
+
+            except SerialTimeoutException:
+                self.log_verbose('[CC2650]', 'scan_callback send fail, rescan')
+                continue
+
+            else:
+                try:
+                    scan_response = self._cc2650.recv_uart(0.01)
+
+                except RecvTimeout:
+                    self.log_verbose('[CC2650]', 'scan_callback response timeout, no device, rescan')
+                    continue
+
+                else:
+                    if scan_response is None:
+                        self.log_verbose('[CC2650]', 'scan_callback response is None, rescan')
+                        continue
+                    else:
+                        break
+
+        if scan_response is None:
+            self.log_verbose('[CC2650]', 'scan_callback response is None--2')
+            return False
+
+        scan_response_hex = ''.join(format(i, '02X') for i in scan_response)
+        self.log_verbose('[CC2650]', 'scan_callback success', '0x'+scan_response_hex)
+
+        if len(scan_response) <= 2:
+            print('******************************************************************')
+            print('******************************************************************')
+            print('******************************************************************')
+            print('******************************************************************')
+            print('****need to fix, len(scan) <= 2')
+            print()
+            return False
+
+        pack_len = scan_response[0]
+        device_info_pkg = scan_response[1:pack_len+1]
+
+        # instruction format:
+        # ins[0]: get_scan_response = 0x04
+        #  ins[1]: number of scanned device=0; a certain device = device_id (could be 1~8)
+        #   ins[2]: addr=MAC=1, localName=2, company_code=3, version_info=4, battery_info=5, all_info=6;
+        #           attr_length=0, e.g. len(addr)=6, len(company_code)=4
+        local_mac = None
+        local_cc = None
+        local_ver = None
+        local_bat = None
+        local_name = None
+        local_addr_type = None
+
+        # get device attribute length
+        attr_length = [6, 4, 6, 5, 20]
+        index = 0
+
+        local_mac = get_device_mac_in_address_format(device_info_pkg[index:index + 6])
+        index = index + 6
+
+        local_cc = get_device_company_code(device_info_pkg[index:index + 4])
+        index = index + 4
+
+        local_ver = device_info_pkg[index:index + 6]
+        index = index + 6
+
+        local_bat = get_device_battery_info(device_info_pkg[index:index + 5])
+        index = index + 5
+
+        local_name = get_device_name_in_string_format(list(device_info_pkg[index:index + 20]))
+        index = index + 20
+
+        local_addr_type = int(device_info_pkg[index:index + 1][0])
+
+        index = index + 1
+
+        response = is_headstage_device_central_version(local_mac,
+                                                       local_addr_type,
+                                                       local_name,
+                                                       local_cc,
+                                                       local_ver,
+                                                       local_bat)
+        if response is not None:
+            self.log_info('found', address_str(response.mac_address), response.serial_number)
+            self._interface.flush_input()               
+
+            # apppend into db
+            devicesList = DeviceAPI.getByMac(address_str(response.mac_address))
+            if devicesList is not None:
+                if len(devicesList) == 0:
+                    DeviceAPI.create(response.device_name, local_ver, address_str(response.mac_address))
+
+            found.append(response)
+            # print('scan_done_found', found)
+            self._found_with_id.append((response, 0 + 1))
+            callback(response)
+
+        return True
+
     @synchronized
     def connect(self, response: DeviceResponseInfo, direct_connect: bool = False) -> Optional[CC2650Device]:
         if self._handle is not None:
@@ -2127,225 +2061,202 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
         addr_type = response.addr_type
         address_s = cc2650.address_str(address)
 
-        self.log_info(DEVICE_CONNECTING, address_s)
-
-        connect_ins = bytearray()
-        connect_ins.append(5)
-        connect_ins.append(8) #length
-        connect_ins.append(addr_type)
-        connect_ins.append(address[0])
-        connect_ins.append(address[1])
-        connect_ins.append(address[2])
-        connect_ins.append(address[3])
-        connect_ins.append(address[4])
-        connect_ins.append(address[5])
-        connect_ins.append(0xF1)
-
         connected = False
+        connect_response = None
+        ins = bytearray()
 
-        # send connect command
-        if direct_connect is True:
-
-            # send device mac and addrType
-            try:
-                self._cc2650.send("bytes", bytes(connect_ins))
-
-            except SerialTimeoutException as e:
-                raise RecvTimeout('device CC2650 connect fail') from e
-                return None
-
-            # connection establish done?
-            for retry_recv_ack in range(10):
-                try:
-                    con_done = self._cc2650.recv_uart(timeout = 0.5)
-                    # print("con_done = ", con_done)
-
-                except RecvTimeout:
-                    self.log_info("recv connection timeout, retry... ")
-                    continue
-
-                # is the ack valid?
-                if con_done is None:
-                    continue
-
-                elif con_done[0] is 46 and \
-                        con_done[1] is 80 and \
-                        con_done[2] is 48 and \
-                        con_done[3] is 4:
-                    connected = True
-                    break
-        else:
-            for dev in self._found:
-                if dev.mac_address == address:
-
-                    # send device mac and addrType
-                    try:
-                        # print('send_connect',bytes(connect_ins))
-                        self._cc2650.send("bytes", bytes(connect_ins))
-
-                    except SerialTimeoutException as e:
-                        raise RecvTimeout('device CC2650 connect fail') from e
-
-                    else:
-                        sleep(2)
-
-                    # connection establish done?
-                    for retry_recv_ack in range(5):
-                        self._cc2650.send("bytes", bytes((0, 0, 0, 0)))
-
-                        try:
-                            con_done = self._cc2650.recv_uart(timeout = 0.1)
-
-                        except RecvTimeout:
-                            self.log_info("recv connection timeout, retry... ")
-                            continue
-
-                        # is the ack valid?
-                        if con_done is None:
-                            continue
-
-                        elif con_done[0] is 46 and \
-                                con_done[1] is 80 and \
-                                con_done[2] is 48 and \
-                                con_done[3] is 4:
-                            connected = True
-                            # print('con_done=', con_done)
-                            break
-                        else:
-                            continue
-
-        # if select device is invalid or connect failed
+        ins.append(0x05)
+        ins.append(0x08) #length
+        ins.append(addr_type)
+        ins.append(address[0])
+        ins.append(address[1])
+        ins.append(address[2])
+        ins.append(address[3])
+        ins.append(address[4])
+        ins.append(address[5])
+        ins.append(0xF1)
         self._interface.flush_input()
-        if connected is False:
-            if direct_connect is True:
-                self.reset_internal()
-            self.reset_hardware()
-            self._interface.flush()
-            return None
 
-        # CC2650Device(device_id, master, scan_response) is a slave device
-        # device_id is don't care, because it will be overwrite later
-        dont_care = 0
-        self._device = ret = CC2650Device(device_id=dont_care, master=self, response_info=response)
-        self.log_info(DEVICE_CONNECTED, address_s)
-        sleep(0.5)
-        print('ret',ret)
+        for retry in range(5):
+            try:
+                self.log_verbose('[CC2650]', 'connect att_write', '0x'+str.upper(ins.hex()))
+                self._cc2650.send("bytes", bytes(ins))
 
-        return ret
+            except RecvTimeout:
+                self.log_verbose('[CC2650]', 'connect send fail')
+                continue
+
+            else:
+                try:
+                    connect_response = self._cc2650.recv_uart(2)
+                except RecvTimeout:
+                    # self.log_verbose('[CC2650]', 'connect response timeout')
+                    if retry < 5:
+                        self.log_verbose('[CC2650]', 'connect retry')
+                        continue
+                else:
+                    break
+
+        if connect_response is None:
+            self.log_verbose('[CC2650]', 'connect response timeout')
+            return False
+
+        pack_len = connect_response[0]
+        connect_ack = connect_response[1:pack_len+1]
+        if pack_len == 1:
+            if connect_ack[0] == 3:
+                connected = True
+                connect_response_hex = ''.join(format(i, '02X') for i in connect_response)
+                self.log_verbose('[CC2650]', 'connect success', '0x'+connect_response_hex)
+
+        elif pack_len == 4:
+            if connect_ack[0] == 46 and connect_ack[1] == 80 and \
+            connect_ack[2] == 48 and connect_ack[3] == 4:
+                connected = True
+                connect_response_hex = ''.join(format(i, '02X') for i in connect_response)
+                self.log_verbose('[CC2650]', 'connect success', '0x'+connect_response_hex)
+
+        if connected == True:
+            # CC2650Device(device_id, master, scan_response) is a slave device
+            # device_id is don't care, because it will be overwrite later
+            dont_care = 0
+            self._device = ret = CC2650Device(device_id=dont_care, master=self, response_info=response)
+            self.log_verbose('[CC2650]', DEVICE_CONNECTED, address_s)
+            return ret
+
+        connect_response_hex = ''.join(format(i, '02X') for i in connect_response)
+        self.log_verbose('[CC2650]', 'connect fail', '0x'+connect_response_hex)
+        return False
 
     @synchronized
     def disconnect(self, device: int, force=False) -> bool:
-        self.log_info(DEVICE_DISCONNECTING, device)
-
         ins = bytearray()
-        ins.append(8)
-        ins.append(1) #length
+
+        ins.append(0x08)
+        ins.append(0x01) #length
         ins.append(0xF1)
+        self._interface.flush_input()
+
+        for retry in range(5): 
+            try:
+                self.log_verbose('[CC2650]', 'disconnect att_write','0x'+str.upper(ins.hex()))
+                self._cc2650.send("bytes", bytes(ins))
+
+            except SerialTimeoutException:
+                self.log_verbose('[CC2650]', 'disconnect send fail')
+                continue
+            
+            else:
+                self.reset_internal()
+                self.reset_hardware()
+                self.log_verbose('[CC2650]', 'disconnect success')
+                return True
+        #         try:
+        #             disconnect_response = self._cc2650.recv_uart(0.01)
+        #             print(disconnect_response)
+
+        #         except RecvTimeout:
+        #             self.log_verbose('[CC2650]', 'disconnect response timeout')
+        #             if retry < 5:
+        #                 self.log_verbose('[CC2650]', 'connect retry')
+        #                 continue
+        #         else:
+        #             break
+        
+        # if disconnect_response is None:
+        #     return False
+
+        # pack_len = disconnect_response[0]
+        # disconnect_ack = disconnect_response[1:pack_len+1]
+
+        # if disconnect_ack == [3]:
+        #     disconnect_response_hex = ''.join(format(i, '02X') for i in disconnect_response)
+        #     self.log_verbose('[CC2650]', 'disconnect success', '0x'+disconnect_response_hex)
+        #     self.reset_internal()
+        #     self.reset_hardware()
+        #     return True
+
+        self.log_verbose('[CC2650]', 'disconnect fail')
+        return False
+
+    @synchronized
+    def write_characteristic(self, device: int, handle: int, data: bytes) -> bool:
+        write_response = None
+        ins = bytearray()
+
+        ins.append(0x06)
+        if len(data) + 2 > 255:
+            ins.append(255)
+        else:
+            ins.append(len(data)+2) #length = handle + C0C0XXXX(data len) + F1 
+        ins.append(handle)
+        ins.extend(data)
+        ins.append(0xF1)
+        self._interface.flush_input()
 
         try:
-            # print('send_disconnect',bytes(ins))
+            self.log_verbose('[CC2650]', 'write_characteristic', device, str(hex(handle).upper()))
+            self.log_verbose('[CC2650]', 'write_characteristic att_write','0x'+str.upper(ins.hex()))
             self._cc2650.send("bytes", bytes(ins))
-
-        except RecvTimeout:
-            self.log_warn('disconnect time out')
-            return False
-
-        except RuntimeError as e:
-            self.log_warn('suppressed error', str(e))
-            return False
+            
+        except SerialTimeoutException:
+            self.log_verbose('[CC2650]', 'write_characteristic send fail')
 
         else:
-            sleep(0.01)
+            try:
+                write_response = self._cc2650.recv_uart(0.5)
+
+            except RecvTimeout:
+                self.log_verbose('[CC2650]', 'write_characteristic response timeout')
+
+        if write_response is None:
+            self.log_verbose('[CC2650]', 'write_characteristic fail')
+            return False
+                
+        pack_len = write_response[0]
+        write_ack = write_response[1:pack_len+1]
+        
+        if write_ack == [3]:
+            write_response_hex = ''.join(format(i, '02X') for i in write_response)
+            self.log_verbose('[CC2650]', 'write_characteristic success', '0x'+write_response_hex)
             return True
 
-        finally:
-            self.log_info(DEVICE_DISCONNECTED, device)
-
-            # reset single 2650 after disconnected
-            self.reset_internal()
-            self.reset_hardware()
-            self._interface.flush()
+        self.log_verbose('[CC2650]', 'write_characteristic fail')
+        return False
 
     @synchronized
     def read_characteristic(self, device: int, handle: int) -> Optional[bytes]:
-
-        # print("read_characteristic, expect_data_length = ", expect_data_length)
-
-        ret = None
+        read_response = None
         ins = bytearray()
-        ins.append(7)
-        ins.append(2) #length
+
+        ins.append(0x07)
+        ins.append(0x02) #length
         ins.append(handle)
         ins.append(0xF1)
-
-        for _ in range(2):
-            try:
-                # print('send_read',bytes(ins))
-                self._cc2650.send("bytes", bytes(ins))
-            except SerialTimeoutException:
-                raise RecvTimeout('device CC2650 send read_characteristic fail')
-
-            try:
-                ret = self._cc2650.recv_uart(timeout = 2)
-            except Exception as e2:
-                raise RecvTimeout()
-            else:
-                # print("======== read ret = ", ret)
-                self._interface.flush_input()
-
-        # try:
-        #     ret = self._cc2650.recv_uart(timeout = 1)
-        # except Exception as e2:
-        #     raise RecvTimeout()
-        # else:
-        #     # print("read_characteristic ret = ", ret)
-        #     pass
-
-        if ret is None:
-            return None
-
-        return bytes(ret)
-
-    @synchronized
-    def write_characteristic(self, device: int, handle: int, data: bytes):
-
-        # print("device", device)
-        # print("handle", handle)
-        # print("data", data.hex())
-        # self.log_info('reset')
-        self.log_verbose('write_characteristic', device, handle)
-        self.log_verbose('[CC2650]', 'att_write', str.upper(data.hex()))
-        ack = None
-        ret = None
-
-        data_array = bytearray()
-        data_array.append(6)
-        data_array.append(len(data)+2) #length
-        data_array.append(handle)
-        data_array.extend(data)
-        data_array.append(0xF1)
-
+        self._interface.flush_input()
 
         try:
-            self._cc2650.send("bytes", bytes(data_array))
-            # print('send_write',bytes(data_array))
+            self.log_verbose('[CC2650]', 'read_characteristic', device, str(hex(handle).upper()))
+            self.log_verbose('[CC2650]', 'read_characteristic att_write','0x'+str.upper(ins.hex()))
+            self._cc2650.send("bytes", bytes(ins))
 
-        except SerialTimeoutException as e:
-            raise RecvTimeout('device CC2650 send instruction fail') from e
-
-        # read error code
-        try:
-            ret = self._cc2650.recv_uart()
-
-            # print("_______  write ack = ", ret)
-        except Exception as e2:
-            pass
+        except SerialTimeoutException:
+            self.log_verbose('[CC2650]', 'read_characteristic send fail')
 
         else:
-            pass
+            try:
+                read_response = self._cc2650.recv_uart(1)
 
-        self._interface.flush_input()
-        self._interface.flush_output()
+            except RecvTimeout:
+                self.log_verbose('[CC2650]', 'read_characteristic response timeout')
+
+        if read_response is None:
+            return None
+        
+        read_response_hex = ''.join(format(i, '02X') for i in read_response)
+        self.log_verbose('[CC2650]', 'read_characteristic success', '0x'+read_response_hex)
+        
+        return bytes(read_response)
 
     def set_notify(self, device: Union[int, Device], enable: bool):
         if isinstance(device, CompletedDevice):
@@ -2446,7 +2357,6 @@ class CC2650MultiMasterCentralDevice(CC2650MasterDevice, Synchronized):
         self._cc2650_log_level = self.log_level
 
     def read_characteristic(self, device: int, handle: int) -> Optional[bytes]:
-        self.log_verbose('read_characteristic', device, '0x%02X' % handle)
 
         master = self._cc2650[device]
 
@@ -2504,11 +2414,6 @@ class CC2650MultiMasterCentralDevice(CC2650MasterDevice, Synchronized):
 
             self._interface.flush()
             self._selector.select(device_id)
-            # self._mem_selector.select(device_id)
-            # print("multiMaster selector = ", device_id)
-            # print("\n")
-
-            # device._notify_flag = enable
             try:
                 master.write_characteristic(device_id, self.NOTIFY_HANDLE, value)
             except SendInstructionTimeoutError:

python/biopro/device/manager.py

@@ -836,6 +836,12 @@ class DeviceManager(MasterDevice, Synchronized):
         elif func == InternalInstruction.PREDEFINED_IDLE:
             self._idle(device, *para)
 
+        elif func == InternalInstruction.PREDEFINED_COUNTDOWN:
+            self._countdown(device, *para)
+
+        elif func == InternalInstruction.PREDEFINED_TAG:
+            self._tag(device, *para)
+
         elif isinstance(device, DebugDevice):
             if func == InternalInstruction.PREDEFINED_NOTIFY:
                 return True
@@ -858,6 +864,16 @@ class DeviceManager(MasterDevice, Synchronized):
         self._handler.device_internal_command(device.device_id,
                                                 InternalInstruction.PREDEFINED_IDLE,
                                                 None)
+    
+    def _countdown(self, device: Device, expr: AnyStr):
+        self._handler.device_internal_command(device.device_id,
+                                                InternalInstruction.PREDEFINED_COUNTDOWN,
+                                                expr)
+    
+    def _tag(self, device: Device, expr: AnyStr):
+        self._handler.device_internal_command(device.device_id,
+                                                InternalInstruction.PREDEFINED_TAG,
+                                                expr)
 
     def _device_data_format_cali(self, device: Device, expr: str, cali: bytes = None):
         if cali is None:

python/biopro/devlib/device.py

@@ -689,11 +689,13 @@ class DeviceInstruction:
     TYP_IIS = -1
     """internal instruction"""
 
+    TYP_ALL = None
+
     __slots__ = ()
 
     @classmethod
     def valid_ins_type(cls, ins_type: int):
-        if ins_type not in (cls.TYP_RIS, cls.TYP_VIS, cls.TYP_CIS, cls.TYP_IIS):
+        if ins_type not in (cls.TYP_RIS, cls.TYP_VIS, cls.TYP_CIS, cls.TYP_IIS, cls.TYP_ALL):
             raise ValueError('unknown instruction type : ' + str(ins_type))
 
     @classmethod
@@ -704,6 +706,8 @@ class DeviceInstruction:
             return cls.TYP_VIS
         elif ins_type == 'CIS':
             return cls.TYP_CIS
+        elif ins_type == 'ALL':
+            return cls.TYP_ALL
         else:
             raise RuntimeError('unknown instruction type : ' + ins_type)
 
@@ -736,7 +740,7 @@ class DeviceCommonInstruction:
         if instruction == cls.RESET:
             return '_sync(False)', '_notify(False)', 'VIS_RST'
         elif instruction == cls.START:
-            return '_data_format("TDC4VAF2")', '_notify(True)', 'VIS_STI', '_sync(True)'
+            return '_notify(True)', 'VIS_STI', '_sync(True)'
         elif instruction == cls.INTERRUPT:
             return '_notify(False)', 'VIS_INT', '_sync(False)'
         elif instruction == cls.CLOSE:

python/biopro/devlib/domain.py

@@ -120,6 +120,9 @@ class ParameterDomain(JsonSerialize, metaclass=abc.ABCMeta):
         elif json == 'int':
             return ParameterIntDomain
 
+        elif json == 'float':
+            return ParameterFloatDomain
+
         elif json == 'property':
             return ParameterPropertyDomain
 
@@ -291,6 +294,25 @@ class ParameterIntDomainType(ParameterTypeDomain):
 
 ParameterIntDomain = ParameterIntDomainType()
 
+class ParameterFloatDomainType(ParameterTypeDomain):
+    __slots__ = ()
+
+    def init_para(self, initial: Optional[Any] = None) -> float:
+        print('ParameterFloatDomainType')
+        if initial is None:
+            return 0
+        else:
+            return float(initial)
+
+    def valid_para(self, value: int) -> bool:
+        return True
+
+    def __str__(self):
+        return "float"
+
+
+ParameterFloatDomain = ParameterFloatDomainType()
+
 
 class ParameterValueDomain(ParameterDomain, metaclass=abc.ABCMeta):
     """limited/ranged P value domain """
@@ -301,7 +323,7 @@ class ParameterValueDomain(ParameterDomain, metaclass=abc.ABCMeta):
         if initial is None:
             return self.range[0]
         else:
-            initial = int(initial)
+            initial = initial
             f, t = self.range
 
             if f <= initial < t:
@@ -742,6 +764,7 @@ class ParameterListDomain(ParameterCollectionDomain):
         sz = len(target)
         i = oper.index(sz)
         v = oper.value(d)
+        # print('ParameterListDomain', d, sz, i, v, str(d) == 'float', type(d))
 
         if i is None and v is None:
             pass
@@ -780,8 +803,11 @@ class ParameterListDomain(ParameterCollectionDomain):
 
             if isinstance(v, int):
                 v = [v]
-
-            target[i] = v
+            target[len(v):] = []
+            if isinstance(d, ParameterFloatDomainType):
+                target[i] = [float(i) for i in v]
+            else:
+                target[i] = v
 
     def _valid_list_limit(self, target: List[Any], inc: int) -> bool:
         if self._limit is not None:

python/biopro/devlib/expression.py

@@ -880,8 +880,7 @@ class WhenExpression(ComplexExpression[T]):
 
     def value(self, context: Scope) -> Union[str, T]:
         value = super().value(context)
-
-        key = str(value)
+        key = str(int(value))
 
         if key in self._when:
             return self._when[key].value(context.child(VALUE=value))

python/biopro/devlib/generator.py

@@ -1,84 +0,0 @@
-from .library import *
-
-DEVLIB_GENERATOR_NAME = 'GENERATOR'
-
-REC_CHANNEL_COUNT = 16
-
-MODE_LIST = [
-    "zero",
-    "sin",
-    "ramp"
-]
-
-ADC_SAMPLE_RATE_LIST = [
-    100,
-    500,
-    1000,
-    2500,
-    4000,
-    5000
-]
-
-AMP_GAIN_LIST = [
-    0.5,
-    1,
-    10,
-    100,
-    1000
-]
-
-NOISE_LIST = [
-    0,
-    0.1,
-    0.5,
-    1.0
-]
-
-DEVLIB_GENERATOR = DeviceLibrary(DEVLIB_GENERATOR_NAME, DeviceLibraryVersion(0, 6))
-
-DEVLIB_GENERATOR._file = ''
-
-_constant = ConstantScope({
-    'REC_CHANNEL_COUNT':    REC_CHANNEL_COUNT,
-    'ADC_SAMPLE_RATE_LIST': ADC_SAMPLE_RATE_LIST
-})
-
-DEVLIB_GENERATOR._constant = _constant
-
-DEVLIB_GENERATOR._para = ParameterTable({
-    'MODE':        ParameterInfo('MODE',
-                                 ParameterConstantRangeDomain(0, 3),
-                                 initial=1,
-                                 value=ArrayExpression(MODE_LIST),
-                                 description='working mode',
-                                 record_meta=True),
-    'CHANNEL':     ParameterInfo('CHANNEL',
-                                 ParameterSetDomain(ParameterConstantRangeDomain(0, REC_CHANNEL_COUNT)),
-                                 initial=[0],
-                                 description='record channels',
-                                 record_meta=True),
-    'SAMPLE_RATE': ParameterInfo('SAMPLE_RATE',
-                                 ParameterConstantRangeDomain(0, len(ADC_SAMPLE_RATE_LIST)),
-                                 value=Expression.parse('ADC_SAMPLE_RATE_LIST[VALUE]'),
-                                 description='sampling rate',
-                                 alias=['ADC_RATE'],
-                                 record_meta=True),
-    'AMP_GAIN':    ParameterInfo('AMP_GAIN',
-                                 ParameterConstantRangeDomain(0, len(AMP_GAIN_LIST)),
-                                 initial=1,
-                                 value=ArrayExpression(AMP_GAIN_LIST),
-                                 description='amp gain',
-                                 record_meta=True),
-    'NOISE':       ParameterInfo('NOISE',
-                                 ParameterConstantRangeDomain(0, len(NOISE_LIST)),
-                                 description='signal noise factor',
-                                 record_meta=True),
-})
-
-DEVLIB_GENERATOR._inst = InstructionTable({
-    'start': ListInstruction('start', [
-        GuardExpression('len(CHANNEL) > 0', 'no recording channel'),
-        "_data_format('TDC4VAF2')",
-        "_sync(True)"
-    ])
-})

python/biopro/devlib/header.py

@@ -5,6 +5,13 @@ from .device import *
 from .instruction import *
 from .parameter import *
 
+def convert_to_float(lst):
+    # Check if the element is a list (for handling nested lists)
+    if isinstance(lst, list):
+        return [convert_to_float(x) for x in lst]
+    else:
+        # If it's not a list, convert it to float
+        return float(lst)
 
 class MatchRule(JsonSerialize, metaclass=abc.ABCMeta):
     """Device matching rule. Program use this table to find correct library according to the response information from
@@ -444,6 +451,12 @@ class DefaultLibraryLoader:
 
         elif guard is not None:
             guard = ListGuardExpression([GuardExpression.parse(guard)])
+        
+        if "float" in str(domain):
+            initial = convert_to_float(initial)
+
+        # print('!@#$%^&')
+        # print(name, domain, initial, value, value_set)
 
         return ParameterInfo(name, domain,
                              initial=initial,

python/biopro/devlib/instruction.py

@@ -1,4 +1,5 @@
 import re
+import struct
 from random import randint
 from time import sleep
 from typing import Sequence, Tuple
@@ -284,6 +285,8 @@ class InternalInstruction(SingleInstruction):
     PREDEFINED_CDR = '_cdr'
     PREDEFINED_DISABLE_CACHE = '_disable_cache'
     PREDEFINED_IDLE = '_idle'
+    PREDEFINED_COUNTDOWN = '_countdown'
+    PREDEFINED_TAG = '_tag'
 
     PREDEFINED = (
         PREDEFINED_SLEEP,
@@ -296,6 +299,8 @@ class InternalInstruction(SingleInstruction):
         PREDEFINED_CDR,
         PREDEFINED_DISABLE_CACHE,
         PREDEFINED_IDLE,
+        PREDEFINED_COUNTDOWN,
+        PREDEFINED_TAG
     )
 
     __slots__ = ('_expr', '_para')
@@ -375,7 +380,7 @@ class InternalInstruction(SingleInstruction):
 
         parser.parse_instruction(context, data)
 
-
+# tag2
 class ListInstruction(Instruction, ImmutableListNode[Union[Instruction, Expression[str]]]):
     """Instruction group, allow the name of the instruction or a expression it.
     If instruction name is ``None``, ignore it.
@@ -588,7 +593,7 @@ class InstructionContentWidth:
 
         return InstructionContentWidth(z, t, signed_value=s is not None, little_endian=e == '<'), x
 
-
+# The start from the json file parse
 class InstructionContent(JsonSerialize):
     """
     **json format**
@@ -682,7 +687,7 @@ class InstructionContent(JsonSerialize):
 
             return ins_type(width, expr, **ins_argv, comment=comment)
 
-
+# tag1
 class InstructionDataContent(InstructionContent):
     """
     **json format**
@@ -743,6 +748,7 @@ class InstructionDataContent(InstructionContent):
                 return ret[index]
 
     def build_instruction(self, context: Scope, buffer: List[int], shift: int = 0) -> int:
+        # print('build_instruction', context, buffer, shift, self.value(context))
         if self._width.is_array:
             raise NotImplementedError()
             
@@ -750,24 +756,33 @@ class InstructionDataContent(InstructionContent):
             value = 1
         elif self.value(context) == 'false':
             value = 0
+        elif isinstance(self.value(context), list):
+            value = self.value(context)
         else:
-            value = int(self.value(context))
+            value = self.value(context)
+        # print('value', value, type(value))
+        # print('self._width.bytes_unit', self._width.bytes_unit)
+        # print('self._width.size', self._width.size)
 
         if self._width.bytes_unit:
             if self._width.size == 1:
                 buffer.append(value)
 
             else:
-                tmp = []
-                for _ in range(self._width.size):
-                    tmp.append(value & 0xFF)
-                    value >>= 8
-
-                if self._width.little_endian:
-                    buffer.extend(tmp)
-                else:
-                    buffer.extend(tmp[::-1])
+                if isinstance(self.value(context), list):
+                    buffer.extend(value)
+                elif isinstance(value, int):
+                    tmp = []
+                    for _ in range(self._width.size):
+                        tmp.append(value & 0xFF)
+                        value >>= 8
 
+                    if self._width.little_endian:
+                        buffer.extend(tmp)
+                    else:
+                        buffer.extend(tmp[::-1])
+                elif isinstance(value, float):
+                    buffer.extend(struct.pack('>f', value))
             return 8
 
         else:
@@ -794,6 +809,7 @@ class InstructionDataContent(InstructionContent):
                     offset += 1
 
                 else:
+                    buffer.extend([0]*(self._width.size-len(buffer)))
                     for i in range(self._width.size):
                         if self._width.little_endian:
                             value |= (buffer[offset] << (1 * i))
@@ -1111,7 +1127,7 @@ class SendInstruction(SingleInstruction):
         else:
             for scope in self._foreach_parameter.for_scope(context):
                 yield ResolvedSendInstruction(self, self._build_instruction(scope))
-
+    # tag3
     def _build_instruction(self, context: Scope) -> List[int]:
         buffer = []
         shift = 0

python/biopro/devlib/library.py

@@ -359,6 +359,7 @@ class DeviceParameter(JsonSerialize):
 
         # initial parameter table
         for para_info in library.parameter_table.values():
+            # print('DeviceParameter', para_info)
             try:
                 para_value = para_info.init_para()
 
@@ -522,6 +523,7 @@ class DeviceParameter(JsonSerialize):
             raise RuntimeError('not a collection parameter ' + para)
 
         target = self._parameter[para]
+        # print(table, info, domain, target, str(domain) == '[float]', oper)
 
         if isinstance(target, set):
             old = set(target)
@@ -1128,13 +1130,21 @@ class CompletedDevice(Device):
         :param value: new parameter P value
         """
         info = self._library.parameter_table[name]
+        # print('info', info.domain, info.domain == 'float',  info.domain == '[float]')
 
         if isinstance(info.domain, ParameterCollectionDomain):
             self._parameter.oper_parameter(name, value)
+        elif isinstance(info.domain, ParameterFloatDomainType):
+            self._parameter.set_parameter(name, float(value))
         else:
             try:
+                value = value
                 # value int
-                value = int(value)
+                if isinstance(value, str):
+                    if "." in value:
+                        value = float(value)
+                    else:
+                        value = int(value)
             except ValueError as e:
                 # value float
                 self._parameter.set_parameter(name, value)
@@ -1403,20 +1413,6 @@ class DebugDevice(CompletedDevice):
     def read_command_return_data(self) -> Optional[bytes]:
         return None
 
-    def send_command(self, ins_type: int, ins_oper: int, *instruction: int):
-        length = len(instruction)
-        print('instruction send :',
-              '%02X' % ((ins_type & 0xF0) | (self.device_id & 0x0F)),
-              '%02X' % ((ins_oper & 0xF0) | (length & 0x0F)),
-              ' '.join(map(lambda v: '%02X' % v, instruction)))
-
-    def send_instruction(self, ins_type: int, ins_oper: int, *instruction: int):
-        length = len(instruction)
-        print('instruction send :',
-              '%02X' % ((ins_type & 0xF0) | (self.device_id & 0x0F)),
-              '%02X' % ((ins_oper & 0xF0) | (length & 0x0F)),
-              ' '.join(map(lambda v: '%02X' % v, instruction)))
-
     @property
     def battery(self) -> int:
         return 100

python/biopro/devlib/parameter.py

@@ -433,6 +433,7 @@ class ParameterInfo(JsonSerialize):
         return self._on_change
 
     def init_para(self) -> Any:
+        # print('initial', self._name, self._initial)
         """
         :return: initial P value
         :raises value: illegal initial value
@@ -617,6 +618,7 @@ class ParameterInfo(JsonSerialize):
             return []
 
         elif isinstance(self._value, ComplexExpression):
+            print('cast_value_dependency', self._value.dependency)
             return self._value.dependency
 
         else:

python/biopro/generator.py

@@ -26,10 +26,10 @@ cli options
                                   sin                   : sine save (default)
                                   ramp                  : ramp
                                   (Elite, Neulive serial)
-                                      TC4VAF2         Elite_Legacy
-                                      TDC4VAF2        Elite           Neulive
+                                      Elite_Legacy
+                                      Elite           Neulive
                                   (NeuliveSTI serial)
-                                      NeuliveSTI      NeuliveSTI1.0   TDBC4VCTH
+                                      NeuliveSTI      NeuliveSTI1.0
                                   (EliteZM serial)
                                       EliteZM         I4V4Z4T4
                                       (mode :IV, :FG, :CV, :ZT, :VT, :IT)
@@ -317,9 +317,7 @@ class RampGenerator(Generator):
 
 class DeviceGenerator(Generator):
     SUPPORT = {
-        'TC4VAF2':      ('Elite_Legacy', '0.0.0'),
         'Elite_Legacy': ('Elite_Legacy', '0.0.0'),
-        'TDC4VAF2':     ('Elite', '0.1.0'),
         'Elite':        ('Elite', '0.1.0'),
         'Neulive':      ('Neulive', '1.2.0'),
     }
@@ -374,7 +372,6 @@ class NeuliveSTIGenerator(Generator):
     SUPPORT = {
         'NeuliveSTI':    ('NeuliveSTI1.0', '1.0.0'),
         'NeuliveSTI1.0': ('NeuliveSTI1.0', '1.0.0'),
-        'TDBC4VCTH':     ('NeuliveSTI1.0', '1.0.0'),
     }
 
     __slots__ = ('voltage_drop_rate', '_voltage')
@@ -646,10 +643,10 @@ class GeneratorOptions(CliOptions):
         sin                   : sine save (default)
         ramp                  : ramp
         (Elite, Neulive serial)
-            TC4VAF2         Elite_Legacy
-            TDC4VAF2        Elite           Neulive
+            Elite_Legacy
+            Elite           Neulive
         (NeuliveSTI serial)
-            NeuliveSTI      NeuliveSTI1.0   TDBC4VCTH
+            NeuliveSTI      NeuliveSTI1.0
         (EliteZM serial)
             EliteZM         I4V4Z4T4
             (mode :IV, :FG, :CV, :ZT, :VT, :IT)

python/biopro/impl/cc2650/cc2650.py

@@ -3697,7 +3697,6 @@ class CC2650Central(LoggerFlag):
 
     def recv(self, timeout: Optional[float] = None) -> Optional[list]:
         packet = self._recv_byte()
-        # print("packet = ", packet)
 
         if packet is None:
             return None
@@ -3709,6 +3708,8 @@ class CC2650Central(LoggerFlag):
 
     def _recv_byte(self) -> Optional[int]:
         ret = self._recv_bytes(1)
+        # if ret is not None:
+        #     print('packet = {0}'.format(hex(ret[0]).upper()))
         return ret[0] if ret is not None else None
 
     def _recv_bytes(self, size: int = 1) -> Union[None, bytes]:
@@ -3724,27 +3725,28 @@ class CC2650Central(LoggerFlag):
                 return None
 
     def _recv_event(self, timeout: Optional[float] = 1) -> Optional[list]:
-        code = self._recv_byte()
-        # print("code = ", code)
+        packet = self._recv_byte()
 
-        if code is None:
+        if packet is None:
             return None
 
         length = self._recv_byte()
-        # print('code::',code,'length::',length)
-
-        _start = _time()
+        len_b = _struct.pack("B", length)
         data = b''
 
-        while len(data) < length:
-            ret = self._recv_bytes(length - len(data))
-            # print("ret = ", ret)
+        _start = _time()
 
-            if ret is not None:
-                data += ret
+        while len(data) < length:
+            packets = self._recv_bytes(length - len(data))
+            # hex_packets = ''.join(format(i, '02x') for i in packets)
+            # print("packets = ", hex_packets.upper())
+
+            if packets is not None:
+                data += packets
             elif timeout is not None and _time() - _start > timeout:
                 raise RecvTimeout()
 
+        data = len_b + data
         self._interface.flush()
         return list(data)
 
@@ -3760,5 +3762,7 @@ class CC2650Central(LoggerFlag):
                     raise RecvTimeout()
 
             else:
+                uart_data_hex = ''.join(format(i, '02X') for i in uart_data)
+                # print('uart_data: 0x{0}'.format(uart_data_hex.upper()))
                 return uart_data
 

python/biopro/impl/ext_mem.py

@@ -13,7 +13,7 @@ MSM_REG_WRITE = 0x01
 MEM_INS_WRITE = 0x02
 MEM_INS_READ = 0x03
 MEM_REG_READ = 0x05
-DEFAULT_REGISTER_VALUE = 0b0100_0011  # 67
+DEFAULT_REGISTER_VALUE = 0b0100_0001  # 0x41
 MEM_SIZE = 0x1000
 
 _SLEEP_TIME_ = 0.001
@@ -44,7 +44,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         self._spi = HardwareImplSpiInterface(device,
                                              spi_speed=12_000_000)
 
-        self._elite_data_len = 40
+        self._elite_data_len = 120
         self._mem_header_len = 3
         self._mem_tailer_len = 6
         self._single_data_len = self._elite_data_len + self._mem_header_len + self._mem_tailer_len
@@ -201,34 +201,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
 
         return green_data_section
 
-    def _print_ram_all_data(self):
-        addr = 0
-        red_length = int(7000 / 2)
-        tx_temp = [0] * (red_length + 3)
-
-        while True:
-            tx_temp[0] = MEM_INS_READ
-            tx_temp[1] = ((addr >> 8) & 0xFF)
-            tx_temp[2] = (addr & 0xFF)
-
-            ram_data = []
-            ram_data = self._spi.send_byte(tx_temp)
-            ram_data[0:3] = [255, 255, 255]
-            print(list(ram_data), len(ram_data), addr)
-            addr += len(ram_data) - 3
-
-            if (7000 < addr + len(ram_data)):
-                del ram_data
-                break
-        print()
-
-        return
-
     def recv_memory(self, device: int) -> Optional[bytes]:
-        # self.pin_busy.output(False)
-
-        # print('mem_req==ram_sel,[', self._pin_mem_req_value[device], ',', self._pin_ram_sel_value[device], ']')
-
         rx = []
 
         try:
@@ -241,53 +214,11 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             tx_h[1] = 0
             tx_h[2] = 0
 
-
-            # -------------------------------------read one times-------------------------------------------
             data = []
             flag_print = False
 
             data = self._spi.send_byte(tx_h)
-
-            if (data[0] != 255 or data[1] != 255 or data[2] != 255):
-                self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
-                if (self._head_wrong_cnt[device] <= 5): # print 5 times
-                    print('data_first[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
-                    print(list(data))
-
             data[0:3] = [255, 255, 255]
-            # ----------------------------------------------------------------------------------------------
-
-
-            # -------------------------------------read two times-------------------------------------------
-            # data = []
-            # data_first = []
-            # data_second = []
-            # flag_print = False
-
-            # data_first = self._spi.send_byte(tx_h)
-            # data_second = self._spi.send_byte(tx_h)
-
-            # if (data_first[0] != 255 or data_first[1] != 255 or data_first[2] != 255):
-            #     self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
-            #     if (self._head_wrong_cnt[device] < 10):
-            #         print('data_first[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
-            #         print(list(data_first))
-
-            # if (data_second[0] != 255 or data_second[1] != 255 or data_second[2] != 255):
-            #     self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
-            #     if (self._head_wrong_cnt[device] < 10):
-            #         print('data_second[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
-            #         print(list(data_second))
-
-            # if (data_first[3:] == data_second[3:]):
-            #     data = data_first
-            #     data[0:3] = [255, 255, 255]
-
-            # else:
-            #     data_third = self._spi.send_byte(tx_h)
-            #     print("read data_third", data_third)
-            #     data = self.compare_green_data(data_first, data_second, data_third, len(tx_h))
-            # ----------------------------------------------------------------------------------------------
 
             green_data_section = self._compare_green_data_addr_and_flag(data, device)
 
@@ -299,10 +230,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                 if length < 12:
                     print("length < 12")
                     print("green data print:", data, device, datetime.now())
-
-                # if length == 0:
-                #     self._print_ram_all_data()
-
                 return None
 
             if green_data_section[2] != 0xA5 or green_data_section[3] != 0x5A:
@@ -311,9 +238,6 @@ 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)
@@ -321,7 +245,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             if (header != 255):
                 flag_print = True
                 print("green data: header is not 255: ", header)
-                # self._print_ram_all_data()
 
             if (elite_data_len != self._elite_data_len):
                 flag_print = True
@@ -338,28 +261,10 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                 tx_d[0] = MEM_INS_READ
                 tx_d[1] = ((address >> 8) & 0xFF)
                 tx_d[2] = (address & 0xFF)
-            # -------------------------------------read one times-------------------------------------------
                 data = []
                 data = self._spi.send_byte(tx_d)
                 data[0:3] = [255, 255, 255]
-            # ----------------------------------------------------------------------------------------------
 
-            # -------------------------------------read two times-------------------------------------------
-                # data = []
-                # data_first = []
-                # data_second = []
-
-                # data_first = self._spi.send_byte(tx_d)
-                # data_second = self._spi.send_byte(tx_d)
-
-                # if (data_first[3:] == data_second[3:]):
-                #     data = data_first
-                #     data[0:3] = [255, 255, 255]
-                # else:
-                #     data_third = self._spi.send_byte(tx_d)
-                #     print("read red data_third", data_third)
-                #     data = self.compare_red_data(data_first, data_second, data_third, len(tx_d))
-            # ----------------------------------------------------------------------------------------------
                 if length + 3 <= address + len(data):
                     rx.extend(data[3:3 + length - address])
                     del data
@@ -371,27 +276,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                     address += len(data) - 3
                     del data
 
-            # last_index = 0
-            # print("_[Debug] @ spi recv data rx, ram_select:", self._pin_ram_sel_value[device], ",", datetime.now())
-            # for i in range(0, len(rx), self._single_data_len):
-            #     last_index = i
-            #     # print(rx[i:i+self._single_data_len])
-            #     if i == 0:
-            #         print(rx[0:8], 'ram:', rx[47])
-
-            # if last_index != 0:
-            #     print(rx[last_index:last_index+8], 'ram:', rx[last_index+47])
-            # print()
-
-            # /* 
-            #  * red data formate:
-            #  * ramHdr, ramHdr, ramHdr,                                   (3B)
-            #  * 255, #, data_length,                                      (3B)
-            #  * data,                                                     (40B)
-            #  * red_wrong, red_retry_cnt, green_wrong, green_retry_cnt,   (4B)
-            #  * check_num,                                                (1B)
-            #  *                                                                  */
-
             # read again if check num is wrong
             index = 0
             check_number_print = False
@@ -429,10 +313,6 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         except BaseException as e:
             print(e)
 
-        # finally:
-        #     # print("\n")
-        #     self.pin_busy.output(True)
-
         return bytes(rx)
 
     def read_register(self) -> int:
@@ -457,6 +337,16 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
 
         self._spi.send_byte(tx)
 
+    def test_ram(self, channel: int):
+        spi_MOSI = [MEM_INS_WRITE, 0, 0, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
+        self._spi.send_byte(spi_MOSI)
+        print('device:', channel, 'spi_MOSI:',spi_MOSI)
+
+        spi_MISO = [0] * len(spi_MOSI)
+        spi_MISO[0:3] = [MEM_INS_READ, 0, 0]
+        spi_MISO = self._spi.send_byte(spi_MISO)
+        print('device:', channel, 'spi_MISO:', spi_MISO)
+
 class ExtMemManager:
     def __init__(self, ext_mem: MultiExtMemSpiInterface):
         self._ext_mem = ext_mem
@@ -493,28 +383,31 @@ class ExtMemManager:
 
             ret[channel] = tuple(r)
 
+        print('ret=', ret)
         return ret
 
     @staticmethod
-    def is_no_device(result: Tuple[Optional[int], Optional[int]]) -> bool:
+    def is_memory_test_fail(result: Tuple[Optional[int], Optional[int]], channel: int) -> int:
         r1, r2 = result
-        return (r1 is None or r2 is None) and (r1 is None or r1 == 0) and (r2 is None or r2 == 0)
+        r1_check = False
+        r2_check = False
 
-    @staticmethod
-    def is_memory_test_fail(result: Tuple[Optional[int], Optional[int]]) -> int:
-        r1, r2 = result
+        if r1 is not None and r1 != 0:
+            if (r1 & 0b11000001 == DEFAULT_REGISTER_VALUE & 0b11000001):
+                r1_check = True
+                print('device:', channel, 'ram0 ready')
+        
+        if r2 is not None and r2 != 0:
+            if (r2 & 0b11000001 == DEFAULT_REGISTER_VALUE & 0b11000001):
+                r2_check = True
+                print('device:', channel, 'ram1 ready')
+                print('--------------------')
 
-        if r1 is None or r2 is None:
+        if r1_check and r2_check:
+            return 0
+        else:
             return 1
 
-        if r1 is not None and r1 > 0 and r1 != DEFAULT_REGISTER_VALUE:
-            return 2
-
-        if r2 is not None and r2 > 0 and r2 != DEFAULT_REGISTER_VALUE:
-            return 3
-
-        return 0
-
     def get_available_channel(self, result: List[Tuple[Optional[int], Optional[int]]] = None) -> List[int]:
         if result is None:
             result = self.get_ext_mem_register()
@@ -522,12 +415,14 @@ class ExtMemManager:
         ret = []
 
         for channel, result in enumerate(result):
-            if self.is_no_device(result):
-                continue
-
-            if self.is_memory_test_fail(result) != 0:
+            if self.is_memory_test_fail(result, channel) != 0:
                 continue
 
             ret.append(channel)
 
+        # test ram
+        # for channel in self._ext_mem.foreach():
+        #     if channel == 4 or channel == 5:
+        #         self._ext_mem.test_ram(channel)
+
         return ret

python/biopro/impl/interface_uart.py

@@ -53,6 +53,8 @@ class UARTInterface(LowLevelHardwareInterface):
         :param data: raw byte instruction
         :raises SerialTimeoutException:
         """
+        data_hex = ''.join(format(i, '02X') for i in data)
+        # print('send_byte: 0x{0}'.format(data_hex.upper()))
         self._serial.write(data)
 
     def recv_byte(self, size: int) -> Optional[bytes]:

python/biopro/project/project.py

@@ -15,6 +15,9 @@ from .instruction import Instruction
 from biopro.device.manager import DeviceManager
 from biopro.text import *
 
+from biopro.db.base import Session
+from biopro.db.collection import Collection
+
 key_list = {
   'deviceList': 'device',
 }
@@ -60,6 +63,14 @@ class Project(threading.Thread):
     fh = logging.FileHandler(f'/home/pi/logger/project/{self.uuid}.log', mode="w")
     fh.setFormatter(self._formatter)
     self._logger.addHandler(fh)
+
+    default_name = 'admin'
+    default_parent = {"folder": [1]}
+    collection = Collection.find_collection(default_name, default_parent)
+    parent = {"folder": [collection.id]}
+    # create project folder
+    collection = Collection.create_collection(self.name, parent)
+    self.setup_collection(collection)
     
   def setup_project(self, project):
     for (key, value) in project.items():
@@ -79,6 +90,9 @@ class Project(threading.Thread):
       complete_device = self._device_manager.get_device(mac_address)
       complete_device.occupied_by_project = self._uuid
       self._complete_device[device] = complete_device
+    
+  def setup_collection(self, collection):
+    self._task_manager.create_collection(collection)
 
   @property
   def id(self) -> int:

python/biopro/project/task_manager.py

@@ -5,6 +5,7 @@ from xml.dom.expatbuilder import parseString
 import paho.mqtt.client as mqtt
 from biopro.text import *
 from .task import Task
+from biopro.db.collection import Collection
 
 _RUNTIME_COMPILE = False
 
@@ -67,6 +68,13 @@ class TaskManager():
         if cycle['range'][1] == task.uuid:
           return index
 
+    def check_task_in_cycle(self, task_index):
+      for index, cycle in enumerate(self._cycle_list):
+        if self.get_index_by_uuid(cycle['range'][0]) <= task_index:
+          if self.get_index_by_uuid(cycle['range'][1]) >= task_index:
+            return True
+      return False
+
     @property
     def check_list(self):
       return [self._running_task, *self._next_task]
@@ -162,4 +170,12 @@ class TaskManager():
 
     def get_task(self, task_id):
       return self._task_list[task_id]
-  
+  
+    def create_collection(self, parent):
+      for index, task in enumerate(self._task_list):
+        if self.check_task_in_cycle(index) == True:
+          if task.type == '':
+            collection = Collection.create_collection(task.name, {"folder": [parent.id]})
+            task.parent = {"folder": [collection.id]}
+        else:
+          task.parent = {"folder": [parent.id]}

python/biopro/recording/file.py

@@ -1237,7 +1237,10 @@ class RecordingFileWriter:
 
     def get_data_iter(self, d, mqtt_thread):
         # print('****d size', d.data_size)
-        for t, c, v in d.entry_iter():
+        for c in d['channels']:
+            t = d['time']
+            v = d['data'][c]
+
             if c in self._data_db:
                 ### send real-time
                 if len(self._data_rl[c]) > 0 and self._send_data[c]:
@@ -1252,11 +1255,11 @@ class RecordingFileWriter:
                 
                 sample_rate_rl = 1
                 # rec data
-                if c < 256:
-                    sample_rate_rl = int(d.sample_rate / ( 500 * len(self.channel_list) )) #* len(self.channel_list)
-                # others
-                else:
-                    sample_rate_rl = int(d.sample_rate_channel_upper_256 / ( 1000 * len(self.channel_list)))
+                # if c < 256:
+                #     sample_rate_rl = int(d.sample_rate / ( 500 * len(self.channel_list) )) #* len(self.channel_list)
+                # # others
+                # else:
+                #     sample_rate_rl = int(d.sample_rate_channel_upper_256 / ( 1000 * len(self.channel_list)))
                 if self._close is False:
                     self._data_value_ch[c].append(int(v))
                     self._data_value_ch_for_rl[c].append(int(v))
@@ -1415,7 +1418,7 @@ class RecordingFileWriter:
             mini_save = False
             if len(self._recording_file_dict) > 0:
                 for ch in self._data_db.keys():
-                    if self._time_now - self._time[ch] > 5000000:
+                    if self._time_now - self._time[ch] > 5000:
                         if self._recording_file_dict[ch]._status:
                             _data = ' '.join(self._data_db[ch])
                             write_sz = self._recording_file_dict[ch].write(_data, self._channel_list)
@@ -1423,6 +1426,7 @@ class RecordingFileWriter:
                             self._raw_save['id'][ch] = self._recording_file_dict[ch]._id_db
                             self._raw_save['end_time'][ch] = self._time_now
                             self._raw_save['size'][ch] = self._recording_file_dict[ch]._size
+                            self._meta._size += write_sz
                             self._data_db[ch].clear()
                             self._time[ch] = self._time_now
                             self._meta._last_time = self._time_now

python/biopro/server/controller.py

@@ -673,9 +673,7 @@ class ControlServerAPI(ControlAPI,
         return None
 
     def device_update_calibration(self) -> None:
-        device_list = self.device_manager.list_device()
-        for x in device_list:
-            x.update_calibration_info('TDC4VC')
+        return None
 
     def device_update_radio_frequency(self, device: int, radio_frequency:int) -> bool:
         d = self.device_manager.get_device(device)

python/biopro/server/data.py

@@ -362,14 +362,14 @@ class DataServer(SocketServer, DataAPI):
         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]
+        # 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 =  project_info
 
         # while len(self._configurations) <= device_id:
         #     self._configurationsappend(None)
@@ -718,6 +718,10 @@ class DataServer(SocketServer, DataAPI):
     def show_data(self, device):
         self._configurations[device].put_rec_queue('show_data')
 
+    @logging_info
+    def tag(self, device: int, data_points: int):
+        self._configurations[device].put_rec_queue('tag_data')
+
 class DataRuntime(metaclass=abc.ABCMeta):
     __slots__ = ('_server', '_device', '_meta_file', '_data_format',
                  '_sync_started', 'sync_file_request', '_writer')
@@ -864,7 +868,7 @@ class GeneratorDataRuntime(DataRuntime):
     __slots__ = ('_generator', '_library', '_start_time')
 
     def __init__(self, server: DataServer, device: int, meta_file: RecordingMetaFile):
-        super().__init__(server, device, meta_file, NulDataDecoder.NAME)
+        super().__init__(server, device, meta_file, I4V4Z4T4DataDecoder.NAME)
 
         configuration = meta_file.configuration
         self._library = library = configuration.library
@@ -971,38 +975,7 @@ class DeviceDataRuntime(DataRuntime):
     @property
     def data_format(self) -> DataDecodeFormat:
         decoder = super().data_format
-
-        # transmit calibration gain level to decoder
-        if isinstance(decoder, TDC4VAF2DataDecoder):
-            # get amp_gain from meta file
-            decoder.amp_gain = self.meta_file.configuration.amp_gain
-        elif isinstance(decoder, TDC4VCDataDecoder):
-            # get amp_gain from meta file
-            decoder.amp_gain = self.meta_file.configuration.amp_gain
-            decoder._channel = self.meta_file.configuration.channel
-            decoder._adc_clock = self.meta_file.configuration.get_parameter('ADC_CLOCK')
-            # decoder._time_stamp_list = self._time_stamp_list
-            decoder._axis_ch = self.meta_file.configuration.get_parameter('AXIS_CH')
-            
-            decoder._prev_data = self._prev_data
-            decoder._prev_delta_time = self._prev_delta_time
-            decoder._prev_time_stamp = self._prev_time_stamp
-        # elif isinstance(decoder, I4V4Z4T4DataDecoder):
-            # get cycle_time from meta file
-            # decoder._mode = self.meta_file.configuration.MODE
-            # decoder._cycle_start_time = self._cycle_start_time
-        elif isinstance(decoder, NeuliveThreeOneDataDecoder):
-            # get amp_gain from meta file
-            decoder.amp_gain = self.meta_file.configuration.amp_gain
-            decoder._channel = self.meta_file.configuration.channel
-            decoder._adc_clock = self.meta_file.configuration.get_parameter('ADC_CLOCK')
-            # decoder._time_stamp_list = self._time_stamp_list
-            decoder._axis_ch = self.meta_file.configuration.get_parameter('AXIS_CH')
-            
-            decoder._prev_data = self._prev_data
-            decoder._prev_delta_time = self._prev_delta_time
-            decoder._prev_time_stamp = self._prev_time_stamp
-        return decoder
+        return None
 
     def sync_data(self, data = None) -> Optional[List[bytes]]:
         if self._timer_of_not_send is None:

python/biopro/server/database.py

@@ -222,7 +222,8 @@ class DataBaseProcess(Process):
 
                 try:
                     sql_cursor.execute(sql_str, sql_set)
-                except:
+                except BaseException as e:
+                    print('meta create error', e)
                     self._psql_conn.commit()
                     sql_cursor.close()
                     self._queue_error.put(device_id)
@@ -249,7 +250,8 @@ class DataBaseProcess(Process):
 
                 try:
                     sql_cursor.execute(sql_str, sql_set)
-                except:
+                except BaseException as e:
+                    print('meta update error', e)
                     self._psql_conn.commit()
                     sql_cursor.close()
                     self._queue_error.put(device_id)

python/biopro/server/main.py

@@ -2,6 +2,8 @@ from time import sleep
 from typing import Iterable
 from datetime import datetime
 import json
+import threading
+from time import time
 
 import biopro.impl.vcgencmd as vcg
 from biopro.data import DataServerOptions, DataAPI
@@ -35,6 +37,7 @@ from biopro.project.project_manager import ProjectManager
 from biopro.db.base import Base, Session, engine
 from biopro.db.project_report import ProjectReport
 from biopro.db.project_meta import MetaProjectInfo
+from biopro.db.device import Device
 
 
 _RUNTIME_COMPILE = False
@@ -861,41 +864,7 @@ class ControlServer(SocketServer, ControlServerAPI):
 
     @logging_info
     def device_update_calibration(self, device: int) -> Union[bool, str]:
-        connect_device = self.device_manager.get_device(device)
-        mac_address = connect_device.mac_address
-
-        try:
-            if connect_device.library.name.startswith('Neulive3.'):
-                connect_device.calibration_info('NeuliveThreeOne')
-            elif connect_device.library.name.startswith('Neulive'):
-                connect_device.calibration_info('TDC4VC')
-            elif connect_device.library.name.startswith('EliteEIS'):
-                connect_device.calibration_info('EISZeroOne')           
-
-        except BaseException as e:
-            # reset device info in db
-            DeviceAPI.updateByMac(
-                address_str(mac_address),
-                {   
-                    'connect_id': -1,
-                    'connect_status': 'idle',
-                    'auto_connect': False,
-                }
-            )
-            # disconnect device
-            self.hardware_device_disconnect(device, True)
-            print(e)
-            return False
-        else:
-            # update_calibration_info
-            DeviceAPI.updateByMac(
-                address_str(mac_address),
-                {   
-                    'calibration': str(connect_device.calibration)
-                }
-            )
-            # DeviceAPI.updateByAttrs('connect_status', 'update', {"connect_status": 'connect'})
-            return True
+        return None
 
     @logging_info
     def device_update_radio_frequency(self, device: int, content:int) -> bool:
@@ -1088,6 +1057,36 @@ class ControlServer(SocketServer, ControlServerAPI):
             device.status = 1
             return True
 
+        elif oper == InternalInstruction.PREDEFINED_COUNTDOWN:
+            if value == 'PULSE_OUTPUT':
+                continue_mode = device.get_parameter('CONTINUE_MODE')
+                if continue_mode == 0:
+                    stop_time = device.get_parameter('STOP_TIME')
+                    # Function to send the instruction
+                    def send_instruction():
+                        device.call_instruction('deactive_electrode')
+
+                    # Function to wait for 30 seconds and then execute the instruction
+                    def delayed_execution(stop_time):
+                        sleep(stop_time)
+                        send_instruction()
+                        device.set_parameter('ACTIVATE_ELECTRODE', 0)
+                        self.mqtt_thread.broadcast_command('device_refresh')
+
+                    # Create a thread for the delayed execution
+                    thread = threading.Thread(target=delayed_execution, args=(stop_time,))
+
+                    # Start the thread
+                    thread.start()
+
+                    # Main program continues without waiting for the thread
+                    # print("Main program continues...")
+                    # print('COUNTDOWN!!!', device, oper, value)
+                    # print(device.get_parameter(value), device.get_parameter_value(value))
+            return True
+        elif oper == InternalInstruction.PREDEFINED_TAG:
+            self._device_set_tag(device, bool(value), 5)
+
         else:
             return False
 
@@ -1102,6 +1101,7 @@ class ControlServer(SocketServer, ControlServerAPI):
 
         client = self.data_server.client()
         project = None
+        project_meta_id = None
         if client is not None:
             info = self.file_manager.use(device)
 
@@ -1114,10 +1114,11 @@ class ControlServer(SocketServer, ControlServerAPI):
                 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())
-
+                project = self.project_manager.get(device.occupied_by_project).info_pass_data_server()
+                project_meta_id = MetaProjectInfo.create_project_meta(project)      
+                
             with client:
-                client.update_device_configuration(device, info.meta_file, value, project)
+                client.update_device_configuration(device, info.meta_file, value, project_meta_id)
 
     def _device_set_disable_cache(self, device: CompletedDevice, disable):
         if disable:
@@ -1171,6 +1172,12 @@ class ControlServer(SocketServer, ControlServerAPI):
                     # unset file info, but keep file path cache
                     self.file_manager.unset(device.device_id)
                     device.status = 0
+        
+    def _device_set_tag(self, device: CompletedDevice, sync: bool, n: int):
+        client = self.data_server.client()
+        if client is not None:
+            with client:
+                client.tag(device, n)
 
 
     # server provide method implement : websocket broadcast functions

python/biopro/server/recording.py

@@ -95,7 +95,6 @@ class RecordingProcess(Process):
         self._prev_time_stamp = []
 
         self._isTimeOut = False
-
         # section use
         self._skip_ram_cnt = 0
         self._get_first_last_cnt = [True, True, True, True, True, True, True, True]
@@ -103,7 +102,7 @@ class RecordingProcess(Process):
         self._wrong_cnt = 0
 
         # elite data length
-        self._elite_data_len = 40
+        self._elite_data_len = 120
         self._mem_header_len = 3
         self._mem_tailer_len = 6
         self._single_data_len = self._elite_data_len + self._mem_header_len + self._mem_tailer_len
@@ -125,40 +124,14 @@ class RecordingProcess(Process):
         decoder = self.ensure_data_format()
 
         # transmit calibration gain level to decoder
-        if isinstance(decoder, TDC4VAF2DataDecoder):
-            # get amp_gain from meta file
-            decoder.amp_gain = self._meta_file.configuration.amp_gain
-        elif isinstance(decoder, TDC4VCDataDecoder):
-            # get amp_gain from meta file
-            decoder.amp_gain = self._meta_file.configuration.amp_gain
-            decoder._channel = self._meta_file.configuration.channel
-            decoder._adc_clock = self._meta_file.configuration.get_parameter('ADC_CLOCK')
-            # decoder._time_stamp_list = self._time_stamp_list
-            decoder._axis_ch = self._meta_file.configuration.get_parameter('AXIS_CH')
-            
-            decoder._prev_data = self._prev_data
-            decoder._prev_delta_time = self._prev_delta_time
-            decoder._prev_time_stamp = self._prev_time_stamp
-        elif isinstance(decoder, I4V4Z4T4DataDecoder):
-            # get cycle_time from meta file
+        if isinstance(decoder, I4V4Z4T4DataDecoder):
+            decoder._mode = self._meta_file.configuration.get_parameter('MODE')
+        elif isinstance(decoder, PEL_FMT1_DataDecoder):
+            decoder._mode = self._meta_file.configuration.get_parameter('MODE')
+        elif isinstance(decoder, PEL_FMT2_DataDecoder):
             decoder._mode = self._meta_file.configuration.get_parameter('MODE')
-            # decoder._cycle_start_time = self._cycle_start_time
-        elif isinstance(decoder, NeuliveThreeOneDataDecoder):
-            # get amp_gain from meta file
-            decoder.amp_gain = self._meta_file.configuration.amp_gain
-            decoder._channel = self._meta_file.configuration.channel
-            decoder._adc_clock = self._meta_file.configuration.get_parameter('ADC_CLOCK')
-            # decoder._time_stamp_list = self._time_stamp_list
-            decoder._axis_ch = self._meta_file.configuration.get_parameter('AXIS_CH')
-            decoder._accelerator_sensitivity = self._meta_file.configuration.get_parameter('ACCELERATOR_S')
-            
-            decoder._prev_data = self._prev_data
-            decoder._prev_delta_time = self._prev_delta_time
-            decoder._prev_time_stamp = self._prev_time_stamp
         elif isinstance(decoder, EISZeroOneDataDecoder):
-            # get amp_gain from meta file
             decoder._mode = self._meta_file.configuration.get_parameter('MODE')
-
         return decoder
 
     def recv_data_foreach_runtime(self) -> bool:
@@ -187,6 +160,13 @@ class RecordingProcess(Process):
                 return False
             elif q == 'show_data':
                 self._decoder._show_data = not self._decoder._show_data
+            elif q == 'tag_data':
+                sleep(0.3)
+                self._decoder._tag_data = True
+                self._decoder._count = 0
+                # print('q_size', self._queue_rec.qsize())
+                while self._queue_rec.empty() != True:
+                    self._queue_rec.get()
             else:
                 self.rec_update()
                 self.sync_data(q)
@@ -207,36 +187,32 @@ class RecordingProcess(Process):
         # print('sync_data')
         # print('data',data)
 
-        # print('server/data', self._prev_delta_time,self._prev_time_stamp, self._prev_data)
-
         if data is None or len(data) == 0:
             result = self._decoder.decode(b'')
             if result is not None:
                 ret = result
-
             else:
                 return None
 
         else:
             ret = []
-            # print('decoder data')
 
             for offset, section in self._foreach_data_section(data):
             # for section in self._neu_foreach_data_section(data):
+                d = self._decoder.decode(section)
 
-                result = self._decoder.decode(section)
                 # if self._isTimeOut:
                 #     try:
                 #         print('result: ', result.data_size)
                 #     except:
                 #         pass
 
-                if result is not None:
+                if d is not None:
                     ##
                     if len(self._mqtt_send_data_ch_level) == 0:
-                        for ch in result.channels():
-                            self._mqtt_send_data_ch_level[ch] = MqttDataMessageHandler(self._mqtt_thread, 'data_server/device_data_stream/' + str(result.device) + '/' + str(ch) ) 
-                    ret.append(result)
+                        for ch in d["channels"]:
+                            self._mqtt_send_data_ch_level[ch] = MqttDataMessageHandler(self._mqtt_thread, 'data_server/device_data_stream/' + str(d["device"]) + '/' + str(ch) ) 
+                    ret.append(d)
                 else:
                     continue
 
@@ -244,7 +220,7 @@ class RecordingProcess(Process):
         # ctime1 = time()
         if self._writer is not None and len(ret) > 0:
             if len(self._writer.channel_list) == 0:
-                self._writer.channels_update(ret[0].channels())
+                self._writer.channels_update(ret[0]['channels'])
             self._writer.write(ret, self._mqtt_send_data_ch_level)
         # print('write time: ', time() - ctime1)
         # print(ret)
@@ -254,8 +230,15 @@ class RecordingProcess(Process):
             if time_duration and time_duration is not 0 and time() - self._start_time >= time_duration:
                 self._queue_msg.put(['ds', self._device, 'interrupt'])
                 return None
+        except KeyError as e:
+            print('time duration keyerror')
+            pass
 
-            if isinstance(self._decoder, I4V4Z4T4DataDecoder) or isinstance(self._decoder, EISZeroOneDataDecoder):
+        try:
+            if isinstance(self._decoder, I4V4Z4T4DataDecoder) or \
+                isinstance(self._decoder, EISZeroOneDataDecoder) or \
+                isinstance(self._decoder, PEL_FMT1_DataDecoder) or \
+                isinstance(self._decoder, PEL_FMT2_DataDecoder):
                 if self._decoder.isFinishMode is not None and self._decoder.isFinishMode() == 1:
                     self._queue_msg.put(['ds', self._device, 'interrupt'])
                     return None
@@ -265,8 +248,9 @@ class RecordingProcess(Process):
                     # content['instruction'] = 'interrupt'
                     # self._mqtt_thread.publish('device_instruction',json_stringify(content), True)
                     # self.server.stop_sync(self.device)
-        except RuntimeError as e:
-            print(e)
+        except KeyError as e:
+            print('isFinishMode error')
+            pass
 
         del ret
         del data
@@ -277,7 +261,6 @@ class RecordingProcess(Process):
         save = True
         head = raw_data[0]
         head_counter = raw_data[1]
-        device_id = raw_data[3]
 
         try:
             # assign last_data_cnt value and handle first last_data_cnt
@@ -305,11 +288,10 @@ class RecordingProcess(Process):
                     self._last_cnt[7] = head_counter - 1
                 last_data_cnt = self._last_cnt[7]
 
-           # dont save to section when head or id is wrong
-            if (head != 255 or device_id != device or head_counter > 255 or head_counter < 0):
+           # dont save to section when head is wrong
+            if (head != 255):
                 save = False
                 last_data_cnt = last_data_cnt + 1
-
                 return save
 
             if (last_data_cnt == 255):
@@ -542,31 +524,31 @@ class RecordingProcess(Process):
             if (save == True):
                 section = raw_data[i]
 
-                check_sum = sum(section[0 : single_data_len - 1]) & 0b11111111
+                # check_sum = sum(section[0 : single_data_len - 1]) & 0b11111111
 
-                if (check_sum != section[single_data_len - 1]):
-                    print('check number not match,',
-                        list(section[0 : mem_header_len]), section[-1], '!=', check_sum, 'device:', device, ',', datetime.now())
-                    if (i-1 >= 0):
-                        print('check number not match', list(raw_data[i-1]), 'raw:', i-1)
+                # if (check_sum != section[single_data_len - 1]):
+                #     print('check number not match,',
+                #         list(section[0 : mem_header_len]), section[-1], '!=', check_sum, 'device:', device, ',', datetime.now())
+                #     if (i-1 >= 0):
+                #         print('check number not match', list(raw_data[i-1]), 'raw:', i-1)
 
-                    print('check number not match', list(raw_data[i]), 'raw:', i)
+                #     print('check number not match', list(raw_data[i]), 'raw:', i)
                     
-                    if (i+1 <= records):
-                        print('check number not match', list(raw_data[i+1]), 'raw:', i+1, '\n')
-                    section = section + b'\x01'
+                #     if (i+1 <= records):
+                #         print('check number not match', list(raw_data[i+1]), 'raw:', i+1, '\n')
+                #     section = section + b'\x01'
 
-                    print('delete data:', list(raw_data[i][0:3]), 'raw:', i, '\n')
-                    continue
-                else:
-                    section = section + b'\x00'
+                #     print('delete data:', list(raw_data[i][0:3]), 'raw:', i, '\n')
+                #     continue
+                # else:
+                #     section = section + b'\x00'
 
                 # section = section[3:]
                 yield None, section
 
             else:
                 print_flag = True
-                print('delete data:', list(raw_data[i][0:3]), 'raw:', i, '\n')
+                print('delete data:', list(raw_data[i][0:20]), 'raw:', i, '\n')
 
         # if print_flag:
         #     print('delete data context:')

python/res/devlib/json/CPG_1.1.devlib.json

@@ -0,0 +1,343 @@
+{
+  "name": "CPG",
+  "version": "1.2.30",
+  "match_rule": {
+    "local_name_pattern": "Elite-CPG.*",
+    "major_product_number": 0,
+    "minor_product_number": 8,
+    "major_version_number": 0,
+    "minor_version_number": 1
+  },
+  "constant": {
+    "TIME_MAX": 100000,
+    "VOLT_MAX": 65536,
+    "Const_Current_Range": 1500001,
+    "BLE_WRITE_MAX": 255
+  },
+  "parameters": {
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
+    "FREQUENCY": {
+      "description": "FREQUENCY",
+      "record_meta": true,
+      "initial": [80, 0],
+      "domain": {
+        "list": [1000000]
+      }
+    },
+    "AMPLITUDE": {
+      "description": "AMPLITUDE",
+      "record_meta": true,
+      "initial": [1, 1],
+      "domain": {
+        "list": "float"
+      }
+    },
+    "PULSE_WIDTH": {
+      "description": "PULSE_WIDTH",
+      "record_meta": true,
+     "initial": [250, 250],
+      "domain": {
+        "list": [1000000]
+      }
+    },
+    "PATTERN_MODE": {
+      "description": "SELECT_ELECTRODE",
+      "record_meta": true,
+     "initial": [1, 0],
+      "domain": {
+        "list": "float"
+      }
+    },
+    "CONTINUE_MODE": {
+      "description": "CONTINUE_MODE",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [2],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "STOP_TIME": {
+      "description": "STOP_TIME",
+      "record_meta": true,
+      "initial": 30,
+      "domain": [1000000],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "ELECTRODE_SELECTOR": {
+      "description": "ELECTRODE_SELECTOR",
+      "record_meta": true,
+      "initial": [true,false,true,false],
+      "domain": {
+        "list": [2]
+      }
+    },
+    "WORKING_ELECTRODE": {
+      "description": "WORKING_ELECTRODE",
+      "record_meta": true,
+      "initial": [0, 0, 0, 0],
+      "domain": {
+        "list": "float"
+      }
+    },
+    "PATTERN_SELECTOR": {
+      "description": "PATTERN_SELECTOR",
+      "record_meta": true,
+      "initial": [0, 0, 1, 1],
+      "domain": {
+        "list": "float"
+      }
+    },
+    "ACTIVATE_ELECTRODE": {
+      "description": "PATTERN_SELECTOR",
+      "record_meta": true,
+      "initial": 0,
+      "domain": "float"
+    },
+
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
+    "CHANNEL_LABEL": {
+      "description": "channel label",
+      "record_meta": true,
+      "domain": "property",
+      "value": "['current', 'voltage', 'impedance']"
+    },
+    "SAMPLE_RATE": {
+      "description": "data sampling rate",
+      "record_meta": true,
+      "initial": 1000,
+      "domain": [
+        1001
+      ],
+      "value": {
+        "expression": "VALUE"
+      },
+      "on_change": "set_sample_rate"
+    },
+    "AMP_GAIN": {
+      "description": "amp gain",
+      "record_meta": true,
+      "domain": "constant",
+      "value": 1
+    },
+    "MODE": {
+      "description": "working mode",
+      "record_meta": true,
+      "initial": 0,
+      "value": [
+        "Electrical stimulation",
+        "Dev Mode"
+      ]
+    },
+    "BLE_WRITE": {
+      "description": "send msg to elite",
+      "domain": {
+        "list": [
+          "BLE_WRITE_MAX"
+        ]
+      },
+      "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]",
+      "value": "VALUE"
+    },
+    "BLE_READ": {
+      "description": "receive msg from elite",
+      "domain": "int"
+    },
+    "TIME_UNIT": {
+      "description": "Duration unit",
+      "initial": 2,
+      "value": [
+        "h",
+        "m",
+        "s",
+        "ms"
+      ]
+    },
+    "TIME_DURATION": {
+      "description": "Run duration",
+      "record_meta": true,
+      "initial": 0,
+      "domain": [
+        "TIME_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    }
+  },
+  "instruction": {
+    "output": [
+      "active_electrode",
+      "_countdown('PULSE_OUTPUT')"
+    ],
+    "active_electrode": {
+      "type": "RIS",
+      "parameter": {
+        "ch0": "ELECTRODE_SELECTOR[0]",
+        "ch1": "ELECTRODE_SELECTOR[1]",
+        "ch2": "ELECTRODE_SELECTOR[2]",
+        "ch3": "ELECTRODE_SELECTOR[3]",
+        "Amp1": {
+          "expression": "PATTERN_SELECTOR[0]",
+          "when": {
+            "0": "AMPLITUDE[0]",
+            "1": "AMPLITUDE[1]"
+          }
+        },
+        "Freq1": {
+          "expression": "PATTERN_SELECTOR[0]",
+          "when": {
+            "0": "FREQUENCY[0]",
+            "1": "FREQUENCY[1]"
+          }
+        },
+        "Pulse1": {
+          "expression": "PATTERN_SELECTOR[0]",
+          "when": {
+            "0": "PULSE_WIDTH[0]",
+            "1": "PULSE_WIDTH[1]"
+          }
+        },
+        "Amp2": {
+          "expression": "PATTERN_SELECTOR[2]",
+          "when": {
+            "0": "AMPLITUDE[0]",
+            "1": "AMPLITUDE[1]"
+          }
+        },
+        "Freq2": {
+          "expression": "PATTERN_SELECTOR[2]",
+          "when": {
+            "0": "FREQUENCY[0]",
+            "1": "FREQUENCY[1]"
+          }
+        },
+        "Pulse2": {
+          "expression": "PATTERN_SELECTOR[2]",
+          "when": {
+            "0": "PULSE_WIDTH[0]",
+            "1": "PULSE_WIDTH[1]"
+          }
+        }
+      },
+      "data": [
+        "1XFF;1X02;1XA0;",
+        "1bch0;1bch1;6b000000;",
+        "4BAmp1;4BPulse1;4BFreq1;",
+        "2b00;1bch2;1bch3;4b0000;",
+        "4BAmp2;4BPulse2;4BFreq2;",
+        "4BSTOP_TIME;",
+        "1bch0;1bch1;1bch2;1bch3;4b0000;"
+      ]
+    },
+    "deactive_electrode": {
+      "type": "RIS",
+      "parameter": {
+        "ch0": "ELECTRODE_SELECTOR[0]",
+        "ch1": "ELECTRODE_SELECTOR[1]",
+        "ch2": "ELECTRODE_SELECTOR[2]",
+        "ch3": "ELECTRODE_SELECTOR[3]"
+      },
+      "data": [
+        "1XFF;1X02;1XA1;",
+        "1bch0;1bch1;1bch2;1bch3;4b0000;"
+      ]
+    },
+    "resume_electrode_0": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X02;1X06;4b1000;4b0000;"
+      ]
+    },
+    "resume_electrode_1": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X02;1X06;4b0100;4b0000;"
+      ]
+    },
+    "resume_electrode_2": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X02;1X06;4b0010;4b0000;"
+      ]
+    },
+    "resume_electrode_3": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X02;1X06;4b0001;4b0000;"
+      ]
+    },
+    "suspend_electrode_0": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X02;1X05;4b1000;4b0000;"
+      ]
+    },
+    "suspend_electrode_1": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X02;1X05;4b0100;4b0000;"
+      ]
+    },
+    "suspend_electrode_2": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X02;1X05;4b0010;4b0000;"
+      ]
+    },
+    "suspend_electrode_3": {
+      "type": "RIS",
+      "data": [
+        "1XFF;1X02;1X05;4b0001;4b0000;"
+      ]
+    },
+    "idle": [
+      "_idle()"
+    ],
+    "data_format": [
+      "_data_format('I4V4Z4T4')",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "_disable_cache(True)",
+          "1": "_disable_cache(True)",
+          "*": "_disable_cache(False)"
+        }
+      }
+    ],
+    "ble_instru_send": [
+      "ble_write",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "ble_write": {
+      "type": "ALL",
+      "data": [
+        "255X>BLE_WRITE;"
+      ]
+    },
+    "dev_version": [
+      "CIS_VERSION",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "dev_battery": [
+      "CIS_VOLT",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "set_para_DAC_VOLT": {
+      "type": "RIS",
+      "data": [
+        "XE2;X01;2B>DAC_VOLT"
+      ]
+    }
+  }
+}

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

@@ -6,7 +6,7 @@
     "major_product_number": 0,
     "minor_product_number": 3,
     "major_version_number": 1,
-    "minor_version_number": 0
+    "minor_version_number": 1
   },
   "constant": {
     "TIME_MAX": 100000,
@@ -780,7 +780,7 @@
         "expression": "VALUE"
       }
     },
-    "VOLT_VSCAN": {
+    "CA_VOLT": {
       "description": "Voltage of VScan",
       "record_meta": true,
       "initial": 25000,
@@ -1301,7 +1301,7 @@
     "curve_const_vscan": {
       "type": "RIS",
       "parameter": {
-        "va": "VOLT_VSCAN",
+        "va": "CA_VOLT",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1638,14 +1638,9 @@
       "_cdr('20X>ADC_VALUE_I')"
     ],
     "ble_write": {
-      "type": "RIS",
+      "type": "ALL",
       "data": [
-        "XFF;",
-        "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];",
-        "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];",
-        "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];",
-        "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];",
-        "1B>BLE_WRITE[16];"
+        "255X>BLE_WRITE;"
       ]
     },
     "dev_version": [

python/res/devlib/json/Elite_EDC_1.5.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": {
@@ -818,7 +820,7 @@
         "expression": "VALUE"
       }
     },
-    "VOLT_VSCAN": {
+    "CA_VOLT": {
       "description": "Voltage of VScan",
       "record_meta": true,
       "initial": 25000,
@@ -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)",
@@ -1023,7 +1029,7 @@
           "6": "const_current",
           "7": "curve_cv3",
           "8": "curve_lsv",
-          "9": "curve_const_vscan",
+          "9": "curve_ca",
           "13": "curve_ocp",
           "14": "curve_pulse_sensing",
           "15": "curve_dpv",
@@ -1360,10 +1366,10 @@
         "2B>pe"
       ]
     },
-    "curve_const_vscan": {
+    "curve_ca": {
       "type": "RIS",
       "parameter": {
-        "va": "VOLT_VSCAN",
+        "va": "CA_VOLT",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1700,14 +1706,9 @@
       "_cdr('20X>ADC_VALUE_I')"
     ],
     "ble_write": {
-      "type": "RIS",
+      "type": "ALL",
       "data": [
-        "XFF;",
-        "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];",
-        "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];",
-        "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];",
-        "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];",
-        "1B>BLE_WRITE[16];"
+        "255X>BLE_WRITE;"
       ]
     },
     "dev_version": [

python/res/devlib/json/Elite_EDC_1.5r2.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": {
@@ -818,7 +820,7 @@
         "expression": "VALUE"
       }
     },
-    "VOLT_VSCAN": {
+    "CA_VOLT": {
       "description": "Voltage of VScan",
       "record_meta": true,
       "initial": 25000,
@@ -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)",
@@ -1023,7 +1029,7 @@
           "6": "const_current",
           "7": "curve_cv3",
           "8": "curve_lsv",
-          "9": "curve_const_vscan",
+          "9": "curve_ca",
           "13": "curve_ocp",
           "14": "curve_pulse_sensing",
           "15": "curve_dpv",
@@ -1360,10 +1366,10 @@
         "2B>pe"
       ]
     },
-    "curve_const_vscan": {
+    "curve_ca": {
       "type": "RIS",
       "parameter": {
-        "va": "VOLT_VSCAN",
+        "va": "CA_VOLT",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1700,14 +1706,9 @@
       "_cdr('20X>ADC_VALUE_I')"
     ],
     "ble_write": {
-      "type": "RIS",
+      "type": "ALL",
       "data": [
-        "XFF;",
-        "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];",
-        "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];",
-        "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];",
-        "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];",
-        "1B>BLE_WRITE[16];"
+        "255X>BLE_WRITE;"
       ]
     },
     "dev_version": [

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

@@ -820,7 +820,7 @@
         "expression": "VALUE"
       }
     },
-    "VOLT_VSCAN": {
+    "CA_VOLT": {
       "description": "Voltage of VScan",
       "record_meta": true,
       "initial": 25000,
@@ -1029,7 +1029,7 @@
           "6": "const_current",
           "7": "curve_cv3",
           "8": "curve_lsv",
-          "9": "curve_const_vscan",
+          "9": "curve_ca",
           "13": "curve_ocp",
           "14": "curve_pulse_sensing",
           "15": "curve_dpv",
@@ -1366,10 +1366,10 @@
         "2B>pe"
       ]
     },
-    "curve_const_vscan": {
+    "curve_ca": {
       "type": "RIS",
       "parameter": {
-        "va": "VOLT_VSCAN",
+        "va": "CA_VOLT",
         "pa": "ADC_LEVEL_I_15",
         "pb": "ADC_LEVEL_V_IN_15",
         "pc": "DAC_LEVEL_V_OUT_15",
@@ -1706,14 +1706,9 @@
       "_cdr('20X>ADC_VALUE_I')"
     ],
     "ble_write": {
-      "type": "RIS",
+      "type": "ALL",
       "data": [
-        "XFF;",
-        "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];",
-        "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];",
-        "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];",
-        "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];",
-        "1B>BLE_WRITE[16];"
+        "255X>BLE_WRITE;"
       ]
     },
     "dev_version": [

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

@@ -34,6 +34,7 @@
         0,
         1,
         1,
+        1,
         1
       ],
       "domain": {
@@ -98,19 +99,24 @@
         "V-T Graph",
         "R-T Graph",
         "EIS constant frequency",
-        "Dev Mode"
+        "Dev Mode",
+        "Idle"
       ]
     },
     "GENERAL_HS_RTIA": {
       "description": "High speed rtia gain",
       "record_meta": true,
-      "initial": 4,
+      "initial": 8,
       "value": [
         0,
         1,
         2,
         3,
-        4
+        4,
+        5,
+        6,
+        7,
+        8
       ],
       "on_change": "set_general_hs_rtia"
     },
@@ -141,7 +147,7 @@
     "EIS_AC_AMP": {
       "description": "AC Amplitude",
       "record_meta": true,
-      "initial": 25,
+      "initial": 26,
       "domain": [
         2048
       ]
@@ -213,7 +219,7 @@
     "CF_AC_AMP": {
       "description": "AC Amplitude",
       "record_meta": true,
-      "initial": 25,
+      "initial": 26,
       "domain": [
         2048
       ]
@@ -370,10 +376,14 @@
       {
         "expression": "MODE",
         "when": {
+          "7": "idle",
           "*": "start_data"
         }
       }
     ],
+    "idle": [
+      "_idle()"
+    ],
     "start_data": [
       "data_format_cali",
       "_notify(True)",
@@ -623,14 +633,9 @@
       "_cdr('20X>ADC_VALUE_I')"
     ],
     "ble_write": {
-      "type": "RIS",
+      "type": "ALL",
       "data": [
-        "XFF;",
-        "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];",
-        "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];",
-        "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];",
-        "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];",
-        "1B>BLE_WRITE[16];"
+        "255X>BLE_WRITE;"
       ]
     },
     "dev_version": [

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

@@ -106,13 +106,17 @@
     "GENERAL_HS_RTIA": {
       "description": "High speed rtia gain",
       "record_meta": true,
-      "initial": 4,
+      "initial": 8,
       "value": [
         0,
         1,
         2,
         3,
-        4
+        4,
+        5,
+        6,
+        7,
+        8
       ],
       "on_change": "set_general_hs_rtia"
     },
@@ -143,7 +147,7 @@
     "EIS_AC_AMP": {
       "description": "AC Amplitude",
       "record_meta": true,
-      "initial": 25,
+      "initial": 26,
       "domain": [
         2048
       ]
@@ -215,7 +219,7 @@
     "CF_AC_AMP": {
       "description": "AC Amplitude",
       "record_meta": true,
-      "initial": 25,
+      "initial": 26,
       "domain": [
         2048
       ]
@@ -629,14 +633,9 @@
       "_cdr('20X>ADC_VALUE_I')"
     ],
     "ble_write": {
-      "type": "RIS",
+      "type": "ALL",
       "data": [
-        "XFF;",
-        "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];",
-        "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];",
-        "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];",
-        "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];",
-        "1B>BLE_WRITE[16];"
+        "255X>BLE_WRITE;"
       ]
     },
     "dev_version": [

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

@@ -106,13 +106,17 @@
     "GENERAL_HS_RTIA": {
       "description": "High speed rtia gain",
       "record_meta": true,
-      "initial": 4,
+      "initial": 8,
       "value": [
         0,
         1,
         2,
         3,
-        4
+        4,
+        5,
+        6,
+        7,
+        8
       ],
       "on_change": "set_general_hs_rtia"
     },
@@ -143,7 +147,7 @@
     "EIS_AC_AMP": {
       "description": "AC Amplitude",
       "record_meta": true,
-      "initial": 25,
+      "initial": 26,
       "domain": [
         2048
       ]
@@ -215,7 +219,7 @@
     "CF_AC_AMP": {
       "description": "AC Amplitude",
       "record_meta": true,
-      "initial": 25,
+      "initial": 26,
       "domain": [
         2048
       ]
@@ -629,14 +633,9 @@
       "_cdr('20X>ADC_VALUE_I')"
     ],
     "ble_write": {
-      "type": "RIS",
+      "type": "ALL",
       "data": [
-        "XFF;",
-        "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];",
-        "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];",
-        "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];",
-        "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];",
-        "1B>BLE_WRITE[16];"
+        "255X>BLE_WRITE;"
       ]
     },
     "dev_version": [

python/res/devlib/json/Elite_TRIG_0.1.devlib.json

@@ -2,16 +2,207 @@
   "name": "Elite_TRIG_0.1",
   "version": "1.2.30",
   "match_rule": {
-    "local_name_pattern": "Trigger.*",
+    "local_name_pattern": "Elite.*",
     "major_product_number": 0,
     "minor_product_number": 5,
     "major_version_number": 1,
     "minor_version_number": 0
   },
   "constant": {
-
+    "TIME_MAX": 100000,
+    "BLE_WRITE_MAX": 255,
+    "MODE_ALL_OUTPUT": 15,
+    "ELITE_CH_PR0": 0,
+    "ELITE_CH_D0": 1,
+    "ELITE_CH_A0": 2,
+    "ELITE_CH_A2": 3,
+    "ELITE_CH_A3": 4,
+    "ELITE_CH_A1": 5,
+    "ELITE_CH_D1": 6,
+    "ELITE_CH_PR1": 7,
+    "PR0": 0,
+    "PR1": 1,
+    "D0": 2,
+    "D1": 3,
+    "A0": 4,
+    "A1": 5,
+    "A2": 6,
+    "A3": 7
   },
   "parameters": {
+    "USED": {
+      "initial": [false, false, false, false, false, false, false, false],
+      "domain": {
+        "list": [
+          0, 2
+        ]
+      },
+      "value": "VALUE"
+    },
+    "T_EARLY": {
+      "initial": [0, 0, 0, 0, 0, 0, 0, 0],
+      "domain": {
+        "list": [
+          0, 86400000
+        ]
+      },
+      "value": "VALUE"
+    },
+    "V_EARLY": {
+      "initial": [false, false, false, false, false, false, false, false],
+      "domain": {
+        "list": [
+          0, 2
+        ]
+      },
+      "value": "VALUE"
+    },
+    "CYCLE": {
+      "initial": [1, 1, 1, 1, 1, 1, 1, 1],
+      "domain": {
+        "list": [
+          0, 65535
+        ]
+      },
+      "value": "VALUE"
+    },
+    "T_MID0": {
+      "initial": [0, 0, 0, 0, 0, 0, 0, 0],
+      "domain": {
+        "list": [
+          0, 86400000
+        ]
+      },
+      "value": "VALUE"
+    },
+    "T_MID1": {
+      "initial": [0, 0, 0, 0, 0, 0, 0, 0],
+      "domain": {
+        "list": [
+          0, 86400000
+        ]
+      },
+      "value": "VALUE"
+    },
+    "T_MID2": {
+      "initial": [0, 0, 0, 0, 0, 0, 0, 0],
+      "domain": {
+        "list": [
+          0, 86400000
+        ]
+      },
+      "value": "VALUE"
+    },
+    "T_MID3": {
+      "initial": [0, 0, 0, 0, 0, 0, 0, 0],
+      "domain": {
+        "list": [
+          0, 86400000
+        ]
+      },
+      "value": "VALUE"
+    },
+    "V_MID0": {
+      "initial": [false, false, false, false, false, false, false, false],
+      "domain": {
+        "list": [
+          0, 2
+        ]
+      },
+      "value": "VALUE"
+    },
+    "V_MID1": {
+      "initial": [false, false, false, false, false, false, false, false],
+      "domain": {
+        "list": [
+          0, 2
+        ]
+      },
+      "value": "VALUE"
+    },
+    "V_MID2": {
+      "initial": [false, false, false, false, false, false, false, false],
+      "domain": {
+        "list": [
+          0, 2
+        ]
+      },
+      "value": "VALUE"
+    },
+    "V_MID3": {
+      "initial": [false, false, false, false, false, false, false, false],
+      "domain": {
+        "list": [
+          0, 2
+        ]
+      },
+      "value": "VALUE"
+    },
+    "T_LATE": {
+      "initial": [0, 0, 0, 0, 0, 0, 0, 0],
+      "domain": {
+        "list": [
+          0, 86400000
+        ]
+      },
+      "value": "VALUE"
+    },
+    "V_LATE": {
+      "initial": [false, false, false, false, false, false, false, false],
+      "domain": {
+        "list": [
+          0, 2
+        ]
+      },
+      "value": "VALUE"
+    },
+    "CURRENT": {
+      "initial": [0, 0, 0, 0, 0, 0, 0, 0],
+      "domain": {
+        "list": [
+          0, 50000
+        ]
+      },
+      "value": "VALUE"
+    },
+    "OUTPUT_5V": {
+      "initial": [false, false, false, false, false, false, false, false],
+      "domain": {
+        "list": [
+          0, 2
+        ]
+      },
+      "value": "VALUE"
+    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
+    "BLE_WRITE": {
+      "description": "send msg to elite",
+      "domain": {
+        "list": [
+          "BLE_WRITE_MAX"
+        ]
+      },
+      "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]",
+      "value": "VALUE"
+    },
+    "BLE_READ": {
+      "description": "receive msg from elite",
+      "domain": "int"
+    },
+    "TIME_DURATION": {
+      "description": "timer",
+      "record_meta": true,
+      "initial": 0,
+      "domain": [
+        "TIME_MAX"
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
     "ACC_a_out0": {
       "description": "Switch of analog current channel 1",
       "record_meta": true,
@@ -141,15 +332,14 @@
     "MODE": {
       "description": "working mode",
       "record_meta": true,
+      "initial": 3,
       "value": [
-        "Analog Current Control (ACC)"
+        "Analog Current Control (ACC)",
+        "Idle",
+        "Dev Mode",
+        "Trigger"
       ]
     },
-
-
-
-
-
     "CHANNEL": {
       "description": "delete it",
       "record_meta": true,
@@ -208,7 +398,8 @@
       {
         "expression": "MODE",
         "when": {
-          "0": "curve_acc"
+          "0": "curve_acc",
+          "3": "trig_timer_mode"
         }
       },
       "_sync(True)",
@@ -233,6 +424,16 @@
       "CIS_VOLT",
       "_cdr('20X>ADC_VALUE_I')"
     ],
+    "ble_instru_send": [
+      "ble_write",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "ble_write": {
+      "type": "ALL",
+      "data": [
+        "255X>BLE_WRITE;"
+      ]
+    },
     "curve_acc": {
       "type": "RIS",
       "parameter": {
@@ -295,6 +496,677 @@
       "data": [
         "XE2;X02;X03;2B>ACC_a_out3_current;1B>ACC_a_out3"
       ]
+    },
+    "trig_timer_mode": [
+      "trig_timer_mode_set_mode",
+      {
+        "expression": "USED[PR0]",
+        "when": {
+          "True": "trig_timer_mode_set_PR0"
+        }
+      },
+      {
+        "expression": "USED[PR1]",
+        "when": {
+          "True": "trig_timer_mode_set_PR1"
+        }
+      },
+      {
+        "expression": "USED[D0]",
+        "when": {
+          "True": "trig_timer_mode_set_D0"
+        }
+      },
+      {
+        "expression": "USED[D1]",
+        "when": {
+          "True": "trig_timer_mode_set_D1"
+        }
+      },
+      {
+        "expression": "USED[A0]",
+        "when": {
+          "True": "trig_timer_mode_set_A0"
+        }
+      },
+      {
+        "expression": "USED[A1]",
+        "when": {
+          "True": "trig_timer_mode_set_A1"
+        }
+      },
+      {
+        "expression": "USED[A2]",
+        "when": {
+          "True": "trig_timer_mode_set_A2"
+        }
+      },
+      {
+        "expression": "USED[A3]",
+        "when": {
+          "True": "trig_timer_mode_set_A3"
+        }
+      }
+    ],
+
+    "trig_timer_mode_set_mode": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT"
+      },
+      "data": [
+        "1B>mode;",
+        "1XFF;"
+      ]
+    },
+
+    "trig_timer_mode_set_PR0": [
+      "trig_timer_mode_set_PR0_para1",
+      "trig_timer_mode_set_PR0_para2",
+      "trig_timer_mode_set_PR0_para3"
+    ],
+    "trig_timer_mode_set_PR0_para1": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_PR0",
+        "para_sequence": 1,
+        "used": "USED[PR0]",
+        "v_early": "V_EARLY[PR0]",
+        "v_late": "V_LATE[PR0]",
+        "v_mid0": "V_MID0[PR0]",
+        "v_mid1": "V_MID1[PR0]",
+        "v_mid2": "V_MID2[PR0]",
+        "v_mid3": "V_MID3[PR0]",
+        "cycle": "CYCLE[PR0]",
+        "t_early": "T_EARLY[PR0]",
+        "t_late": "T_LATE[PR0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "5b>0;1b>v_late;1b>v_early;1b>used;",
+        "4b>0;1b>v_mid3;1b>v_mid2;1b>v_mid1;1b>v_mid0;",
+        "2B>cycle;4B>t_early;4B>t_late;"
+      ]
+    },
+    "trig_timer_mode_set_PR0_para2": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_PR0",
+        "para_sequence": 2,
+        "t_mid0": "T_MID0[PR0]",
+        "t_mid1": "T_MID1[PR0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid0;4B>t_mid1;"
+      ]
+    },
+    "trig_timer_mode_set_PR0_para3": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_PR0",
+        "para_sequence": 3,
+        "t_mid2": "T_MID2[PR0]",
+        "t_mid3": "T_MID3[PR0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid2;4B>t_mid3;"
+      ]
+    },
+
+    "trig_timer_mode_set_PR1": [
+      "trig_timer_mode_set_PR1_para1",
+      "trig_timer_mode_set_PR1_para2",
+      "trig_timer_mode_set_PR1_para3"
+    ],
+    "trig_timer_mode_set_PR1_para1": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_PR1",
+        "para_sequence": 1,
+        "used": "USED[PR1]",
+        "v_early": "V_EARLY[PR1]",
+        "v_late": "V_LATE[PR1]",
+        "v_mid0": "V_MID0[PR1]",
+        "v_mid1": "V_MID1[PR1]",
+        "v_mid2": "V_MID2[PR1]",
+        "v_mid3": "V_MID3[PR1]",
+        "cycle": "CYCLE[PR1]",
+        "t_early": "T_EARLY[PR1]",
+        "t_late": "T_LATE[PR1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "5b>0;1b>v_late;1b>v_early;1b>used;",
+        "4b>0;1b>v_mid3;1b>v_mid2;1b>v_mid1;1b>v_mid0;",
+        "2B>cycle;4B>t_early;4B>t_late;"
+      ]
+    },
+    "trig_timer_mode_set_PR1_para2": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_PR1",
+        "para_sequence": 2,
+        "t_mid0": "T_MID0[PR1]",
+        "t_mid1": "T_MID1[PR1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid0;4B>t_mid1;"
+      ]
+    },
+    "trig_timer_mode_set_PR1_para3": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_PR1",
+        "para_sequence": 3,
+        "t_mid2": "T_MID2[PR1]",
+        "t_mid3": "T_MID3[PR1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid2;4B>t_mid3;"
+      ]
+    },
+
+    "trig_timer_mode_set_D0": [
+      "trig_timer_mode_set_D0_para1",
+      "trig_timer_mode_set_D0_para2",
+      "trig_timer_mode_set_D0_para3",
+      "trig_timer_mode_set_D0_para4"
+    ],
+    "trig_timer_mode_set_D0_para1": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_D0",
+        "para_sequence": 1,
+        "used": "USED[D0]",
+        "v_early": "V_EARLY[D0]",
+        "v_late": "V_LATE[D0]",
+        "v_mid0": "V_MID0[D0]",
+        "v_mid1": "V_MID1[D0]",
+        "v_mid2": "V_MID2[D0]",
+        "v_mid3": "V_MID3[D0]",
+        "cycle": "CYCLE[D0]",
+        "t_early": "T_EARLY[D0]",
+        "t_late": "T_LATE[D0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "5b>0;1b>v_late;1b>v_early;1b>used;",
+        "4b>0;1b>v_mid3;1b>v_mid2;1b>v_mid1;1b>v_mid0;",
+        "2B>cycle;4B>t_early;4B>t_late;"
+      ]
+    },
+    "trig_timer_mode_set_D0_para2": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_D0",
+        "para_sequence": 2,
+        "t_mid0": "T_MID0[D0]",
+        "t_mid1": "T_MID1[D0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid0;4B>t_mid1;"
+      ]
+    },
+    "trig_timer_mode_set_D0_para3": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_D0",
+        "para_sequence": 3,
+        "t_mid2": "T_MID2[D0]",
+        "t_mid3": "T_MID3[D0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid2;4B>t_mid3;"
+      ]
+    },
+    "trig_timer_mode_set_D0_para4": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_D0",
+        "para_sequence": 4,
+        "d0_as_5v_en": "OUTPUT_5V[D0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "1B>d0_as_5v_en;"
+      ]
+    },
+
+    "trig_timer_mode_set_D1": [
+      "trig_timer_mode_set_D1_para1",
+      "trig_timer_mode_set_D1_para2",
+      "trig_timer_mode_set_D1_para3",
+      "trig_timer_mode_set_D1_para4"
+    ],
+    "trig_timer_mode_set_D1_para1": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_D1",
+        "para_sequence": 1,
+        "used": "USED[D1]",
+        "v_early": "V_EARLY[D1]",
+        "v_late": "V_LATE[D1]",
+        "v_mid0": "V_MID0[D1]",
+        "v_mid1": "V_MID1[D1]",
+        "v_mid2": "V_MID2[D1]",
+        "v_mid3": "V_MID3[D1]",
+        "cycle": "CYCLE[D1]",
+        "t_early": "T_EARLY[D1]",
+        "t_late": "T_LATE[D1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "5b>0;1b>v_late;1b>v_early;1b>used;",
+        "4b>0;1b>v_mid3;1b>v_mid2;1b>v_mid1;1b>v_mid0;",
+        "2B>cycle;4B>t_early;4B>t_late;"
+      ]
+    },
+    "trig_timer_mode_set_D1_para2": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_D1",
+        "para_sequence": 2,
+        "t_mid0": "T_MID0[D1]",
+        "t_mid1": "T_MID1[D1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid0;4B>t_mid1;"
+      ]
+    },
+    "trig_timer_mode_set_D1_para3": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_D1",
+        "para_sequence": 3,
+        "t_mid2": "T_MID2[D1]",
+        "t_mid3": "T_MID3[D1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid2;4B>t_mid3;"
+      ]
+    },
+    "trig_timer_mode_set_D1_para4": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_D1",
+        "para_sequence": 4,
+        "d0_as_5v_en": "OUTPUT_5V[D1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "1B>d0_as_5v_en;"
+      ]
+    },
+
+    "trig_timer_mode_set_A0": [
+      "trig_timer_mode_set_A0_para1",
+      "trig_timer_mode_set_A0_para2",
+      "trig_timer_mode_set_A0_para3",
+      "trig_timer_mode_set_A0_para4"
+    ],
+    "trig_timer_mode_set_A0_para1": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A0",
+        "para_sequence": 1,
+        "used": "USED[A0]",
+        "v_early": "V_EARLY[A0]",
+        "v_late": "V_LATE[A0]",
+        "v_mid0": "V_MID0[A0]",
+        "v_mid1": "V_MID1[A0]",
+        "v_mid2": "V_MID2[A0]",
+        "v_mid3": "V_MID3[A0]",
+        "cycle": "CYCLE[A0]",
+        "t_early": "T_EARLY[A0]",
+        "t_late": "T_LATE[A0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "5b>0;1b>v_late;1b>v_early;1b>used;",
+        "4b>0;1b>v_mid3;1b>v_mid2;1b>v_mid1;1b>v_mid0;",
+        "2B>cycle;4B>t_early;4B>t_late;"
+      ]
+    },
+    "trig_timer_mode_set_A0_para2": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A0",
+        "para_sequence": 2,
+        "t_mid0": "T_MID0[A0]",
+        "t_mid1": "T_MID1[A0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid0;4B>t_mid1;"
+      ]
+    },
+    "trig_timer_mode_set_A0_para3": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A0",
+        "para_sequence": 3,
+        "t_mid2": "T_MID2[A0]",
+        "t_mid3": "T_MID3[A0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid2;4B>t_mid3;"
+      ]
+    },
+    "trig_timer_mode_set_A0_para4": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A0",
+        "para_sequence": 4,
+        "current": "CURRENT[A0]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "2B>current;"
+      ]
+    },
+
+    "trig_timer_mode_set_A1": [
+      "trig_timer_mode_set_A1_para1",
+      "trig_timer_mode_set_A1_para2",
+      "trig_timer_mode_set_A1_para3",
+      "trig_timer_mode_set_A1_para4"
+    ],
+    "trig_timer_mode_set_A1_para1": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A1",
+        "para_sequence": 1,
+        "used": "USED[A1]",
+        "v_early": "V_EARLY[A1]",
+        "v_late": "V_LATE[A1]",
+        "v_mid0": "V_MID0[A1]",
+        "v_mid1": "V_MID1[A1]",
+        "v_mid2": "V_MID2[A1]",
+        "v_mid3": "V_MID3[A1]",
+        "cycle": "CYCLE[A1]",
+        "t_early": "T_EARLY[A1]",
+        "t_late": "T_LATE[A1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "5b>0;1b>v_late;1b>v_early;1b>used;",
+        "4b>0;1b>v_mid3;1b>v_mid2;1b>v_mid1;1b>v_mid0;",
+        "2B>cycle;4B>t_early;4B>t_late;"
+      ]
+    },
+    "trig_timer_mode_set_A1_para2": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A1",
+        "para_sequence": 2,
+        "t_mid0": "T_MID0[A1]",
+        "t_mid1": "T_MID1[A1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid0;4B>t_mid1;"
+      ]
+    },
+    "trig_timer_mode_set_A1_para3": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A1",
+        "para_sequence": 3,
+        "t_mid2": "T_MID2[A1]",
+        "t_mid3": "T_MID3[A1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid2;4B>t_mid3;"
+      ]
+    },
+    "trig_timer_mode_set_A1_para4": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A1",
+        "para_sequence": 4,
+        "current": "CURRENT[A1]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "2B>current;"
+      ]
+    },
+
+    "trig_timer_mode_set_A2": [
+      "trig_timer_mode_set_A2_para1",
+      "trig_timer_mode_set_A2_para2",
+      "trig_timer_mode_set_A2_para3",
+      "trig_timer_mode_set_A2_para4"
+    ],
+    "trig_timer_mode_set_A2_para1": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A2",
+        "para_sequence": 1,
+        "used": "USED[A2]",
+        "v_early": "V_EARLY[A2]",
+        "v_late": "V_LATE[A2]",
+        "v_mid0": "V_MID0[A2]",
+        "v_mid1": "V_MID1[A2]",
+        "v_mid2": "V_MID2[A2]",
+        "v_mid3": "V_MID3[A2]",
+        "cycle": "CYCLE[A2]",
+        "t_early": "T_EARLY[A2]",
+        "t_late": "T_LATE[A2]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "5b>0;1b>v_late;1b>v_early;1b>used;",
+        "4b>0;1b>v_mid3;1b>v_mid2;1b>v_mid1;1b>v_mid0;",
+        "2B>cycle;4B>t_early;4B>t_late;"
+      ]
+    },
+    "trig_timer_mode_set_A2_para2": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A2",
+        "para_sequence": 2,
+        "t_mid0": "T_MID0[A2]",
+        "t_mid1": "T_MID1[A2]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid0;4B>t_mid1;"
+      ]
+    },
+    "trig_timer_mode_set_A2_para3": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A2",
+        "para_sequence": 3,
+        "t_mid2": "T_MID2[A2]",
+        "t_mid3": "T_MID3[A2]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid2;4B>t_mid3;"
+      ]
+    },
+    "trig_timer_mode_set_A2_para4": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A2",
+        "para_sequence": 4,
+        "current": "CURRENT[A2]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "2B>current;"
+      ]
+    },
+
+    "trig_timer_mode_set_A3": [
+      "trig_timer_mode_set_A3_para1",
+      "trig_timer_mode_set_A3_para2",
+      "trig_timer_mode_set_A3_para3",
+      "trig_timer_mode_set_A3_para4"
+    ],
+    "trig_timer_mode_set_A3_para1": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A3",
+        "para_sequence": 1,
+        "used": "USED[A3]",
+        "v_early": "V_EARLY[A3]",
+        "v_late": "V_LATE[A3]",
+        "v_mid0": "V_MID0[A3]",
+        "v_mid1": "V_MID1[A3]",
+        "v_mid2": "V_MID2[A3]",
+        "v_mid3": "V_MID3[A3]",
+        "cycle": "CYCLE[A3]",
+        "t_early": "T_EARLY[A3]",
+        "t_late": "T_LATE[A3]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "5b>0;1b>v_late;1b>v_early;1b>used;",
+        "4b>0;1b>v_mid3;1b>v_mid2;1b>v_mid1;1b>v_mid0;",
+        "2B>cycle;4B>t_early;4B>t_late;"
+      ]
+    },
+    "trig_timer_mode_set_A3_para2": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A3",
+        "para_sequence": 2,
+        "t_mid0": "T_MID0[A3]",
+        "t_mid1": "T_MID1[A3]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid0;4B>t_mid1;"
+      ]
+    },
+    "trig_timer_mode_set_A3_para3": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A3",
+        "para_sequence": 3,
+        "t_mid2": "T_MID2[A3]",
+        "t_mid3": "T_MID3[A3]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "4B>t_mid2;4B>t_mid3;"
+      ]
+    },
+    "trig_timer_mode_set_A3_para4": {
+      "type": "RIS",
+      "parameter": {
+        "mode": "MODE_ALL_OUTPUT",
+        "elite_ch": "ELITE_CH_A3",
+        "para_sequence": 4,
+        "current": "CURRENT[A3]"
+      },
+      "data": [
+        "1B>mode;",
+        "1B>elite_ch;",
+        "1B>para_sequence;",
+        "2B>current;"
+      ]
     }
+
   }
 }

python/res/devlib/json/MMM.devlib.json

@@ -0,0 +1,348 @@
+{
+  "name": "MMM_1.0",
+  "version": "1.2.30",
+  "match_rule": {
+    "local_name_pattern": "Elite-MMM.*",
+    "major_product_number": 0,
+    "minor_product_number": 9,
+    "major_version_number": 0,
+    "minor_version_number": 1
+  },
+  "constant": {
+    "TIME_MAX": 100000,
+    "VOLT_MAX": 65536,
+    "Const_Current_Range": 1500001,
+    "BLE_WRITE_MAX": 255,
+    "DROP_10MS":5,
+    "NOTIFY_DATA": 10
+  },
+  "parameters": {
+    "BAUDRATE": {
+      "description": "baudrate",
+      "record_meta": true,
+      "initial": 10000,
+      "domain": [
+        1000000
+      ],
+      "value": {
+        "expression": "VALUE"
+      },
+      "on_change": "set_sample_rate"
+    },
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
+    "SAMPLE_RATE": {
+      "description": "data sampling rate",
+      "record_meta": true, 
+      "initial": 100,
+      "domain": [
+        1001
+      ],
+      "value": {
+        "expression": "VALUE"
+      },
+      "on_change": "set_sample_rate"
+    },
+    "AMP_GAIN": {
+      "description": "amp gain",
+      "record_meta": true,
+      "domain": "constant",
+      "value": 1
+    },
+    "MODE": {
+      "description": "working mode",
+      "record_meta": true,
+      "initial": 0,
+      "value": [
+        "Dev Mode",
+        "Dev Mode",
+        "MMM"
+      ]
+    },
+    "BLE_WRITE": {
+      "description": "send msg to elite",
+      "domain": {
+        "list": [
+          "BLE_WRITE_MAX"
+        ]
+      },
+      "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]",
+      "value": "VALUE"
+    },
+    "BLE_READ": {
+      "description": "receive msg from elite",
+      "domain": "int"
+    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
+    "PATTERN_SWITCH": {
+      "description": "switch of pattern",
+      "initial": 1,
+      "domain": [
+        2
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PULSE": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": [
+        0,
+        0,
+        0
+      ],
+      "domain": {
+        "list": [
+          66536
+        ]
+      },
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        44
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN_MAX": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 43,
+      "domain": [
+        100
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN_MIN": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        100
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    }
+  },
+  "instruction": {
+    "start": [
+      "data_format",
+      "_notify(True)",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "start_manual_scan_mode",
+          "1": "start_manual_scan_mode",
+          "2": "",
+          "3": "start_auto_scan_mode",
+          "4": "start_auto_scan_mode",
+          "5": "start_R_external_cali_mode"
+        }
+      },
+      "_sync(True)"
+    ],
+    "get_data": [
+      "manual_scan_mode_set_R_pattern"
+    ],
+    "stop": [
+      "_notify(False)",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "stop_manual_scan_mode",
+          "1": "stop_manual_scan_mode",
+          "2": "",
+          "3": "stop_auto_scan_mode",
+          "4": "stop_auto_scan_mode",
+          "5": "stop_R_external_cali_mode"
+        }
+      },
+      "_sync(False)"
+    ],
+    "data_format": [
+      "_data_format('BMD380')",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "_disable_cache(True)",
+          "1": "_disable_cache(True)",
+          "*": "_disable_cache(False)"
+        }
+      }
+    ],
+    "start_manual_scan_mode": [
+      {
+        "expression": "PATTERN_SWITCH",
+        "when": {
+          "0": "start_manual_scan_mode_use_pattern",
+          "1": "start_manual_scan_mode_use_bit"
+        }
+      }
+    ],
+    "start_manual_scan_mode_use_pattern": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PATTERN",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X01;",
+        "X00;X01;",
+        "16b>pa;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "start_manual_scan_mode_use_bit": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PULSE[0]",
+        "pb": "PULSE[1]",
+        "pc": "PULSE[2]",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X01;",
+        "X00;X00;",
+        "4b>0;4b>pa;4b>pb;4b>pc;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "manual_scan_mode_set_R_pattern": [
+      {
+        "expression": "PATTERN_SWITCH",
+        "when": {
+          "0": "pattern",
+          "1": "bit"
+        }
+      }
+    ],
+    "pattern": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PATTERN",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X02;",
+        "X00;X01;",
+        "16b>pa;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "bit": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PULSE[0]",
+        "pb": "PULSE[1]",
+        "pc": "PULSE[2]",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X02;",
+        "X00;X00;",
+        "4b>0;4b>pa;4b>pb;4b>pc;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_manual_scan_mode": {
+      "type": "RIS",
+      "data": [
+        "X01;X00;"
+      ]
+    },
+    "start_auto_scan_mode": {
+      "type": "RIS",
+      "parameter": {
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X02;X01;",
+        "2B>PATTERN_MAX;",
+        "2B>PATTERN_MIN;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_auto_scan_mode": {
+      "type": "RIS",
+      "data": [
+        "X02;X00;"
+      ]
+    },
+    "start_R_external_cali_mode": {
+      "type": "RIS",
+      "parameter": {
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X03;X01;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_R_external_cali_mode": {
+      "type": "RIS",
+      "data": [
+        "X03;X00;"
+      ]
+    },
+    "enable_notify": {
+      "type": "RIS",
+      "data": [
+        "XFF;XA3;X04;"
+      ]
+    },
+    "disable_notify": {
+      "type": "RIS",
+      "data": [
+        "XFF;XA3;X05;"
+      ]
+    },
+    "ble_instru_send": [
+      "ble_write",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "ble_write": {
+      "type": "ALL",
+      "data": [
+        "255X>BLE_WRITE;"
+      ]
+    },
+    "dev_version": [
+      "CIS_VERSION",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "dev_battery": [
+      "CIS_VOLT",
+      "_cdr('20X>ADC_VALUE_I')"
+    ]
+  }
+}

python/res/devlib/json/PEL_1.0.devlib.json

@@ -0,0 +1,339 @@
+{
+  "name": "PEL_1.0",
+  "version": "1.2.30",
+  "match_rule": {
+    "local_name_pattern": "Elite-PEL.*",
+    "major_product_number": 0,
+    "minor_product_number": 7,
+    "major_version_number": 0,
+    "minor_version_number": 0
+  },
+  "constant": {
+    "TIME_MAX": 100000,
+    "VOLT_MAX": 65536,
+    "Const_Current_Range": 1500001,
+    "BLE_WRITE_MAX": 255,
+    "DROP_10MS":5,
+    "NOTIFY_DATA": 10
+  },
+  "parameters": {
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
+    "SAMPLE_RATE": {
+      "description": "data sampling rate",
+      "record_meta": true,
+      "initial": 100,
+      "domain": [
+        1001
+      ],
+      "value": {
+        "expression": "VALUE"
+      },
+      "on_change": "set_sample_rate"
+    },
+    "AMP_GAIN": {
+      "description": "amp gain",
+      "record_meta": true,
+      "domain": "constant",
+      "value": 1
+    },
+    "MODE": {
+      "description": "working mode",
+      "record_meta": true,
+      "initial": 0,
+      "value": [
+        "Select Resistor Pick Mode",
+        "Select Resistor Full Mode",
+        "Dev Mode",
+        "IOPH",
+        "IOPL",
+        "R-external calibration"
+      ]
+    },
+    "BLE_WRITE": {
+      "description": "send msg to elite",
+      "domain": {
+        "list": [
+          "BLE_WRITE_MAX"
+        ]
+      },
+      "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]",
+      "value": "VALUE"
+    },
+    "BLE_READ": {
+      "description": "receive msg from elite",
+      "domain": "int"
+    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
+    "PATTERN_SWITCH": {
+      "description": "switch of pattern",
+      "initial": 1,
+      "domain": [
+        2
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PULSE": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": [
+        0,
+        0,
+        0
+      ],
+      "domain": {
+        "list": [
+          66536
+        ]
+      },
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        44
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN_MAX": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 43,
+      "domain": [
+        100
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN_MIN": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        100
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    }
+  },
+  "instruction": {
+    "start": [
+      "data_format",
+      "_notify(True)",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "start_manual_scan_mode",
+          "1": "start_manual_scan_mode",
+          "2": "",
+          "3": "start_auto_scan_mode",
+          "4": "start_auto_scan_mode",
+          "5": "start_R_external_cali_mode"
+        }
+      },
+      "_sync(True)"
+    ],
+    "get_data": [
+      "manual_scan_mode_set_R_pattern"
+    ],
+    "stop": [
+      "_notify(False)",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "stop_manual_scan_mode",
+          "1": "stop_manual_scan_mode",
+          "2": "",
+          "3": "stop_auto_scan_mode",
+          "4": "stop_auto_scan_mode",
+          "5": "stop_R_external_cali_mode"
+        }
+      },
+      "_sync(False)"
+    ],
+    "data_format": [
+      "_data_format('PEL_FMT1_')",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "_disable_cache(True)",
+          "1": "_disable_cache(True)",
+          "*": "_disable_cache(False)"
+        }
+      }
+    ],
+    "start_manual_scan_mode": [
+      {
+        "expression": "PATTERN_SWITCH",
+        "when": {
+          "0": "start_manual_scan_mode_use_pattern",
+          "1": "start_manual_scan_mode_use_bit"
+        }
+      }
+    ],
+    "start_manual_scan_mode_use_pattern": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PATTERN",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X01;",
+        "X00;X01;",
+        "16b>pa;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "start_manual_scan_mode_use_bit": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PULSE[0]",
+        "pb": "PULSE[1]",
+        "pc": "PULSE[2]",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X01;",
+        "X00;X00;",
+        "4b>0;4b>pa;4b>pb;4b>pc;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "manual_scan_mode_set_R_pattern": [
+      {
+        "expression": "PATTERN_SWITCH",
+        "when": {
+          "0": "pattern",
+          "1": "bit"
+        }
+      }
+    ],
+    "pattern": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PATTERN",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X02;",
+        "X00;X01;",
+        "16b>pa;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "bit": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PULSE[0]",
+        "pb": "PULSE[1]",
+        "pc": "PULSE[2]",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X02;",
+        "X00;X00;",
+        "4b>0;4b>pa;4b>pb;4b>pc;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_manual_scan_mode": {
+      "type": "RIS",
+      "data": [
+        "X01;X00;"
+      ]
+    },
+    "start_auto_scan_mode": {
+      "type": "RIS",
+      "parameter": {
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X02;X01;",
+        "2B>PATTERN_MAX;",
+        "2B>PATTERN_MIN;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_auto_scan_mode": {
+      "type": "RIS",
+      "data": [
+        "X02;X00;"
+      ]
+    },
+    "start_R_external_cali_mode": {
+      "type": "RIS",
+      "parameter": {
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X03;X01;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_R_external_cali_mode": {
+      "type": "RIS",
+      "data": [
+        "X03;X00;"
+      ]
+    },
+    "enable_notify": {
+      "type": "RIS",
+      "data": [
+        "XFF;XA3;X04;"
+      ]
+    },
+    "disable_notify": {
+      "type": "RIS",
+      "data": [
+        "XFF;XA3;X05;"
+      ]
+    },
+    "ble_instru_send": [
+      "ble_write",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "ble_write": {
+      "type": "ALL",
+      "data": [
+        "255X>BLE_WRITE;"
+      ]
+    },
+    "dev_version": [
+      "CIS_VERSION",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "dev_battery": [
+      "CIS_VOLT",
+      "_cdr('20X>ADC_VALUE_I')"
+    ]
+  }
+}

python/res/devlib/json/PEL_2.0.devlib.json

@@ -0,0 +1,339 @@
+{
+  "name": "PEL_2.0",
+  "version": "1.2.30",
+  "match_rule": {
+    "local_name_pattern": "Elite-PEL.*",
+    "major_product_number": 0,
+    "minor_product_number": 7,
+    "major_version_number": 0,
+    "minor_version_number": 1
+  },
+  "constant": {
+    "TIME_MAX": 100000,
+    "VOLT_MAX": 65536,
+    "Const_Current_Range": 1500001,
+    "BLE_WRITE_MAX": 255,
+    "DROP_10MS":5,
+    "NOTIFY_DATA": 10
+  },
+  "parameters": {
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
+    "SAMPLE_RATE": {
+      "description": "data sampling rate",
+      "record_meta": true,
+      "initial": 100,
+      "domain": [
+        1001
+      ],
+      "value": {
+        "expression": "VALUE"
+      },
+      "on_change": "set_sample_rate"
+    },
+    "AMP_GAIN": {
+      "description": "amp gain",
+      "record_meta": true,
+      "domain": "constant",
+      "value": 1
+    },
+    "MODE": {
+      "description": "working mode",
+      "record_meta": true,
+      "initial": 0,
+      "value": [
+        "Select Resistor Pick Mode",
+        "Select Resistor Full Mode",
+        "Dev Mode",
+        "IOPH",
+        "IOPL",
+        "R-external calibration"
+      ]
+    },
+    "BLE_WRITE": {
+      "description": "send msg to elite",
+      "domain": {
+        "list": [
+          "BLE_WRITE_MAX"
+        ]
+      },
+      "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]",
+      "value": "VALUE"
+    },
+    "BLE_READ": {
+      "description": "receive msg from elite",
+      "domain": "int"
+    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
+    "PATTERN_SWITCH": {
+      "description": "switch of pattern",
+      "initial": 1,
+      "domain": [
+        2
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PULSE": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": [
+        0,
+        0,
+        0
+      ],
+      "domain": {
+        "list": [
+          66536
+        ]
+      },
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        44
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN_MAX": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 43,
+      "domain": [
+        100
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN_MIN": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        100
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    }
+  },
+  "instruction": {
+    "start": [
+      "data_format",
+      "_notify(True)",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "start_manual_scan_mode",
+          "1": "start_manual_scan_mode",
+          "2": "",
+          "3": "start_auto_scan_mode",
+          "4": "start_auto_scan_mode",
+          "5": "start_R_external_cali_mode"
+        }
+      },
+      "_sync(True)"
+    ],
+    "get_data": [
+      "manual_scan_mode_set_R_pattern"
+    ],
+    "stop": [
+      "_notify(False)",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "stop_manual_scan_mode",
+          "1": "stop_manual_scan_mode",
+          "2": "",
+          "3": "stop_auto_scan_mode",
+          "4": "stop_auto_scan_mode",
+          "5": "stop_R_external_cali_mode"
+        }
+      },
+      "_sync(False)"
+    ],
+    "data_format": [
+      "_data_format('PEL_FMT1_')",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "_disable_cache(True)",
+          "1": "_disable_cache(True)",
+          "*": "_disable_cache(False)"
+        }
+      }
+    ],
+    "start_manual_scan_mode": [
+      {
+        "expression": "PATTERN_SWITCH",
+        "when": {
+          "0": "start_manual_scan_mode_use_pattern",
+          "1": "start_manual_scan_mode_use_bit"
+        }
+      }
+    ],
+    "start_manual_scan_mode_use_pattern": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PATTERN",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X01;",
+        "X00;X01;",
+        "16b>pa;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "start_manual_scan_mode_use_bit": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PULSE[0]",
+        "pb": "PULSE[1]",
+        "pc": "PULSE[2]",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X01;",
+        "X00;X00;",
+        "4b>0;4b>pa;4b>pb;4b>pc;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "manual_scan_mode_set_R_pattern": [
+      {
+        "expression": "PATTERN_SWITCH",
+        "when": {
+          "0": "pattern",
+          "1": "bit"
+        }
+      }
+    ],
+    "pattern": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PATTERN",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X02;",
+        "X00;X01;",
+        "16b>pa;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "bit": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PULSE[0]",
+        "pb": "PULSE[1]",
+        "pc": "PULSE[2]",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X02;",
+        "X00;X00;",
+        "4b>0;4b>pa;4b>pb;4b>pc;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_manual_scan_mode": {
+      "type": "RIS",
+      "data": [
+        "X01;X00;"
+      ]
+    },
+    "start_auto_scan_mode": {
+      "type": "RIS",
+      "parameter": {
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X02;X01;",
+        "2B>PATTERN_MAX;",
+        "2B>PATTERN_MIN;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_auto_scan_mode": {
+      "type": "RIS",
+      "data": [
+        "X02;X00;"
+      ]
+    },
+    "start_R_external_cali_mode": {
+      "type": "RIS",
+      "parameter": {
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X03;X01;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_R_external_cali_mode": {
+      "type": "RIS",
+      "data": [
+        "X03;X00;"
+      ]
+    },
+    "enable_notify": {
+      "type": "RIS",
+      "data": [
+        "XFF;XA3;X04;"
+      ]
+    },
+    "disable_notify": {
+      "type": "RIS",
+      "data": [
+        "XFF;XA3;X05;"
+      ]
+    },
+    "ble_instru_send": [
+      "ble_write",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "ble_write": {
+      "type": "ALL",
+      "data": [
+        "255X>BLE_WRITE;"
+      ]
+    },
+    "dev_version": [
+      "CIS_VERSION",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "dev_battery": [
+      "CIS_VOLT",
+      "_cdr('20X>ADC_VALUE_I')"
+    ]
+  }
+}

python/res/devlib/json/PEL_3.0.devlib.json

@@ -0,0 +1,339 @@
+{
+  "name": "PEL_3.0",
+  "version": "1.2.30",
+  "match_rule": {
+    "local_name_pattern": "Elite-PEL.*",
+    "major_product_number": 0,
+    "minor_product_number": 7,
+    "major_version_number": 0,
+    "minor_version_number": 2
+  },
+  "constant": {
+    "TIME_MAX": 100000,
+    "VOLT_MAX": 65536,
+    "Const_Current_Range": 1500001,
+    "BLE_WRITE_MAX": 255,
+    "DROP_10MS":5,
+    "NOTIFY_DATA": 10
+  },
+  "parameters": {
+    "CHANNEL": {
+      "description": "record channels",
+      "record_meta": true,
+      "domain": "property",
+      "value": "[0, 1, 2]"
+    },
+    "SAMPLE_RATE": {
+      "description": "data sampling rate",
+      "record_meta": true,
+      "initial": 100,
+      "domain": [
+        1001
+      ],
+      "value": {
+        "expression": "VALUE"
+      },
+      "on_change": "set_sample_rate"
+    },
+    "AMP_GAIN": {
+      "description": "amp gain",
+      "record_meta": true,
+      "domain": "constant",
+      "value": 1
+    },
+    "MODE": {
+      "description": "working mode",
+      "record_meta": true,
+      "initial": 0,
+      "value": [
+        "Select Resistor Pick Mode",
+        "Select Resistor Full Mode",
+        "Dev Mode",
+        "IOPH",
+        "IOPL",
+        "R-external calibration"
+      ]
+    },
+    "BLE_WRITE": {
+      "description": "send msg to elite",
+      "domain": {
+        "list": [
+          "BLE_WRITE_MAX"
+        ]
+      },
+      "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]",
+      "value": "VALUE"
+    },
+    "BLE_READ": {
+      "description": "receive msg from elite",
+      "domain": "int"
+    },
+    "ADC_VALUE_I": {
+      "description": "ADC value current value",
+      "domain": "int"
+    },
+    "PATTERN_SWITCH": {
+      "description": "switch of pattern",
+      "initial": 1,
+      "domain": [
+        2
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PULSE": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": [
+        0,
+        0,
+        0
+      ],
+      "domain": {
+        "list": [
+          66536
+        ]
+      },
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        44
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN_MAX": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 43,
+      "domain": [
+        100
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    },
+    "PATTERN_MIN": {
+      "description": "Pulse Mode Segment Duration 2",
+      "record_meta": true,
+      "initial": 1,
+      "domain": [
+        100
+      ],
+      "value": {
+        "expression": "VALUE"
+      }
+    }
+  },
+  "instruction": {
+    "start": [
+      "data_format",
+      "_notify(True)",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "start_manual_scan_mode",
+          "1": "start_manual_scan_mode",
+          "2": "",
+          "3": "start_auto_scan_mode",
+          "4": "start_auto_scan_mode",
+          "5": "start_R_external_cali_mode"
+        }
+      },
+      "_sync(True)"
+    ],
+    "get_data": [
+      "manual_scan_mode_set_R_pattern"
+    ],
+    "stop": [
+      "_notify(False)",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "stop_manual_scan_mode",
+          "1": "stop_manual_scan_mode",
+          "2": "",
+          "3": "stop_auto_scan_mode",
+          "4": "stop_auto_scan_mode",
+          "5": "stop_R_external_cali_mode"
+        }
+      },
+      "_sync(False)"
+    ],
+    "data_format": [
+      "_data_format('PEL_FMT2_')",
+      {
+        "expression": "MODE",
+        "when": {
+          "0": "_disable_cache(True)",
+          "1": "_disable_cache(True)",
+          "*": "_disable_cache(False)"
+        }
+      }
+    ],
+    "start_manual_scan_mode": [
+      {
+        "expression": "PATTERN_SWITCH",
+        "when": {
+          "0": "start_manual_scan_mode_use_pattern",
+          "1": "start_manual_scan_mode_use_bit"
+        }
+      }
+    ],
+    "start_manual_scan_mode_use_pattern": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PATTERN",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X01;",
+        "X00;X01;",
+        "16b>pa;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "start_manual_scan_mode_use_bit": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PULSE[0]",
+        "pb": "PULSE[1]",
+        "pc": "PULSE[2]",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X01;",
+        "X00;X00;",
+        "4b>0;4b>pa;4b>pb;4b>pc;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "manual_scan_mode_set_R_pattern": [
+      {
+        "expression": "PATTERN_SWITCH",
+        "when": {
+          "0": "pattern",
+          "1": "bit"
+        }
+      }
+    ],
+    "pattern": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PATTERN",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X02;",
+        "X00;X01;",
+        "16b>pa;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "bit": {
+      "type": "RIS",
+      "parameter": {
+        "pa": "PULSE[0]",
+        "pb": "PULSE[1]",
+        "pc": "PULSE[2]",
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X01;X02;",
+        "X00;X00;",
+        "4b>0;4b>pa;4b>pb;4b>pc;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_manual_scan_mode": {
+      "type": "RIS",
+      "data": [
+        "X01;X00;"
+      ]
+    },
+    "start_auto_scan_mode": {
+      "type": "RIS",
+      "parameter": {
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X02;X01;",
+        "2B>PATTERN_MAX;",
+        "2B>PATTERN_MIN;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_auto_scan_mode": {
+      "type": "RIS",
+      "data": [
+        "X02;X00;"
+      ]
+    },
+    "start_R_external_cali_mode": {
+      "type": "RIS",
+      "parameter": {
+        "ca": "DROP_10MS",
+        "cb": "NOTIFY_DATA"
+      },
+      "data": [
+        "X03;X01;",
+        "16b>ca;",
+        "16b>cb;"
+      ]
+    },
+    "stop_R_external_cali_mode": {
+      "type": "RIS",
+      "data": [
+        "X03;X00;"
+      ]
+    },
+    "enable_notify": {
+      "type": "RIS",
+      "data": [
+        "XFF;XA3;X04;"
+      ]
+    },
+    "disable_notify": {
+      "type": "RIS",
+      "data": [
+        "XFF;XA3;X05;"
+      ]
+    },
+    "ble_instru_send": [
+      "ble_write",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "ble_write": {
+      "type": "ALL",
+      "data": [
+        "255X>BLE_WRITE;"
+      ]
+    },
+    "dev_version": [
+      "CIS_VERSION",
+      "_cdr('20X>ADC_VALUE_I')"
+    ],
+    "dev_battery": [
+      "CIS_VOLT",
+      "_cdr('20X>ADC_VALUE_I')"
+    ]
+  }
+}

update_db_package.sh

@@ -27,3 +27,12 @@ sudo su -c "psql -d postgres -c \"ALTER TABLE IF EXISTS project_report RENAME TO
 
 # change table project_meta column cycle to type jsonb
 sudo su -c "psql -d postgres -c \"ALTER TABLE project_metas ALTER COLUMN cycle type jsonb USING (cycle::jsonb);\"" postgres
+
+# drop column calibration default
+sudo su -c "psql -d postgres -c \"ALTER TABLE devices ALTER COLUMN calibration DROP DEFAULT;\"" postgres
+
+# drop column calibration default
+sudo su -c "psql -d postgres -c \"ALTER TABLE devices ALTER COLUMN calibration TYPE bytea USING calibration::bytea;\"" postgres
+
+# add column project in recording_data_metas
+sudo su -c "psql -d postgres -c \"ALTER TABLE devices ADD COLUMN IF NOT EXISTS calibration_version Int4 DEFAULT -1;\"" postgres