[update] update cali table for 9 hstia

python/biopro/db/collection.py

@@ -1,60 +0,0 @@
-from sqlalchemy import Table, Column, String, MetaData, ForeignKey, JSON
-from sqlalchemy.sql import select, func
-from sqlalchemy.types import Integer, BigInteger, String, Boolean, TIMESTAMP, Numeric
-from sqlalchemy.dialects.postgresql import JSONB
-from 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

@@ -1,51 +0,0 @@
-from sqlalchemy import Table, Column, String, MetaData, ForeignKey, JSON
-from sqlalchemy.sql import select, func
-from sqlalchemy.types import Integer, BigInteger, String, Boolean, TIMESTAMP, Numeric, 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

@@ -1,24 +0,0 @@
-from sqlalchemy import Table, Column, String, MetaData, ForeignKey, JSON
-from sqlalchemy.sql import select, func
-from sqlalchemy.types import Integer, BigInteger, String, Boolean, TIMESTAMP, Numeric
-from sqlalchemy.dialects.postgresql import JSONB
-
-from .base import Base
-
-class 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, Session
+from .base import Base
 
 class MetaProjectInfo(Base):
     __tablename__ = "project_metas"
@@ -17,13 +17,5 @@ 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,7 +350,6 @@ 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:
@@ -433,12 +432,12 @@ class CC2650Device(Device):
         if length == 1 and instruction[0] < 0:
             return struct.pack('2B1b',
                            (ins_type & 0xF0) | (self.device_id & 0x0F),
-                           (ins_oper & 0xFF),
+                           (ins_oper & 0xF0) | (length & 0x0F),
                            *instruction)
 
         return struct.pack('%dB' % (length + 2),
                            (ins_type & 0xF0) | (self.device_id & 0x0F),
-                           (ins_oper & 0xFF),
+                           (ins_oper & 0xF0) | (length & 0x0F),
                            *instruction)
 
     def _decode_data(self, ins_oper: int, data: bytes) -> bytes:
@@ -470,7 +469,6 @@ class CC2650Device(Device):
             # receive
             data = self._master.read_characteristic(self.device_id, CC2650MasterDevice.RETURN_HANDLE)
             data = self._decode_data(DeviceInstruction.CIS_VERSION, data)
-            print('data:',list(data))
 
         except SendInstructionTimeoutError:
             self._master.log_warn('device', self.device_id, 'update_device_version no response')
@@ -479,14 +477,18 @@ class CC2650Device(Device):
 
         else:
             if data is not None and len(data) > 0:
-                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]
+                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
 
                 self._device_version = str(year) + '/' + str(month) + '/' + str(day) + " " + str(hour) + ":" + str(
-                    minute)
+                    minute) + " | " + str(mac1) + ":" + str(mac2)
 
     @property
     def battery(self) -> int:
@@ -535,7 +537,7 @@ class CC2650Device(Device):
 
         else:
             if data is not None and len(data) > 2 :
-                battery = struct.unpack('<H', data[2:4])[0]
+                battery = struct.unpack('<H', data[1:3])[0]
                 if battery is not None:
                     self._battery = battery
 
@@ -547,39 +549,6 @@ 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 """
@@ -602,6 +571,20 @@ class CC2650Device(Device):
         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)
@@ -678,33 +661,42 @@ class CC2650Device(Device):
 
         elif device_type == 'EISZeroOne':
             i = 1
+            request_times = 0
             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)
+                try:
+                    # send
+                    code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, i)
+                    self._master.write_characteristic(self.device_id, CC2650MasterDevice.COMMAND_HANDLE, code)
 
-                    except SerialTimeoutException:
-                        self._master.log_warn('device', self.device_id, 'send update_calibration_info instruction fail')
-                        continue
-                    
+                    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:
-                        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')
+                        request_times += 1
+                        if request_times > 3:
+                            self._master.reset(self.device_id)
+                            break
+
 
-                        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
-                            
         else:
             # default: neulive 2.1
             for i in range(1):
@@ -1958,6 +1950,120 @@ 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:
@@ -1984,144 +2090,34 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
         return self._found
 
     def check_mem_survive(self) -> Optional[CC2650Device]:
-        chk_mem_response = None
+        ack = []
         ins = bytearray()
-
-        ins.append(0x0A)
-        ins.append(0x01) #length
+        ins.append(10)
+        ins.append(1) #length
         ins.append(0xF1)
-        self._interface.flush_input()
+        # print('ins', list(ins))
 
         try:
-            self.log_verbose('[CC2650]', 'check_mem_survive att_write','0x'+str.upper(ins.hex()))
             self._cc2650.send("bytes", bytes(ins))
 
-        except SerialTimeoutException:
-            self.log_verbose('[CC2650]', 'check_mem_survive send fail')
+        except SerialTimeoutException as e:
+            raise RecvTimeout('device CC2650 check_mem_survive timeout') from e
 
         else:
             try:
-                chk_mem_response = self._cc2650.recv_uart(0.001)
+                ack = self._cc2650.recv_uart(0.001)
 
             except RecvTimeout:
-                self.log_verbose('[CC2650]', 'check_mem_survive response timeout, no memory board')
+                self.log_info("no memory board")
 
-        if chk_mem_response is None:
-            return False
+            # else:
+            #     print('ack=', ack)
 
-        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)
+        if ack == [3]:
             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()
-
-        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')
-
-        else:
-            try:
-                scan_response = self._cc2650.recv_uart(0.01)
-
-            except RecvTimeout:
-                self.log_verbose('[CC2650]', 'scan_callback response timeout, no device')
-                return False
-
-        if scan_response is None:
-            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:
@@ -2131,163 +2127,215 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
         addr_type = response.addr_type
         address_s = cc2650.address_str(address)
 
-        connect_response = None
-        ins = bytearray()
+        self.log_info(DEVICE_CONNECTING, address_s)
 
-        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()
+        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)
 
-        for retry in range(5):
+        connected = False
+
+        # send connect command
+        if direct_connect is True:
+
+            # send device mac and addrType
             try:
-                self.log_verbose('[CC2650]', 'connect att_write', '0x'+str.upper(ins.hex()))
-                self._cc2650.send("bytes", bytes(ins))
+                self._cc2650.send("bytes", bytes(connect_ins))
 
-            except RecvTimeout:
-                self.log_verbose('[CC2650]', 'connect send fail')
-                continue
+            except SerialTimeoutException as e:
+                raise RecvTimeout('device CC2650 connect fail') from e
+                return None
 
-            else:
+            # connection establish done?
+            for retry_recv_ack in range(10):
                 try:
-                    connect_response = self._cc2650.recv_uart(2)
-                    print('!!connect_response:', list(connect_response))
+                    con_done = self._cc2650.recv_uart(timeout = 0.5)
+                    # print("con_done = ", con_done)
+
                 except RecvTimeout:
-                    self.log_verbose('[CC2650]', 'connect response timeout')
-                    if retry < 5:
-                        self.log_verbose('[CC2650]', 'connect retry')
-                        continue
-                else:
+                    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:
+                    # connection establish done?
+                    for retry_recv_ack in range(5):
+                        try:
+                            # send device mac and addrType
+                            self._cc2650.send("bytes", bytes(connect_ins))
+                            sleep(1.5)
+                            con_done = self._cc2650.recv_uart(timeout = 0.1)
 
-        if connect_response is None:
-            return False
+                        except RecvTimeout:
+                            self.log_info("recv connection timeout, retry... ")
+                            continue
 
-        pack_len = connect_response[0]
-        connect_ack = connect_response[1:pack_len+1]
-        
-        if connect_ack == [3]:
-            connect_response_hex = ''.join(format(i, '02X') for i in connect_response)
-            self.log_verbose('[CC2650]', 'connect success', '0x'+connect_response_hex)
-            # 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
-        
-        self.log_verbose('[CC2650]', 'connect fail')
-        return False
+                        # is the ack valid?
+                        if con_done is None:
+                            self.log_info("recv connection timeout, retry... ")
+                            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
+        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)
+
+        return ret
 
     @synchronized
     def disconnect(self, device: int, force=False) -> bool:
+        self.log_info(DEVICE_DISCONNECTING, device)
+
         ins = bytearray()
-
-        ins.append(0x08)
-        ins.append(0x01) #length
+        ins.append(8)
+        ins.append(1) #length
         ins.append(0xF1)
-        self._interface.flush_input()
-
-        for _ 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
-
-        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)
-        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:
-            self.log_verbose('[CC2650]', 'write_characteristic', device, str(hex(handle).upper()))
-            self.log_verbose('[CC2650]', 'write_characteristic att_write','0x'+str.upper(ins.hex()))
+            # print('send_disconnect',bytes(ins))
             self._cc2650.send("bytes", bytes(ins))
-            
-        except SerialTimeoutException:
-            self.log_verbose('[CC2650]', 'write_characteristic send fail')
+
+        except RecvTimeout:
+            self.log_warn('disconnect time out')
+            return False
+
+        except RuntimeError as e:
+            self.log_warn('suppressed error', str(e))
+            return False
 
         else:
-            try:
-                write_response = self._cc2650.recv_uart(0.5)
-
-            except RecvTimeout:
-                self.log_verbose('[CC2650]', 'write_characteristic response timeout')
-
-        if write_response is None:
-            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)
+            sleep(0.01)
             return True
 
-        self.log_verbose('[CC2650]', 'write_characteristic fail')
-        return False
+        finally:
+            self.log_info(DEVICE_DISCONNECTED, device)
+
+            # reset single 2650 after disconnected
+            self.reset_internal()
+            self.reset_hardware()
+            self._interface.flush()
 
     @synchronized
     def read_characteristic(self, device: int, handle: int) -> Optional[bytes]:
-        read_response = None
-        ins = bytearray()
 
-        ins.append(0x07)
-        ins.append(0x02) #length
+        # print("read_characteristic, expect_data_length = ", expect_data_length)
+
+        ret = None
+        ins = bytearray()
+        ins.append(7)
+        ins.append(2) #length
         ins.append(handle)
         ins.append(0xF1)
-        self._interface.flush_input()
+
+        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)
+
 
         try:
-            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))
+            self._cc2650.send("bytes", bytes(data_array))
+            # print('send_write',bytes(data_array))
 
-        except SerialTimeoutException:
-            self.log_verbose('[CC2650]', 'read_characteristic send fail')
+        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
 
         else:
-            try:
-                read_response = self._cc2650.recv_uart(1)
+            pass
 
-            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)
+        self._interface.flush_input()
+        self._interface.flush_output()
 
     def set_notify(self, device: Union[int, Device], enable: bool):
         if isinstance(device, CompletedDevice):
@@ -2388,6 +2436,7 @@ 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]
 
@@ -2445,6 +2494,11 @@ 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/devlib/data.py

@@ -1383,8 +1383,8 @@ class EISZeroOneDataDecoder(RecDataDecoder):
 
     __slots__ = ('_message', '_cycle_number', '_start_return_data', '_time_stamp',
                  '_total_time_stamp', '_mode', '_cycle_start_time',
-                 '_mode_stop', '_last_time_stamp', '_last_delta', 
-                 '_cali_package', 'cali_coeff', '_ac_amp', '_mode',
+                 '_mode_stop', '_last_time_stamp', '_last_delta', '_cali_coeff',
+                 'cali_coeff', '_ac_amp', '_mode',
                  '_last_phase', '_first_phase_flag', '_show_data')
 
     def __init__(self, cali_coeff: bytes = None):
@@ -1402,224 +1402,209 @@ class EISZeroOneDataDecoder(RecDataDecoder):
         self._last_phase = 0
         self._first_phase_flag = 1
 
-        self._cali_package: Optional[bytes] = None
+        self._cali_coeff: Optional[bytes] = None
         self.cali_coeff: Optional[List[Tuple[int, int]]] = None
 
         self._show_data = False
 
-        if self._cali_package is None:
-            self._cali_package = cali_coeff
-            self.cali_coeff = self._decode_cali_coeff(self._cali_package)
+        if cali_coeff is not None:
+            self._cali_coeff = cali_coeff
+            self.cali_coeff = self._decode_cali_coeff(cali_coeff)
             
     @staticmethod
     def _decode_cali_coeff(cali_coeff: bytes) -> Optional[List[Tuple[int, int]]]:
-        if cali_coeff != b'':
-            cis_data_len = 20
-            cali_table = []
-            hsrtia_a = []
-            hsrtia_b = []
-            rolloff = []
-            phase_coeff = []
-            phase_offset = []
-
-            phase_coeff = numpy.zeros([8, 4], dtype = int)
-            phase_offset = numpy.zeros([8, 4], dtype = int)  
-
-            ########################################
-            # phase_coeff
-            # [[freq0, freq1, freq2, freq3] ----->gain0
-            #  [freq0, freq1, freq2, freq3] ----->gain1
-            #  [freq0, freq1, freq2, freq3] ----->gain2
-            #  [freq0, freq1, freq2, freq3] ----->gain3
+            #####################################################
+            # phase_coeff/phase_offset/hsrtia_a/hsrtia_b/rolloff
+            # [[gain0, g1, g2, g3] ----->最高頻
+            #  [gain0, g1, g2, g3] ----->中頻
+            #  [gain0, g1, g2, g3] ----->低頻
+            #  [gain0, g1, g2, g3] ----->最低頻
             # ]
-            #######################################
+            #####################################################
+        print('cali_coeff=', cali_coeff)
+        if cali_coeff != b'':
+            cali_table = []
+            hsrtia_a = numpy.zeros([4, 8], dtype = int) #hsrtia_a[freq][gain]
+            hsrtia_b = numpy.zeros([4, 8], dtype = numpy.int64) #hsrtia_b[freq][gain]
+            rolloff = numpy.zeros([4, 8], dtype = int) #rolloff[freq][gain]
+            phase_coeff = numpy.zeros([4, 8], dtype = int) #phase_coeff[freq][gain]
+            phase_offset = numpy.zeros([4, 8], dtype = int) #phase_offset[freq][gain]
+            cis_data_len = 20
 
-            #hstia=0
+            #gain=0
             cis_cali_packet = 1
             index = (cis_cali_packet - 1) * cis_data_len
-            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+2:index+6])[0])
-            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+6:index+14])[0])
-            rolloff.append(struct.unpack('>i', cali_coeff[index+14:index+18])[0])
+            hsrtia_a[0][0] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            hsrtia_b[0][0] = struct.unpack('>q', cali_coeff[index+5:index+13])[0]
+            rolloff[0][0]  = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
             cis_cali_packet = 2
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 0
-            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][1] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
-            
+            phase_coeff[0][0]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][0] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][0]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][0] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
             cis_cali_packet = 3
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 0
-            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
-            
-            #hstia=1
+            phase_coeff[2][0]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][0] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][0]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][0] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
+            #gain=1
             cis_cali_packet = 4
             index = (cis_cali_packet - 1) * cis_data_len
-            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+2:index+6])[0])
-            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+6:index+14])[0])
-            rolloff.append(struct.unpack('>i', cali_coeff[index+14:index+18])[0])
+            hsrtia_a[0][1] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            hsrtia_b[0][1] = struct.unpack('>q', cali_coeff[index+5:index+13])[0]
+            rolloff[0][1]  = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
             cis_cali_packet = 5
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 1
-            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][1] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
-            
+            phase_coeff[0][1]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][1] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][1]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][1] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
             cis_cali_packet = 6
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 1
-            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
+            phase_coeff[2][1]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][1] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][1]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][1] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
-            #hstia=2
+            #gain=2
             cis_cali_packet = 7
             index = (cis_cali_packet - 1) * cis_data_len
-            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+2:index+6])[0])
-            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+6:index+14])[0])
-            rolloff.append(struct.unpack('>i', cali_coeff[index+14:index+18])[0])
+            hsrtia_a[0][2] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            hsrtia_b[0][2] = struct.unpack('>q', cali_coeff[index+5:index+13])[0]
+            rolloff[0][2]  = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
             cis_cali_packet = 8
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 2
-            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][1] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
-            
+            phase_coeff[0][2]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][2] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][2]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][2] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
             cis_cali_packet = 9
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 2
-            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
+            phase_coeff[2][2]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][2] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][2]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][2] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
-            #hstia=3
+            #gain=3
             cis_cali_packet = 10
             index = (cis_cali_packet - 1) * cis_data_len
-            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+2:index+6])[0])
-            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+6:index+14])[0])
-            rolloff.append(struct.unpack('>i', cali_coeff[index+14:index+18])[0])
+            hsrtia_a[0][3] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            hsrtia_b[0][3] = struct.unpack('>q', cali_coeff[index+5:index+13])[0]
+            rolloff[0][3]  = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
             cis_cali_packet = 11
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 3
-            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][1] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
-            
+            phase_coeff[0][3]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][3] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][3]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][3] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
             cis_cali_packet = 12
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 3
-            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
+            phase_coeff[2][3]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][3] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][3]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][3] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
-            #hstia=4
+            #gain=4
             cis_cali_packet = 13
             index = (cis_cali_packet - 1) * cis_data_len
-            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+2:index+6])[0])
-            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+6:index+14])[0])
-            rolloff.append(struct.unpack('>i', cali_coeff[index+14:index+18])[0])
+            hsrtia_a[0][4] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            hsrtia_b[0][4] = struct.unpack('>q', cali_coeff[index+5:index+13])[0]
+            rolloff[0][4]  = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
             cis_cali_packet = 14
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 4
-            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][1] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
-            
+            phase_coeff[0][4]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][4] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][4]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][4] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
             cis_cali_packet = 15
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 4
-            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
+            phase_coeff[2][4]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][4] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][4]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][4] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
-            #hstia=5
+            #gain=5
             cis_cali_packet = 16
             index = (cis_cali_packet - 1) * cis_data_len
-            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+2:index+6])[0])
-            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+6:index+14])[0])
-            rolloff.append(struct.unpack('>i', cali_coeff[index+14:index+18])[0])
+            hsrtia_a[0][5] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            hsrtia_b[0][5] = struct.unpack('>q', cali_coeff[index+5:index+13])[0]
+            rolloff[0][5]  = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
             cis_cali_packet = 17
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 5
-            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][1] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
-            
+            phase_coeff[0][5]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][5] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][5]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][5] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
             cis_cali_packet = 18
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 5
-            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
+            phase_coeff[2][5]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][5] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][5]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][5] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
-            #hstia=6
+            #gain=6
             cis_cali_packet = 19
             index = (cis_cali_packet - 1) * cis_data_len
-            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+2:index+6])[0])
-            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+6:index+14])[0])
-            rolloff.append(struct.unpack('>i', cali_coeff[index+14:index+18])[0])
+            hsrtia_a[0][6] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            hsrtia_b[0][6] = struct.unpack('>q', cali_coeff[index+5:index+13])[0]
+            rolloff[0][6]  = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
             cis_cali_packet = 20
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 6
-            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][1] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
-            
+            phase_coeff[0][6]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][6] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][6]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][6] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
             cis_cali_packet = 21
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 6
-            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
+            phase_coeff[2][6]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][6] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][6]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][6] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
-            #hstia=7
+            #gain=7
             cis_cali_packet = 22
             index = (cis_cali_packet - 1) * cis_data_len
-            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+2:index+6])[0])
-            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+6:index+14])[0])
-            rolloff.append(struct.unpack('>i', cali_coeff[index+14:index+18])[0])
+            hsrtia_a[0][7] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            hsrtia_b[0][7] = struct.unpack('>q', cali_coeff[index+5:index+13])[0]
+            rolloff[0][7]  = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
             cis_cali_packet = 23
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 7
-            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][1] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
-            
+            phase_coeff[0][7]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[0][7] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[1][7]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[1][7] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
             cis_cali_packet = 24
             index = (cis_cali_packet - 1) * cis_data_len
-            g = 7
-            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+2:index+6])[0]
-            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+6:index+10])[0]
-            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+10:index+14])[0]
-            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+14:index+18])[0]
-            print('hsrtia_a', hsrtia_a)
-            print('hsrtia_b', hsrtia_b)
-            print('rolloff', rolloff)
+            phase_coeff[2][7]  = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[2][7] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[3][7]  = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[3][7] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
+            print('hsrtia_a')
+            print(hsrtia_a)
+            print('hsrtia_b')
+            print(hsrtia_b)
+            print('rolloff')
+            print(rolloff)
             print('phase_coeff')
             print(phase_coeff)
             print('phase_offset')
@@ -1634,10 +1619,10 @@ class EISZeroOneDataDecoder(RecDataDecoder):
 
     @property
     def name(self) -> AnyStr:
-        if self._cali_package is None:
+        if self._cali_coeff is None:
             return self.NAME
         else:
-            return self.NAME.encode() + b':' + self._cali_package
+            return self.NAME.encode() + b':' + self._cali_coeff
 
     def message(self) -> Optional[str]:
         ret = self._message
@@ -1649,16 +1634,16 @@ class EISZeroOneDataDecoder(RecDataDecoder):
         if len(data) < 18:
             return None
 
-        ch1 = struct.unpack('>i', data[1+3:5+3])[0]  # unit: 1/1000 nA
-        ch2 = struct.unpack('>i', data[5+3:9+3])[0]  # unit: mV
-        ch3 = struct.unpack('>i', data[9+3:13+3])[0]  # unit: kOm
+        ch1 = struct.unpack('>i', data[1+3:5+3])[0]
+        ch2 = struct.unpack('>i', data[5+3:9+3])[0]
+        ch3 = struct.unpack('>i', data[9+3:13+3])[0]
         time_stamp: float = struct.unpack('<I', data[13+3:17+3])[0]  # unit: ms
         cycle_number = struct.unpack('>H', data[17+3:19+3])[0]
         d19 = data[19+3]
         gain = data[20+3]
-        finishMode = (d19 & 0x80) >> 7  
-        ch4 = struct.unpack('<i', data[21+3:25+3])[0] # Amp[uV]
-        
+        finishMode = (d19 & 0x80) >> 7
+        ch4 = struct.unpack('<i', data[21+3:25+3])[0]
+
         notify_one = struct.unpack('<i', data[25+3:29+3])[0]
         notify_two = struct.unpack('<i', data[29+3:33+3])[0]
         notify_three = struct.unpack('<i', data[33+3:37+3])[0]
@@ -1680,61 +1665,59 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                 return None
             else:
                 if self.cali_coeff is not None and (self._mode == 0 or self._mode == 5):
-                    hsrtia_a = []
-                    hsrtia_b = []
-                    rolloff = []
                     phase_coeff, phase_offset, hsrtia_a, hsrtia_b, rolloff = self.cali_coeff[0]
 
                 if (self._mode == 0 or self._mode == 5):
-                    img = ch1
-                    real = ch2
-                    freq = ch3
+                    
+                    img = ch1 #img[ohm]
+                    real = ch2 #real[ohm]
+                    freq = ch3 #freq[10mHz]
                     fre_idx = 0
-                    voltage_amp = round(ch4 / 1000) # Amp[mV]
-                    rolloff_cali = rolloff[gain]
+                    voltage_amp = round(ch4 / 1000) #ch4=Amp[uV] #voltage_amp[mV]
+                    rolloff_cali = rolloff[0][gain]
 
                     voltage_mag = math.sqrt(img ** 2 + real ** 2) * (1 + freq ** 2 /  rolloff_cali ** 2 / 1e4)
-                    current = (voltage_mag ** 2 * hsrtia_a[gain] + voltage_mag * hsrtia_b[gain]) / 1e8 #[nA]
+                    current = (voltage_mag ** 2 * hsrtia_a[0][gain] + voltage_mag * hsrtia_b[0][gain]) / 1e8 #current[nA]
                     
                     if (current != 0):
-                        # impedance[mOhm] = voltage_amp[mv] * 1000000 / 1.414213 / current[nA]       #RMS=amp*SQRT(2), SQRT(2)=1.414213
+                        # impedance[mOhm] = voltage_amp[mV] * 1000000 / 1.414213 / current[nA]       #RMS=amp*SQRT(2), SQRT(2)=1.414213
                         impedance = voltage_amp * 707106.78 / current
                     else:
                         impedance = 0
 
                     raw_phase = math.atan2(img , real) * 180 / math.pi
 
-                    if (freq >= 1000000): # 10000 Hz
+                    if (freq >= 1000000): #10000Hz
                         fre_idx = 0
-                    elif (freq >= 10000): # 100 Hz
+                    elif (freq >= 10000): #100Hz
                         fre_idx = 1
-                    elif (freq >= 1000): # 10 Hz
+                    elif (freq >= 1000): #10Hz
                         fre_idx = 2
-                    elif (freq >= 1): # 0.01 Hz
+                    elif (freq >= 1): #0.01Hz
                         fre_idx = 3
                     
                     ideal_raw_phase = phase_coeff[gain][fre_idx] /1e10 * freq + phase_offset[gain][fre_idx] / 1e6
                     phase = raw_phase - ideal_raw_phase
                     phase = phase % 180 if phase % 180<=90 else phase % 180-180
 
-                    imag_after_cal = round(impedance * math.sin(phase * math.pi / 180))
-                    real_after_cal = round(impedance * math.cos(phase * math.pi / 180))
+                    imag_after_cal = impedance * math.sin(phase * math.pi / 180)
+                    real_after_cal = impedance * math.cos(phase * math.pi / 180)
 
                 if self._show_data:
                     if (self._mode == 0 or self._mode == 5):
                         print('|', '{:10}'.format(time_stamp),
                               '|', '{:5}'.format(delta),
-                              '|', '{:5}'.format(ch1),                            #raw_img
-                              '|', '{:5}'.format(ch2),                            #raw_real
-                              '|', '{:8}'.format(ch3 * 10), '[mHz]',              #Frequency [mHz]
-                              '|', '{:5}'.format(cycle_number),                   #cycle
-                              '|', '{:5}'.format(round(imag_after_cal)), '[Ohm]', #Z_imag [Ohm]
-                              '|', '{:5}'.format(round(real_after_cal)), '[Ohm]', #Z_real [Ohm]
-                              '|', '{:5}'.format(round(impedance)), '[Ohm]',      #Impedance [Ohm]
-                              '|', '{:5}'.format(round(phase*1000)), '[mdegree]', #Phase [millidegree]
-                              '|', '{:5}'.format(round(current)), '[nA]',         #Current [nA]
-                              '|', '{:1}'.format(gain),                           #gain
-                              '|', '{:1}'.format(finishMode),                     #finishMode
+                              '|', '{:5}'.format(img),
+                              '|', '{:5}'.format(real),
+                              '|', '{:9}'.format(freq*10), '[mHz]',
+                              '|', '{:5}'.format(cycle_number),
+                              '|', '{:5}'.format(round(imag_after_cal)), '[Ohm]', #Z_imag[Ohm]
+                              '|', '{:5}'.format(round(real_after_cal)), '[Ohm]', #Z_real[Ohm]
+                              '|', '{:5}'.format(round(impedance)), '[mOhm]',
+                              '|', '{:5}'.format(round(phase*1000)), '[mdegree]',
+                              '|', '{:10}'.format(round(current)), '[nA]',
+                              '|', '{:1}'.format(gain),
+                              '|', '{:1}'.format(finishMode),
                               '@', str(self.device), '|', flush = True)
 
                         print('|', '{:10}'.format(time_stamp),
@@ -1742,7 +1725,7 @@ class EISZeroOneDataDecoder(RecDataDecoder):
                               '|', '{:5}'.format(notify_one),
                               '|', '{:5}'.format(notify_two),
                               '|', '{:5}'.format(notify_three),
-                              '|', '{:5}'.format(voltage_amp),                    #amp[mV]
+                              '|', '{:5}'.format(voltage_amp), '[mV]',
                               '|', flush = True)
                         pass
                     else:
@@ -1764,28 +1747,30 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             self._mode_stop = 0
 
         ret = RecordingData(self.device, int(time_stamp * 1000 / 2), 0)
-        if self._mode == 0 or self._mode == 5:
-            ret.append_data(0, ch1)                     #raw_img
-            ret.append_data(1, ch2)                     #raw_real
-            ret.append_data(2, ch3 * 10)                #Frequency [mHz]
-            ret.append_data(3, cycle_number)            #cycle
-            ret.append_data(4, imag_after_cal)          #Z_imag [Ohm]
-            ret.append_data(5, real_after_cal)          #Z_real [Ohm]
-            ret.append_data(6, round(impedance))        #Impedance [Ohm]
-            ret.append_data(7, round(phase*1000))       #Phase [millidegree]
-            ret.append_data(8, round(current))          #Current [nA]
-            ret.append_data(9, gain)                    #gain
+        if self._mode == 0 or self._mode == 5:          #EIS/CF Mode
+            ret.append_data(0, img)
+            ret.append_data(1, real)
+            ret.append_data(2, freq * 10)               #[mHz]
+            ret.append_data(3, cycle_number)
+            ret.append_data(4, round(imag_after_cal))   #Z_imag [Ohm]
+            ret.append_data(5, round(real_after_cal))   #Z_real [Ohm]
+            ret.append_data(6, round(impedance))        #[mOhm]
+            ret.append_data(7, round(phase*1000))       #[millidegree]
+            ret.append_data(8, round(current))          #[nA]
+            ret.append_data(9, gain)
             
             #debug data
             ret.append_data(10, notify_one)
             ret.append_data(11, notify_two)
             ret.append_data(12, notify_three)
-            ret.append_data(13, voltage_amp)            #amp[mV]
+            ret.append_data(13, voltage_amp)            #mV
+
+
 
         else:                                           #CV Mode
-            ret.append_data(0, ch1)                     #Iin     [nA]
-            ret.append_data(1, ch2)                     #Vset    [nV]
-            ret.append_data(2, ch3)                     #Vout    [nV]
+            ret.append_data(0, ch1)                     #Iin     [nA]?
+            ret.append_data(1, ch2)                     #Vset    [nV]?
+            ret.append_data(2, ch3)                     #Vout    [nV]?
             ret.append_data(3, cycle_number)
 
         if cycle_number != self._cycle_number:

python/biopro/devlib/instruction.py

@@ -372,7 +372,6 @@ class InternalInstruction(SingleInstruction):
 
         else:
             data = [v for v in data]
-            print('cdr data:', data)
 
         parser.parse_instruction(context, data)
 
@@ -777,12 +776,6 @@ class InstructionDataContent(InstructionContent):
 
     def parse_instruction(self, context: Scope, buffer: List[int], offset: int = 0, shift: int = 0) -> Tuple[int, int]:
 
-        print('self._width', self._width)
-        print('self._width.size', self._width.size)
-
-        for _ in range (self._width.size - len(buffer)):
-            buffer.append(0)
-
         if self._width.is_array:
             raise NotImplementedError()
 
@@ -796,20 +789,21 @@ class InstructionDataContent(InstructionContent):
 
                 value = 0
 
-                for i in range(self._width.size):
-                    if self._width.little_endian:
-                        value |= (buffer[offset] << (1 * i))
-                    else:
-                        value = (value << 8) | buffer[offset]
+                if self._width.size == 1:
+                    value = buffer[offset]
                     offset += 1
 
+                else:
+                    for i in range(self._width.size):
+                        if self._width.little_endian:
+                            value |= (buffer[offset] << (1 * i))
+                        else:
+                            value = (value << 8) | buffer[offset]
+                        offset += 1
+
                 if len(self._value) > 0:
                     context[self._value] = value
 
-                    print('value',value)
-                    print('hex(value)',hex(value))
-                    
-
                 return offset, 0
 
             else:
@@ -827,6 +821,7 @@ class InstructionDataContent(InstructionContent):
             if self._width.bytes_unit:
                 if shift != 0:
                     offset += 1
+
                 return offset + self._width.size, 0
 
             else:

python/biopro/devlib/library.py

@@ -1403,6 +1403,20 @@ 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/impl/cc2650/cc2650.py

@@ -3697,6 +3697,7 @@ 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
@@ -3708,8 +3709,6 @@ 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]:
@@ -3725,28 +3724,27 @@ class CC2650Central(LoggerFlag):
                 return None
 
     def _recv_event(self, timeout: Optional[float] = 1) -> Optional[list]:
-        packet = self._recv_byte()
+        code = self._recv_byte()
+        # print("code = ", code)
 
-        if packet is None:
+        if code is None:
             return None
 
         length = self._recv_byte()
-        len_b = _struct.pack("B", length)
-        data = b''
+        # print('code::',code,'length::',length)
 
         _start = _time()
+        data = b''
 
         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())
+            ret = self._recv_bytes(length - len(data))
+            # print("ret = ", ret)
 
-            if packets is not None:
-                data += packets
+            if ret is not None:
+                data += ret
             elif timeout is not None and _time() - _start > timeout:
                 raise RecvTimeout()
 
-        data = len_b + data
         self._interface.flush()
         return list(data)
 
@@ -3762,7 +3760,5 @@ 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/interface_uart.py

@@ -53,8 +53,6 @@ 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,9 +15,6 @@ 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',
 }
@@ -63,14 +60,6 @@ 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():
@@ -90,9 +79,6 @@ 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,7 +5,6 @@ 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
 
@@ -68,13 +67,6 @@ 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]
@@ -170,12 +162,4 @@ 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/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 =  project_info
+        project_id = None
+        _project = None
+        if project_info != None:
+            _project = json.loads(project_info)
+            self.database_process.put_queue(['project_insert', device_id, _project])
+            result = self._queue_ds_dict[int(device_id)].get()
+            if result[0] == 'project_id':
+                project_id =  result[1]
 
         # while len(self._configurations) <= device_id:
         #     self._configurationsappend(None)

python/biopro/server/database.py

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

python/biopro/server/main.py

@@ -35,7 +35,6 @@ 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
@@ -863,32 +862,20 @@ class ControlServer(SocketServer, ControlServerAPI):
     @logging_info
     def device_update_calibration(self, device: int) -> Union[bool, str]:
         connect_device = self.device_manager.get_device(device)
-        if connect_device == None:
-            return
-        mac_address = address_str(connect_device.mac_address)
-        device = Device.get_device({"mac_address": mac_address})
+        mac_address = connect_device.mac_address
+
         try:
-            if connect_device.library.name.startswith('Elite_EIS_1.1'):
-                # update calibration version
-                connect_device._device.update_cali_version()
-                # check if is first time or calibration version is different
-                if connect_device._device._cali_version == -1 or (device.calibration_version != connect_device._device._cali_version):
-                    # get calibration info from device
-                    connect_device.calibration_info('EISZeroOne')
-                    # update_calibration_info
-                    Device.update_device(
-                        { "mac_address": mac_address }, 
-                        {
-                            'calibration': connect_device.calibration ,
-                            'calibration_version': connect_device._device._cali_version
-                        }
-                    )
-                else:
-                    connect_device._device._coeff = device.calibration
+            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(
-                mac_address,
+                address_str(mac_address),
                 {   
                     'connect_id': -1,
                     'connect_status': 'idle',
@@ -900,6 +887,14 @@ class ControlServer(SocketServer, ControlServerAPI):
             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
 
     @logging_info
@@ -1107,7 +1102,6 @@ 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)
 
@@ -1120,11 +1114,10 @@ class ControlServer(SocketServer, ControlServerAPI):
                 info = self.file_manager.save(device, filename)
             
             if device.occupied_by_project != None:
-                project = self.project_manager.get(device.occupied_by_project).info_pass_data_server()
-                project_meta_id = MetaProjectInfo.create_project_meta(project)      
-                
+                project = json.dumps(self.project_manager.get(device.occupied_by_project).info_pass_data_server())
+
             with client:
-                client.update_device_configuration(device, info.meta_file, value, project_meta_id)
+                client.update_device_configuration(device, info.meta_file, value, project)
 
     def _device_set_disable_cache(self, device: CompletedDevice, disable):
         if disable:

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

@@ -106,17 +106,13 @@
     "GENERAL_HS_RTIA": {
       "description": "High speed rtia gain",
       "record_meta": true,
-      "initial": 8,
+      "initial": 4,
       "value": [
         0,
         1,
         2,
         3,
-        4,
-        5,
-        6,
-        7,
-        8
+        4
       ],
       "on_change": "set_general_hs_rtia"
     },

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

@@ -106,17 +106,13 @@
     "GENERAL_HS_RTIA": {
       "description": "High speed rtia gain",
       "record_meta": true,
-      "initial": 8,
+      "initial": 4,
       "value": [
         0,
         1,
         2,
         3,
-        4,
-        5,
-        6,
-        7,
-        8
+        4
       ],
       "on_change": "set_general_hs_rtia"
     },

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

@@ -106,17 +106,13 @@
     "GENERAL_HS_RTIA": {
       "description": "High speed rtia gain",
       "record_meta": true,
-      "initial": 8,
+      "initial": 4,
       "value": [
         0,
         1,
         2,
         3,
-        4,
-        5,
-        6,
-        7,
-        8
+        4
       ],
       "on_change": "set_general_hs_rtia"
     },

update_db_package.sh

@@ -27,12 +27,3 @@ 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