- change calibration column type bytea

- save calibration info into db compare with cali version

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/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:
@@ -549,6 +550,24 @@ class CC2650Device(Device):
             self.update_calibration_info(device_type)
 
         return self._coeff
+    
+    def update_cali_version(self) -> bool:
+        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:
+            sleep(0.1)
+            # receive
+            version = self._master.read_characteristic(self.device_id,CC2650MasterDevice.RETURN_HANDLE)
+            self._cali_version = struct.unpack('<H', version[2:4])[0]
+            return True
+
 
     def update_calibration_info(self, device_type: str):
         """ get device calibration info """
@@ -662,7 +681,7 @@ class CC2650Device(Device):
         elif device_type == 'EISZeroOne':
             i = 1
             request_times = 0
-            while i < 13:
+            while i <= 24:
                 try:
                     # send
                     code = self._encode_instruction(DeviceInstruction.TYP_CIS, DeviceInstruction.CIS_CALI, i)
@@ -1995,6 +2014,9 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
             # self._interface.flush()
             return False
 
+        if len(scan_response) <= 1:
+            print('len(scan) <= 1, scan_response:', list(scan_response))
+            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)

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_coeff',
-                 'cali_coeff', '_ac_amp', '_mode',
+                 '_mode_stop', '_last_time_stamp', '_last_delta', 
+                 '_cali_package', 'cali_coeff', '_ac_amp', '_mode',
                  '_last_phase', '_first_phase_flag', '_show_data')
 
     def __init__(self, cali_coeff: bytes = None):
@@ -1402,14 +1402,14 @@ class EISZeroOneDataDecoder(RecDataDecoder):
         self._last_phase = 0
         self._first_phase_flag = 1
 
-        self._cali_coeff: Optional[bytes] = None
+        self._cali_package: Optional[bytes] = None
         self.cali_coeff: Optional[List[Tuple[int, int]]] = None
 
         self._show_data = False
 
-        if cali_coeff is not None:
-            self._cali_coeff = cali_coeff
-            self.cali_coeff = self._decode_cali_coeff(cali_coeff)
+        if self._cali_package is None:
+            self._cali_package = cali_coeff
+            self.cali_coeff = self._decode_cali_coeff(self._cali_package)
             
     @staticmethod
     def _decode_cali_coeff(cali_coeff: bytes) -> Optional[List[Tuple[int, int]]]:
@@ -1422,19 +1422,19 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             phase_coeff = []
             phase_offset = []
 
-            phase_coeff = numpy.zeros([4, 4], dtype = int)
-            phase_offset = numpy.zeros([4, 4], dtype = int)  
+            phase_coeff = numpy.zeros([8, 4], dtype = int)
+            phase_offset = numpy.zeros([8, 4], dtype = int)  
 
             ########################################
             # phase_coeff
-            # [[gain0, g1, g2, g3] ----->最高頻
-            #  [gain0, g1, g2, g3] ----->中頻
-            #  [gain0, g1, g2, g3] ----->低頻
-            #  [gain0, g1, g2, g3] ----->最低頻
+            # [[freq0, freq1, freq2, freq3] ----->gain0
+            #  [freq0, freq1, freq2, freq3] ----->gain1
+            #  [freq0, freq1, freq2, freq3] ----->gain2
+            #  [freq0, freq1, freq2, freq3] ----->gain3
             # ]
             #######################################
 
-            #Lv[0] 160k
+            #hstia=0
             cis_cali_packet = 1
             index = (cis_cali_packet - 1) * cis_data_len
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0])
@@ -1444,20 +1444,20 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             cis_cali_packet = 2
             index = (cis_cali_packet - 1) * cis_data_len
             g = 0
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][1] = 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[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
             
-            #Lv[1] 20k
+            #hstia=1
             cis_cali_packet = 4
             index = (cis_cali_packet - 1) * cis_data_len
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0])
@@ -1467,20 +1467,20 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             cis_cali_packet = 5
             index = (cis_cali_packet - 1) * cis_data_len
             g = 1
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][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[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
-            #Lv[2] 5k
+            #hstia=2
             cis_cali_packet = 7
             index = (cis_cali_packet - 1) * cis_data_len
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0])
@@ -1490,20 +1490,20 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             cis_cali_packet = 8
             index = (cis_cali_packet - 1) * cis_data_len
             g = 2
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][1] = 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[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
-            #Lv[3] 200R
+            #hstia=3
             cis_cali_packet = 10
             index = (cis_cali_packet - 1) * cis_data_len
             hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0])
@@ -1513,19 +1513,110 @@ class EISZeroOneDataDecoder(RecDataDecoder):
             cis_cali_packet = 11
             index = (cis_cali_packet - 1) * cis_data_len
             g = 3
-            phase_coeff[0][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[0][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[1][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[1][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            phase_coeff[g][0] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][1] = 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[2][g] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
-            phase_offset[2][g] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
-            phase_coeff[3][g] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
-            phase_offset[3][g] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+            phase_coeff[g][2] = struct.unpack('>i', cali_coeff[index+1:index+5])[0]
+            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
 
+            #hstia=4
+            cis_cali_packet = 13
+            index = (cis_cali_packet - 1) * cis_data_len
+            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0])
+            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+5:index+13])[0])
+            rolloff.append(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+1:index+5])[0]
+            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][1] = 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+1:index+5])[0]
+            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
+            #hstia=5
+            cis_cali_packet = 16
+            index = (cis_cali_packet - 1) * cis_data_len
+            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0])
+            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+5:index+13])[0])
+            rolloff.append(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+1:index+5])[0]
+            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][1] = 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+1:index+5])[0]
+            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
+            #hstia=6
+            cis_cali_packet = 19
+            index = (cis_cali_packet - 1) * cis_data_len
+            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0])
+            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+5:index+13])[0])
+            rolloff.append(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+1:index+5])[0]
+            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][1] = 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+1:index+5])[0]
+            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
+
+            #hstia=7
+            cis_cali_packet = 22
+            index = (cis_cali_packet - 1) * cis_data_len
+            hsrtia_a.append(struct.unpack('>i', cali_coeff[index+1:index+5])[0])
+            hsrtia_b.append(struct.unpack('>q', cali_coeff[index+5:index+13])[0])
+            rolloff.append(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+1:index+5])[0]
+            phase_offset[g][0] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][1] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][1] = 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+1:index+5])[0]
+            phase_offset[g][2] = struct.unpack('>i', cali_coeff[index+5:index+9])[0]
+            phase_coeff[g][3] = struct.unpack('>i', cali_coeff[index+9:index+13])[0]
+            phase_offset[g][3] = struct.unpack('>i', cali_coeff[index+13:index+17])[0]
             print('hsrtia_a', hsrtia_a)
             print('hsrtia_b', hsrtia_b)
             print('rolloff', rolloff)
@@ -1543,10 +1634,10 @@ class EISZeroOneDataDecoder(RecDataDecoder):
 
     @property
     def name(self) -> AnyStr:
-        if self._cali_coeff is None:
+        if self._cali_package is None:
             return self.NAME
         else:
-            return self.NAME.encode() + b':' + self._cali_coeff
+            return self.NAME.encode() + b':' + self._cali_package
 
     def message(self) -> Optional[str]:
         ret = self._message

python/biopro/server/main.py

@@ -35,6 +35,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
@@ -862,20 +863,32 @@ 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
-
+        if connect_device == None:
+            return
+        mac_address = address_str(connect_device.mac_address)
+        device = Device.get_device({"mac_address": 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')           
-
+            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
         except BaseException as e:
             # reset device info in db
             DeviceAPI.updateByMac(
-                address_str(mac_address),
+                mac_address,
                 {   
                     'connect_id': -1,
                     'connect_status': 'idle',
@@ -887,14 +900,6 @@ 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

python/res/devlib/json/Elite_EIS_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"
     },

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"
     },

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"
     },

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