[update] check spi routine

This reverts commit cd60e14cbe.

python/biopro/device/device_cc2650.py

@@ -536,7 +536,7 @@ class CC2650Device(Device):
             self._master.log_warn('device', self.device_id, 'update_battery_info no response')
 
         else:
-            if data is not None and len(data) == 4 :
+            if data is not None and len(data) > 2 :
                 battery = struct.unpack('<H', data[1:3])[0]
                 if battery is not None:
                     self._battery = battery
@@ -2035,6 +2035,7 @@ class CC2650SingleMasterCentralDevice(CC2650MasterDevice, Synchronized):
         # 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

python/biopro/devlib/data.py

@@ -882,21 +882,18 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         if len(data) < 18:
             return None
 
-        current = struct.unpack('>i', data[1:5])[0]  # unit: 1/1000 nA
-        voltage = struct.unpack('>i', data[5:9])[0]  # unit: mV
-        impedance = struct.unpack('>i', data[9:13])[0]  # unit: kOm
-        time_stamp: float = struct.unpack('<I', data[13:17])[0]  # unit: ms
-        cycle_number = struct.unpack('>H', data[17:19])[0]
-        finish_mode_falg = data[19]
+        mem_cnt = data[1]
+        time_stamp: float = struct.unpack('<I', data[4:8])[0]  # unit: ms 0x18030000
+        current = struct.unpack('<i', data[8:12])[0]  # unit: nA
+        voltage = struct.unpack('<i', data[12:16])[0]  # unit: uV
+        impedance = struct.unpack('<i', data[16:20])[0]  # unit: mOm
+        cycle_number = struct.unpack('<H', data[20:22])[0]
+        finish_mode_falg = data[22]
+        battery = struct.unpack('<i', data[23:27])[0]
+        elite_notify_times = data[27]
 
-        mem_wrong_information = struct.unpack('>i', data[40:40+4])[0]
-
-        # print('decode', list(data[20:]))
-        mem_wrong = data[40]
-        mem_retry_cnt = data[41]
-        mem_green_wrong = data[42]
-        mem_green_retry_cnt = data[43]
-        ram_num = data[44]
+        mem_wrong_information = struct.unpack('<i', data[43:47])[0] # mem_wrong_information = green retry, green wrong, red retry, red wrong
+        ram_num = data[47]
         broken_flag = data[-1]
 
         if (finish_mode_falg & 0b11110000 == 0b10100000):
@@ -917,10 +914,13 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
                 print("error timeStamp full data:", list(data), datetime.now(), '\n')
                 return None
             else:
-                # print('|', time_stamp, '|', delta, '|', current, '|', voltage, '|', impedance,
+                # print('|', time_stamp, '|', delta, '|', int(time_stamp * 1000 / 2),
+                #       '|', current, '|', voltage, '|', impedance,
                 #       '|', cycle_number, '|', finishMode, '@', str(self.device))
+
                 # print('|', '{:10}'.format(time_stamp),
-                #       '|', '{:10}'.format(delta),
+                #       '|', '{:4}'.format(delta),
+                #       '|', '{:10}'.format(int(time_stamp * 1000 / 2)),
                 #       '|', '{:10}'.format(current),
                 #       '|', '{:10}'.format(voltage),
                 #       '|', '{:10}'.format(impedance),
@@ -928,13 +928,9 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
                 #       '|', '{:1}'.format(finishMode),
                 #       '@', str(self.device), '|')
 
-                # print('|', '{:5}'.format(mem_wrong),
-                #       '|', '{:5}'.format(mem_retry_cnt),
-                #       '|', '{:5}'.format(mem_green_wrong),
-                #       '|', '{:5}'.format(mem_green_retry_cnt),
-                #       '|', '{:5}'.format(mem_wrong_information),
-                #       '|', '{:5}'.format(ram_num),
-                #       '|', '{:5}'.format(broken_flag),
+                # print('|', '{:5}'.format(mem_wrong_information),
+                #       '|', '{:2}'.format(ram_num),
+                #       '|', '{:2}'.format(broken_flag),
                 #       '@', str(self.device), '|')
                 pass
 
@@ -949,16 +945,20 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         ret.append_data(1, voltage)
         ret.append_data(2, impedance)
         ret.append_data(3, cycle_number)
+        ret.append_data(4, battery)
+        ret.append_data(5, elite_notify_times)
+        ret.append_data(6, mem_cnt)
 
         # memoryboard information
-        # ret.append_data(4, mem_wrong)
-        # ret.append_data(5, mem_retry_cnt)
-        # ret.append_data(6, mem_green_wrong)
-        # ret.append_data(7, mem_green_retry_cnt)
-        ret.append_data(4, ram_num)
-        ret.append_data(5, broken_flag)
-        ret.append_data(6, mem_wrong_information)
-        # ret.append_data(4, ram_num)
+        ret.append_data(7, ram_num)
+        ret.append_data(8, broken_flag)
+        try:
+            ret.append_data(9, mem_wrong_information)
+            # print('append_data success, mem_wrong_information:', mem_wrong_information, hex(mem_wrong_information))
+        except:
+            print('append_data fail, mem_wrong_information:', mem_wrong_information, hex(mem_wrong_information))
+
+
     
         if cycle_number != self._cycle_number:
             # notify cycle_number change
@@ -1456,12 +1456,12 @@ class EISZeroOneDataDecoder(RecDataDecoder):
         if len(data) < 18:
             return None
 
-        ch1 = struct.unpack('>i', data[1:5])[0]  # unit: 1/1000 nA
-        ch2 = struct.unpack('>i', data[5:9])[0]  # unit: mV
-        ch3 = struct.unpack('>i', data[9:13])[0]  # unit: kOm
-        time_stamp: float = struct.unpack('<I', data[13:17])[0]  # unit: ms
-        cycle_number = struct.unpack('>H', data[17:19])[0]
-        d19 = data[19]
+        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
+        time_stamp: float = struct.unpack('<I', data[13+3:17+3])[0]  # unit: ms
+        cycle_number = struct.unpack('>H', data[17+3:19+3])[0]
+        d19 = data[19+3]
         gain = (d19 & 0x0F)
         finishMode = (d19 & 0x80) >> 7        
         

python/biopro/impl/ext_mem.py

@@ -24,8 +24,10 @@ def zero_buffer(size: int) -> List[int]:
     return [0] * size
 
 class MultiExtMemSpiInterface(LowLevelHardwareInterface):
-    MEM_INS_MARKED = [MEM_INS_WRITE, 0, 2, 1, 1]
-    MEM_INS_RESET  = [MEM_INS_WRITE, 0, 2, 1, 1, 0, 0xFF]
+    MEM_INS_MARKED1 = [MEM_INS_WRITE, 0, 2, 0x5A, 0xA5]
+    MEM_INS_MARKED2 = [MEM_INS_WRITE, 0, 6, 0x5A, 0xA5]
+    MEM_INS_MARKED3 = [MEM_INS_WRITE, 0, 10, 0x5A, 0xA5]
+    # MEM_INS_RESET  = [MEM_INS_WRITE, 0, 2, 1, 1, 0, 0xFF]
 
     __slots__ = ('_selector', '_wait_for_first_data', '_spi', '_tx_buffer_header', '_tx_buffer_data',
                  'pin_busy', 'pin_mem_req', 'pin_mem_sel', 'pin_ram_sel',
@@ -44,11 +46,11 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
 
         self._elite_data_len = 40
         self._mem_header_len = 3
-        self._mem_tailer_len = 8
+        self._mem_tailer_len = 6
         self._single_data_len = self._elite_data_len + self._mem_header_len + self._mem_tailer_len
 
         # buffer
-        self._tx_buffer_header = [0] * 11
+        self._tx_buffer_header = [0] * 19
         self._tx_buffer_data = [0] * (self._single_data_len * 10 + 3)
 
         # memory control pin
@@ -165,6 +167,52 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         print("read red data times", self._read_red_times)
         return data
 
+    def _compare_green_data_addr_and_flag(self, data: Union[bytes, List[int]], device: int):
+
+        green_data_section1 = data[3:7]
+        green_data_section2 = data[7:11]
+        green_data_section3 = data[11:15]
+        green_data_section = []
+
+        if green_data_section1 == green_data_section2:
+            green_data_section = green_data_section1
+
+        elif(green_data_section2 == green_data_section3 or green_data_section1 == green_data_section3):
+            print("green data not equal: = ", data[3:15])
+            print("green data print:", data, device, datetime.now())
+            green_data_section = green_data_section3
+
+        else:
+            print("green data not equal: = ", data[3:15])
+            print("green data print:", data, device, datetime.now())
+            green_data_section = green_data_section3 # use last data
+
+
+        return green_data_section
+
+    def _print_ram_all_data(self):
+        addr = 0
+        red_length = int(7000 / 2)
+        tx_temp = [0] * (red_length + 3)
+
+        while True:
+            tx_temp[0] = MEM_INS_READ
+            tx_temp[1] = ((addr >> 8) & 0xFF)
+            tx_temp[2] = (addr & 0xFF)
+
+            ram_data = []
+            ram_data = self._spi.send_byte(tx_temp)
+            ram_data[0:3] = [255, 255, 255]
+            print(list(ram_data), len(ram_data), addr)
+            addr += len(ram_data) - 3
+
+            if (7000 < addr + len(ram_data)):
+                del ram_data
+                break
+        print()
+
+        return
+
     def recv_memory(self, device: int) -> Optional[bytes]:
         self.pin_busy.output(False)
 
@@ -191,7 +239,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                 self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
                 if (self._head_wrong_cnt[device] <= 5): # print 5 times
                     print('data_first[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
-                    print(list(data[0:7]))
+                    print(list(data))
 
             data[0:3] = [255, 255, 255]
             # ----------------------------------------------------------------------------------------------
@@ -210,13 +258,13 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             #     self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
             #     if (self._head_wrong_cnt[device] < 10):
             #         print('data_first[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
-            #         print(list(data_first[0:7]))
+            #         print(list(data_first))
 
             # if (data_second[0] != 255 or data_second[1] != 255 or data_second[2] != 255):
             #     self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
             #     if (self._head_wrong_cnt[device] < 10):
             #         print('data_second[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
-            #         print(list(data_second[0:7]))
+            #         print(list(data_second))
 
             # if (data_first[3:] == data_second[3:]):
             #     data = data_first
@@ -228,59 +276,47 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             #     data = self.compare_green_data(data_first, data_second, data_third, len(tx_h))
             # ----------------------------------------------------------------------------------------------
 
-            # debug use
-            # green_data = []
-            # green_data = data
-            # print("_[Debug] @ spi green data = ", green_data)
+            green_data_section = self._compare_green_data_addr_and_flag(data, device)
 
-            length = (data[3] << 8) | data[4]
-            header = data[7]
-            elite_data_len = data[9]
+            length = (green_data_section[0] << 8) | green_data_section[1]
+            header = data[15]
+            elite_data_len = data[17]
+
+            if length <= 12:
+                if length < 12:
+                    print("length < 12")
+                    print("green data print:", data, device, datetime.now())
+
+                # if length == 0:
+                #     self._print_ram_all_data()
 
-            if length <= 4:
-                # print("length <= 4")
-                # print("green data print:", data, device, datetime.now())
                 return None
 
-            if data[5] != 0 or data[6] != 0:
+            if green_data_section[2] != 0xA5 or green_data_section[3] != 0x5A:
                 # give a default length if the data header did not update
-                length = 7000
-                print("green data: is not [0,0], = ", data[5:7])
+                print("green data: is not [0xA5, 0x5A], = ", data[5:7])
                 print("green data print:", data, device, datetime.now())
                 return None
 
-            if (length >= 7000):
+            if (length >= 4000):
                 flag_print = True
                 print("green data: big length:", length)
 
             if (header != 255):
                 flag_print = True
                 print("green data: header is not 255: ", header)
+                # self._print_ram_all_data()
 
             if (elite_data_len != self._elite_data_len):
                 flag_print = True
                 print("green data: length is not", self._elite_data_len, ": ", elite_data_len)
 
             if (flag_print):
-                print("green data print:", data, device, datetime.now())
+                print("green data print:", data, device, datetime.now(), '\n')
 
-            # neulive
-            # address += len(data) - 11
-            # tx_d = self._tx_buffer_data
-            # red_length = len(tx_d)
-
-            # elite read all data of ram
-            # address = 4
-            # red_length = length - 1 
-            # tx_d = [0] * red_length
-
-            address = 4
+            address = 12
             red_length = int(length / 2)
-            tx_d = [0] * red_length
-
-            # elite read len(_tx_buffer_data) byte
-            # address = 4
-            # tx_d = self._tx_buffer_data
+            tx_d = [0] * (red_length + 3)
 
             while True:
                 tx_d[0] = MEM_INS_READ
@@ -319,22 +355,60 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
                     address += len(data) - 3
                     del data
 
-            # print("_[Debug] @ spi recv data rx = ")
+            # last_index = 0
+            # print("_[Debug] @ spi recv data rx, ram_select:", self._pin_ram_sel_value[device], ",", datetime.now())
             # for i in range(0, len(rx), self._single_data_len):
-            #     print(rx[i:i+self._single_data_len])
+            #     last_index = i
+            #     # print(rx[i:i+self._single_data_len])
+            #     if i == 0:
+            #         print(rx[0:8], 'ram:', rx[47])
+
+            # if last_index != 0:
+            #     print(rx[last_index:last_index+8], 'ram:', rx[last_index+47])
             # print()
 
             # /* 
             #  * red data formate:
             #  * ramHdr, ramHdr, ramHdr,                                   (3B)
             #  * 255, #, data_length,                                      (3B)
-            #  * data,                                                     (20B)
+            #  * data,                                                     (40B)
             #  * red_wrong, red_retry_cnt, green_wrong, green_retry_cnt,   (4B)
-            #  * 255, #, data_length,                                      (3B) 
+            #  * check_num,                                                (1B)
             #  *                                                                  */
 
+            # read again if check num is wrong
+            index = 0
+            check_number_print = False
+            for i in range(0, len(rx), self._single_data_len):
+                check_sum = sum(rx[i : i + self._single_data_len - 1]) & 0b11111111
+                # print(check_sum, rx[i + self._single_data_len - 1])
+
+                if (check_sum != rx[i + self._single_data_len - 1]):
+                    # print('check_sum wrong, origin value:', 'check_sum =', check_sum, rx[i : i + self._single_data_len])
+                    tx_d = [0] * (self._single_data_len + 3)
+                    address = 12 + self._single_data_len * index
+                    tx_d[0] = MEM_INS_READ
+                    tx_d[1] = ((address >> 8) & 0xFF)
+                    tx_d[2] = (address & 0xFF)
+
+                    data = []
+                    data = self._spi.send_byte(tx_d)
+                    data[0:3] = [255, 255, 255]
+                    rx[i : i + self._single_data_len] = data[3:]
+                    print('check_sum wrong, read again:', 'check_sum =', check_sum, rx[i : i + self._single_data_len])
+                    check_number_print = True
+                index = index + 1
+
+            if check_number_print:
+                print('check_sum wrong:', device, datetime.now())
+                for i in range(0, len(rx), self._single_data_len):
+                    print(rx[i:i+self._single_data_len])
+                print()
+
             # mark read
-            self._spi.send_byte(self.MEM_INS_MARKED)
+            self._spi.send_byte(self.MEM_INS_MARKED1)
+            self._spi.send_byte(self.MEM_INS_MARKED2)
+            self._spi.send_byte(self.MEM_INS_MARKED3)
 
         except BaseException as e:
             print(e)

python/biopro/project/action.py

@@ -9,7 +9,6 @@ class Action():
         self._duration = action.get('duration', None)
         self._goto = action.get('goto', None)
         self._cycle = action.get('cycle', None)
-        
         self._instruction = None
 
         self.update_instruction()
@@ -19,12 +18,16 @@ class Action():
         return self._type
 
     def update_instruction(self):
+        instruction_type = self._type
+        if instruction_type == 'stop':
+            instruction_type = 'interrupt'
+
         self._instruction = {
             "device_instruction": {
                 "header": "call_instruction",
                 "device": self._target,
                 "arguments": {
-                    "instruction": self._type,
+                    "instruction": instruction_type,
                 }
             },
             "device_parameter": {

python/biopro/project/condition.py

@@ -3,7 +3,6 @@ from time import time
 
 class Condition():
     def __init__(self, id, condition):
-        print('condition', id, condition)
         self._id = id
         self._type = condition['type']
         self._comparsion = condition['comparsion']
@@ -12,12 +11,15 @@ class Condition():
     @property
     def id(self):
         return self._id
+
     @property
     def type(self):
         return self._type
+
     @property
     def comparsion(self):
         return self._comparsion
+
     @property
     def value(self):
         return self._value
@@ -38,11 +40,11 @@ class Condition():
             "smaller": lambda a, b: a < b,
         }
 
-        # print('x','y',x, y,type(x),type(y))
         return cases[operator](x, y)
 
     def match_or_not(self, **kwargs):
-       return self.method_mapping(self.type)()
+        # print(self._type, self._comparsion, self._value)
+        return getattr(self, self.type)(**kwargs)
        
     def absolute_time(self, **kwargs):
         now = time()
@@ -51,7 +53,13 @@ class Condition():
         return self.compareWith(self.comparsion, int(now), int(time_condition))
 
     def relative_time(self, **kwargs):
+        project_start_time = kwargs['project_start_time']
+        task_start_time = kwargs['task_start_time']
+        delay_time = kwargs['delay_time']
         now = time()
+
+        time_diff = int(now - project_start_time - delay_time)
+        return self.compareWith(self.comparsion, time_diff, int(self._value))
     
     def device(self, **kwargs):
         print('device')

python/biopro/project/project.py

@@ -8,6 +8,7 @@ from datetime import datetime
 from collections import deque
 from biopro.device.manager import DeviceManager
 from biopro.text import *
+from copy import copy
 
 class Project(threading.Thread):
   def __init__(self, project, device_manager: DeviceManager, mqttThread = None, name="project"):
@@ -19,9 +20,8 @@ class Project(threading.Thread):
     self._start_time = None
 
     self._task_manager = TaskManager(self._project['taskList'])
+    self._stop = False
 
-    self._start_time = None
-    
   @property
   def desc(self) -> str:
     return self._project['desc']
@@ -45,34 +45,38 @@ class Project(threading.Thread):
   def run(self):
       self._start_time = time.time()
 
-      while True:
+      while not self._stop:
         # current task
-        for task in self._task_manager.get_check_task_list():
+        task_check_list = copy(self._task_manager.get_check_task_list())
+        delay_time = 0
+        for task in task_check_list:
           # [<match_condition>, ...]
-          match_condition_list = task.check_condition('time')
+          match_condition_list = task.check_condition(project_start_time = self._start_time, delay_time = delay_time)
           # [[<match_action>, ...], ...]
           match_action_list = task.get_match_action_list(match_condition_list)
           
           for action_list in match_action_list:
             for action in action_list:
               if action.type == 'start':
+                task.reset_start_time()
                 self._task_manager.set_current_task(task)
               task.do_action(action)
-              
+          
+          now = time.time()
           while len(task.instruction_list) > 0:
-            instruction = task.instruction_list.pop(0)
-            if instruction.get('device', None) != None:
-              device = self._device_manager.get_device(self.device[instruction['device']]['connectDevice']['device_address'])
+              instruction = task.instruction_list.pop(0)
+              if instruction.get('device', None) != None:
+                device = self._device_manager.get_device(self.device[instruction['device']]['connectDevice']['device_address'])
 
-              if device is None:
-                  raise RuntimeError(DEVICE_NOT_FOUND, device)
-                
-              # print(instruction['header'], *instruction['arguments'].values())
-              getattr(device, instruction['header'])(*instruction['arguments'].values()) 
+                if device is None:
+                    raise RuntimeError(DEVICE_NOT_FOUND, device)
 
+                getattr(device, instruction['header'])(*instruction['arguments'].values()) 
+          delay_time += (time.time() - now)
         time.sleep(self._time_interval)
+
   def stop(self):
-    return
+    self._stop = True
 
   def close(self):
-    return
+    self._stop = True

python/biopro/project/task.py

@@ -1,3 +1,4 @@
+from typing import List
 from .condition import Condition
 from .action import Action
 from time import time
@@ -6,8 +7,8 @@ class Task:
   def __init__(self, task):
     self._task = task
 
-    self._condition_list = []
-    self._action_list = []
+    self._condition_list:List[Condition] = []
+    self._action_list:List[Action] = []
 
     self._start_time = time()
     self._idle_time = []
@@ -16,7 +17,6 @@ class Task:
     self._last_time = None
 
     self._instruction_list = []
-
     self.setup()
   
   def setup(self) -> None:
@@ -105,6 +105,9 @@ class Task:
   @property
   def next(self) -> str:
     return self._task['next']
+  
+  def reset_start_time(self):
+    self._start_time = time()
     
   def get_parameter_set_by_device(self, device):
      return [parameter_set for parameter_set in self.parameter_set.values() if device == parameter_set['target']]
@@ -151,9 +154,6 @@ class Task:
     return map(lambda condition: [x for x in self._action_list if condition.id in x.get_condition_list()], match_condition_list)
 
   def do_action(self, action): 
-    # # match_action = [x for x in self._action_list if condition_id in x.get_condition_list()]
-
-    # for action in match_action:
     for instruction in action.get_instruction_list():
       self._instruction_list.append(instruction)
 
@@ -164,5 +164,6 @@ class Task:
     }
     return statuses[status]
 
-  def check_condition(self, type):
-    return [condition for condition in self._condition_list if  condition.match_or_not()]
+  def check_condition(self, **kwargs):
+    kwargs['task_start_time'] = self._start_time
+    return [condition for condition in self._condition_list if  condition.match_or_not(**kwargs)]

python/biopro/project/task_manager.py

@@ -1,5 +1,5 @@
 from json import loads as json_parse, dumps as _json_stringify
-from typing import Dict, Optional, Any
+from typing import Dict, List, Optional, Any
 from xml.dom.expatbuilder import parseString
 import paho.mqtt.client as mqtt
 from biopro.text import *
@@ -29,7 +29,7 @@ class TaskManager():
     def get_task(self, task_id):
       return self._task_list[task_id]
 
-    def get_check_task_list(self):
+    def get_check_task_list(self) -> List[Task]:
       return self._need_to_check_task_list
 
     def get_current_task(self) -> Task:

python/biopro/recording/file.py

@@ -8,6 +8,7 @@ import gc
 
 from biopro.util.json import JSON
 from biopro.util.stack import print_exception
+from biopro.util.logger import calculate_time
 from .data import RecordingData
 from .loader import *
 
@@ -19,6 +20,8 @@ from statistics import mean
 import random
 # from numba import jit
 
+from copy import copy
+
 def json_stringify(o) -> str:
     return _json_stringify(o, separators=(',', ':'))
 
@@ -370,6 +373,45 @@ class RecordingMetaFile(JsonSerialize):
             self._database.put_queue(['data_meta_write', meta_data, self._device_id, str(self._file_uuid), self._id_db])
             # database.put_queue(['data_meta_write', self, meta_data, _path, self._id_db])
         return None
+    
+    def update_subfile_time_size(self, database = None):
+        meta_data = {
+            'channels': str(self._channel_mask.channels()),
+            'size': str(self._size),
+            'time_duration': str(self._last_time),
+            'uuid': str(self._file_uuid),
+        }
+        _path = str(self._filepath).replace('/', '^')
+
+        if database is not None :
+            self._database = database
+            self._database.put_queue(['data_meta_write', meta_data, self._device_id, str(self._file_uuid), self._id_db])
+            # database.put_queue(['data_meta_write', self, meta_data, _path, self._id_db])
+        return None
+    
+    def update_subfile_raw(self, database = None):
+        meta_data = {
+            'raw_data': self._recording_sub_file,
+        }
+        _path = str(self._filepath).replace('/', '^')
+
+        if database is not None :
+            self._database = database
+            self._database.put_queue(['data_meta_write', meta_data, self._device_id, str(self._file_uuid), self._id_db])
+            # database.put_queue(['data_meta_write', self, meta_data, _path, self._id_db])
+        return None
+    
+    def update_subfile_mini(self, database = None):
+        meta_data = {
+            'mini_data': self._recording_sub_mini,
+        }
+        _path = str(self._filepath).replace('/', '^')
+
+        if database is not None :
+            self._database = database
+            self._database.put_queue(['data_meta_write', meta_data, self._device_id, str(self._file_uuid), self._id_db])
+            # database.put_queue(['data_meta_write', self, meta_data, _path, self._id_db])
+        return None
                 
     @property
     def filename(self) -> str:
@@ -517,11 +559,6 @@ class RecordingMetaFile(JsonSerialize):
             'start_time': str(_start_time),
         }
 
-        # if database is not None:
-        #     database.data_raw_create(self, f, raw_data, _channel)
-
-        # self._recording_file_ch[_channel]
-
         return f, raw_data
 
     def new_recording_mini(self, _channel: int, _start_time, scale, database = None) -> 'RecordingMini':
@@ -567,9 +604,6 @@ class RecordingMetaFile(JsonSerialize):
             'start_time': str(_start_time),
         }
 
-        # if database is not None:
-        #     database.data_mini_create(self, f, mini_data, _channel, scale)
-
         return f, mini_data
 
     def clear_recording_file(self):
@@ -628,15 +662,6 @@ class RecordingMetaFile(JsonSerialize):
             'device':        self._device,
         }
 
-        # d = self._device
-
-        # if d is not None:
-        #     ret['device'] = {
-        #         'device_name':    d.device_name,
-        #         'device_address': list(d.mac_address),
-        #         'serial_number':  d.serial_number.as_json(),
-        #     }
-
         return ret
 
 
@@ -792,14 +817,10 @@ class RecordingFile:
                 'end_time': str(_end_time),
                 'size': str(self._size)
             }
-            # if self._meta_file._id_db == 0:
-            #     _path = str(self._meta_file.filepath).replace('/', '^')
-            #     self._database.put_queue(['data_meta_id_get_by_path', _path])
-            #     # self._meta_file._id_db = self._database.put_queue(['data_meta_id_get_by_path', _path])
+
             if self._meta_file._id_db != 0:
                 _data['parent'] = self._meta_file._id_db
             self._database.put_queue(['data_raw_update', self._id_db, self._channel, _data])
-            # self._database.put_queue(['data_raw_update', self._id_db, self._channel, _data])
         self._status = False
         return None
 
@@ -965,10 +986,7 @@ class RecordingMini:
                 'end_time': str(_end_time),
                 'size': str(self._size)
             }
-            # if self._meta_file._id_db == 0:
-            #     _path = str(self._meta_file.filepath).replace('/', '^')
-            #     self._database.put_queue(['data_meta_id_get_by_path', _path])
-            #     # self._meta_file._id_db = self._database.put_queue(['data_meta_id_get_by_path', _path])
+
             if self._meta_file._id_db != 0:
                 _data['parent'] = self._meta_file._id_db
             self._database.put_queue(['data_mini_update', self._id_db, self._channel, _data])
@@ -996,7 +1014,8 @@ class RecordingFileWriter:
                  '_data_value_ch', '_close', '_data_mini_ch',
                  '_mini_scale_list', '_time_real_time', '_data_rl', '_data_db',
                  '_raw_save', '_mini_save', '_data_time_ch', '_data_value_ch_for_rl',
-                 '_data_time_ch_for_rl', '_device_id', '_send_data', '_data_mqtt_ch', '_id_db_save')
+                 '_data_time_ch_for_rl', '_device_id', '_send_data', '_data_mqtt_ch', '_id_db_save', '_raw_create_not_done',
+                 '_mini_create_not_done')
 
     def __init__(self, meta: RecordingMetaFile, device_id, database = None):
         self._meta = meta
@@ -1017,7 +1036,9 @@ class RecordingFileWriter:
 
         self._raw_save = {
             'id': {},
-            'data': {}
+            'data': {},
+            'end_time': {},
+            'size': {}
         }
         self._mini_save = {
             '10': {
@@ -1069,12 +1090,15 @@ class RecordingFileWriter:
 
         # splitting
         self.splitting_threshold_time = 30 * 60 * 1000  # one minute
-        self.splitting_threshold_size = 4 * 16 * 1024  #  16 * 16KB
+        self.splitting_threshold_size = 16 * 1024  #  16 * 16KB
 
         self._writer_batch_size = 8192 
 
         self._splitting_size = None
 
+        self._raw_create_not_done = True
+        self._mini_create_not_done = True
+
 
     @property
     def meta_file(self) -> RecordingMetaFile:
@@ -1290,7 +1314,8 @@ class RecordingFileWriter:
                     self._data_db[c].append(str(v))
                     self._time_now = int(t)
         return
-
+    
+    # @calculate_time(1)
     def write(self, data: Union[bytes, RecordingData, List[bytes], List[RecordingData]], mqtt_thread) -> int:
         # check size
         ths = self.splitting_threshold_size
@@ -1349,42 +1374,54 @@ class RecordingFileWriter:
                 
                 self.get_data_iter(d, mqtt_thread)
 
-            data_save = False
-            mini_save = False
             if len(self._recording_file_dict) > 0:
                 for ch in self._data_db.keys():
                     if self._time_now - self._time_real_time[ch] > 1000000:
                         self._send_data[ch] = True
                         self._time_real_time[ch] = self._time_now
-                    # # if self._time_now - self._time_real_time[ch] > 500000:
-                    # self._data_rl[ch].append(str(self._time_now))
-                    # mes = ' '.join(self._data_rl[ch])
-                    # # print(mes)
-                    # # if mqtt_thread is not None:
-                    # #     mqtt_thread.publish('data_server/device_data_stream/' + str(self._device_id) + '/' + str(ch), mes)
-                    # # mqtt_queue.put([self._device_id, ch, mes])
-                    # mqtt_thread[ch].on_message(mes)
-                    # self._data_rl[ch].clear()
-                    # # self._time_real_time[ch] = self._time_now
-                    if self._time_now - self._time[ch] > 2000000:
+
+            for ch in self._recording_file_dict:
+                if self._recording_file_dict[ch]._id_db == 0:
+                    return None
+            
+            for ch in self._data_db.keys():
+                for scale in self._mini_scale_list:
+                    if  self._recording_mini_dict[str(scale)][ch]._id_db == 0:
+                        return None
+            
+            if self._raw_create_not_done :
+                self._raw_create_not_done = False
+                self._meta.update_subfile_raw(database = self._database)
+            
+            if self._mini_create_not_done :
+                self._mini_create_not_done = False
+                self._meta.update_subfile_mini(database = self._database)
+
+            data_save = False
+            mini_save = False
+            if len(self._recording_file_dict) > 0:
+                for ch in self._data_db.keys():
+                    if self._time_now - self._time[ch] > 5000000:
                         if self._recording_file_dict[ch]._status:
                             _data = ' '.join(self._data_db[ch])
                             write_sz = self._recording_file_dict[ch].write(_data, self._channel_list)
-                            sz = sz + write_sz
                             self._raw_save['data'][ch] = _data
                             self._raw_save['id'][ch] = self._recording_file_dict[ch]._id_db
-                            data_save = True
+                            self._raw_save['end_time'][ch] = self._time_now
+                            self._raw_save['size'][ch] = self._recording_file_dict[ch]._size
                             self._data_db[ch].clear()
                             self._time[ch] = self._time_now
-                            self._splitting_size += sz
                             self._meta._last_time = self._time_now
-                            self._recording_file_dict[ch].update_endtime(self._time_now)
+                            self._splitting_size += write_sz
+                            data_save = True
                     if len(self._data_mini_ch[ch]['1000']['mean']) >= 10:
                         mini_save = True
                         for scale in self._mini_scale_list:
+                            str_mean = [str(int) for int in self._data_mini_ch[ch][str(scale)]['mean']]
+                            data_mean = str(self._data_mini_ch[ch][str(scale)]['start_time']) + ' ' + ' '.join(str_mean) + '"***"'
                             self._mini_save[str(scale)]['id'][ch] = self._recording_mini_dict[str(scale)][ch]._id_db
                             self._mini_save[str(scale)]['start_time'][ch] = str(self._data_mini_ch[ch][str(scale)]['start_time'])
-                            self._mini_save[str(scale)]['data_mean'][ch] = self._data_mini_ch[ch][str(scale)]['mean'].copy()
+                            self._mini_save[str(scale)]['data_mean'][ch] = data_mean
                             # self._mini_save[str(scale)]['data_random'][ch] = self._data_mini_ch[ch][str(scale)]['random'].copy()
                             # self._mini_save[str(scale)]['data_bar'][ch] = self._data_mini_ch[ch][str(scale)]['bar'].copy()
                             self._recording_mini_dict[str(scale)][ch].write(self._mini_save[str(scale)]['data_mean'][ch])
@@ -1395,26 +1432,22 @@ class RecordingFileWriter:
 
                 if data_save is True:
                     if self._database is not None:
-                        # print('raw_save', self._raw_save['id'])
-                        # print('id_save', self._id_db_save)
-                        self._database.put_queue(['data_raw_recording', self._raw_save['id'], self._channel_list, self._raw_save['data'], self._id_db_save])
-                        self._meta.update_subfile(database = self._database)
+                        recording_input = ['data_raw_recording_new', copy(self._raw_save['id']), copy(self._channel_list), copy(self._raw_save['data']), copy(self._raw_save['end_time']), copy(self._raw_save['size'])]
+                        self._database.put_queue(recording_input)
+                        self._meta.update_subfile_time_size(database = self._database)
                 if mini_save is True:
                     if self._database is not None:
                         for scale in self._mini_scale_list:
-                            self._database.put_queue(['data_mini_recording', self._mini_save[str(scale)]['id'], self._channel_list, self._mini_save[str(scale)]['start_time'], self._mini_save[str(scale)]['data_mean']])
-                        self._meta.update_subfile(database = self._database)
-            
-
+                            self._database.put_queue(['data_mini_recording_new', copy(self._mini_save[str(scale)]['id']), self._channel_list, copy(self._mini_save[str(scale)]['data_mean'])])
+                        self._meta.update_subfile_time_size(database = self._database)
         del data
 
         return None
 
 
     def _switch_recording_file(self):
-        # if self._recording_file is not None:
-        #     self._recording_file.close()
-        
+        self._raw_create_not_done = True
+
         if len(self._recording_file_dict) > 0:
             for ch in self._recording_file_dict.keys():
                 self._id_db_save[ch] = self._recording_file_dict[ch]._id_db
@@ -1433,16 +1466,16 @@ class RecordingFileWriter:
 
         if self._database is not None:
             self._database.put_queue(['data_raw_create', raw_data_dict, self._channel_list, self._device_id])
-            # self._database.put_queue(['data_raw_create', self._meta, self._recording_file_dict, raw_data_dict, self._channel_list])
 
         self._meta._last_time = self._time_now
-        self._meta.update_subfile(database = self._database)
+        # self._meta.update_subfile(database = self._database)
 
         self._splitting_size = 0
 
         return None
 
     def _switch_recording_mini(self, scale):
+        self._mini_create_not_done = True
         
         if len(self._recording_mini_dict[str(scale)]) > 0:
             for ch in self._recording_mini_dict[str(scale)].keys():
@@ -1460,14 +1493,12 @@ class RecordingFileWriter:
 
         if self._database is not None:
             self._database.put_queue(['data_mini_create', mini_data_dict, self._channel_list, scale, self._device_id])
-            # self._database.put_queue(['data_mini_create', self._meta, self._recording_mini_dict[str(scale)], mini_data_dict, self._channel_list, scale])
             
         self._meta._last_time = self._time_now
-        self._meta.update_subfile(database = self._database)
+        # self._meta.update_subfile(database = self._database)
         return None
 
     def update_meta_id(self, _id):
-        # print('update meta')
         self._meta._id_db = _id
         return None
     

python/biopro/server/data.py

@@ -126,6 +126,9 @@ class DataServer(SocketServer, DataAPI):
         self.database_process = DataBaseProcess('data_server', self.log_verbose, self._queue_db, self._queue_ds_dict, self._queue_db_error)
         self.database_process.start()
 
+        self._no_data_total_duration = 0
+        self._recv_memory_cost_time = 0
+
     @logging_info
     def setup(self):
         self._available_channel.clear()
@@ -669,7 +672,13 @@ class DataServer(SocketServer, DataAPI):
                 print("q size= ", self._configurations[device]._queue_rec.qsize())
 
             self._configurations[device].put_rec_queue(data)
+            self._no_data_total_duration = 0
             ret = True
+        else:
+            time_diff = time() - self._recv_memory_cost_time
+            self._no_data_total_duration += time_diff
+            print('data is None', device, datetime.now(), self._no_data_total_duration)
+        self._recv_memory_cost_time = time()
 
         return ret
 
@@ -909,7 +918,7 @@ class DeviceDataRuntime(DataRuntime):
 
     __slots__ = ( '_start_time', '_data_counter', '_last_data_counter', '_data_ch',
                     '_data_ch_time', '_mqtt_send_data_ch_level', '_timer', '_timer_of_not_send',
-                    '_get_rec_data', '_cycle_start_time', '_time_stamp_list', '_prev_data', '_prev_delta_time', '_prev_time_stamp', '_task_fininsh')
+                    '_get_rec_data', '_cycle_start_time', '_time_stamp_list', '_prev_data', '_prev_delta_time', '_prev_time_stamp', '_task_fininsh', '_check_spi_routine_timer')
 
     def __init__(self, server: DataServer, device: int, meta_file: RecordingMetaFile, data_format: AnyStr):
         super().__init__(server, device, meta_file, data_format)
@@ -922,6 +931,7 @@ class DeviceDataRuntime(DataRuntime):
         self._mqtt_send_data_ch_level = {}
 
         self._timer = None #int(time() * 10)
+        self._check_spi_routine_timer = None #int(time() * 10)
 
         self._timer_of_not_send = None
         self._get_rec_data = False
@@ -1147,6 +1157,7 @@ class SpiRuntimeThread(ServerThread):
         self._time_stamp = 0.0
         self._interval = 0.045
         self._timer = time()
+        self._check_spi_routine_timer = time()
         self._read_memory_board_idx = 0
 
     def setup(self) -> None:
@@ -1163,7 +1174,6 @@ class SpiRuntimeThread(ServerThread):
     def routine(self, event = None) -> None: # routine 50 ms
         server = self._server
         self._timer = time()
-
         sync = server.get_spi_obj()
 
         # select channel
@@ -1180,19 +1190,22 @@ class SpiRuntimeThread(ServerThread):
         run_time = time() - self._timer
 
         if run_time > 0.045:
-            print('time, recv_data_form_spi_routine_time', time(), run_time)
+            # print('time, recv_data_form_spi_routine_time', time(), run_time)
             run_time = 0.045
 
-        if server.sync_started:
-            event.wait(self._interval - run_time)
-            sync.set_pin_mem_sel(True)
-            sleep(0.005)
-            return
-        else:
-            event.wait(self._interval - run_time)
-            sync.set_pin_mem_sel(True)
-            self.close()
-            return
+        if run_time >= 0.030:
+            print('time, recv_data_form_spi_routine_time >= 0.030', 'device:', c, datetime.now(), time(), run_time)
+        
+        spi_routine_run_time = time() - self._check_spi_routine_timer
+        if spi_routine_run_time > 1:
+            print('spi_routine_time > 1', 'device:', c, datetime.now(), spi_routine_run_time)
+        self._check_spi_routine_timer = time()
+
+        event.wait(self._interval - run_time)
+        sync.set_pin_mem_sel(True)
+        sleep(0.005)
+
+        return
 
 class RecRuntimeThread(ServerThread):
     def __init__(self, server: DataServer):

python/biopro/server/database.py

@@ -23,6 +23,7 @@ import biopro.server._identify
 from time import time
 
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from biopro.util.logger import calculate_time
 
 _RUNTIME_COMPILE = False
 
@@ -51,7 +52,7 @@ class DataBaseProcess(Process):
         self._api_token = None
         self._api_header = None
         self.log_verbose = log_verbose
-        self._executor = ThreadPoolExecutor(max_workers=4)
+        self._executor = ThreadPoolExecutor(max_workers=8)
 
         self._psql_multi_thread = None
         self._psql_conn_pool = None
@@ -63,6 +64,14 @@ class DataBaseProcess(Process):
 
         self._is_close = False
 
+
+        self._meta_write_sql_str = None
+
+        self._data_raw_create_sql_str = None
+        self._data_raw_update_sql_str = None
+        self._data_raw_recording_sql_str = 'UPDATE "public"."%s_recording_data_raws" SET data = concat(data, %s), end_time=%s, size=%s where id = %s'
+        self._data_mini_recording_sql_str = 'UPDATE "public"."%s_recording_data_minis" SET data_mean = concat(data_mean, %s) where id = %s'
+
     @property
     def db_host(self) -> str:
         return self._db_host
@@ -150,7 +159,8 @@ class DataBaseProcess(Process):
         if callable(getattr(self, do)):
             getattr(self, do)(*args)
         return None
-    
+
+    @calculate_time(1)
     def data_meta_write(self, _data: JSON_OBJECT, device_id, _uuid = None, _id = None):
         if _id > 0:
             sql_str = 'UPDATE "public"."recording_data_metas" SET '
@@ -253,6 +263,7 @@ class DataBaseProcess(Process):
         # _conn.close()
         return None
 
+    # @calculate_time()
     def data_meta_get(self, _path = None, _id = None):
         if _id is not None:
             sql_str = 'SELECT * FROM "public"."recording_data_metas" WHERE id = %s'
@@ -287,6 +298,7 @@ class DataBaseProcess(Process):
         # _conn.close()
         return None
 
+    # @calculate_time()
     def data_meta_id_get_by_path(self, _path = None):
         ret = None
         if _path is not None:
@@ -308,33 +320,29 @@ class DataBaseProcess(Process):
         # _conn.close()
         return None
 
+    # @calculate_time()
     def data_raw_create(self, _data_dict, _channel_list, device_id):
-        for _channel in _channel_list:
-            sql_str = 'INSERT INTO "public"."' + str(_channel) + '_recording_data_raws" ('
-            sql_set = []
-
-            key_list = _data_dict[_channel].keys()
+        if self._data_raw_create_sql_str == None:
+            sql_str_list = []
+            key_list = _data_dict[_channel_list[0]].keys()
             key_str = ','.join(key_list)
-            sql_set = list(map(lambda x: str(x), _data_dict[_channel].values()))
             values = ','.join(['%s'] * len(key_list))
-
-            sql_str = sql_str + key_str + ') VALUES (' + values + ') RETURNING id'
-            sql_cursor = self._psql_conn.cursor()
-
-            try:
-                sql_cursor.execute(sql_str, sql_set)
-            except RuntimeError as e:
-                print('data_raw_create error', e)
-                self._psql_conn.commit()
-                sql_cursor.close()
-                self._queue_error.put(device_id)
-            finally:
-                self._queue_ds[int(device_id)].put(['update_raw_dict_id', _data_dict[_channel]['uuid'], _channel, int(sql_cursor.fetchone()[0])])
-                self._psql_conn.commit()
-                sql_cursor.close()
+            sql_str_list = ['INSERT INTO "public"."{channel}_recording_data_raws" (', key_str, ') VALUES (', values, ') RETURNING id']
+            self._data_raw_create_sql_str = ''.join(sql_str_list)
+        try:
+            with self._psql_conn as conn:
+                    with conn.cursor() as sql_cursor:
+                        for _channel in _channel_list:
+                            sql_set = list(map(lambda x: str(x), _data_dict[_channel].values()))
+                            sql_cursor.execute(self._data_raw_create_sql_str.format(channel = _channel), sql_set)
+                            self._queue_ds[int(device_id)].put(['update_raw_dict_id', _data_dict[_channel]['uuid'], _channel, int(sql_cursor.fetchone()[0])])
+        except (psycopg2.Error, RuntimeError) as e:
+            print('data_raw_create error', e)
+            self._queue_error.put(device_id)
 
         return True
 
+    # @calculate_time()
     def data_raw_update(self, _id, _channel, _data: JSON_OBJECT):
         sql_str = 'UPDATE "public"."' + str(_channel) + '_recording_data_raws" SET '
         sql_set = []
@@ -352,37 +360,36 @@ class DataBaseProcess(Process):
         sql_cursor.execute(sql_str, sql_set)
         self._psql_conn.commit()
         sql_cursor.close()
-        
         return None
 
-    def data_raw_recording(self, _id_dict, _channel_list, _data_dict,  _id_db_save):
-        para_list = []
+    # @calculate_time()
+    def data_raw_recording(self, _id_dict, _channel_list, _data_dict, _id_db_save):
         try:
-            ### execute way
-            # with self._psql_conn as conn:
-            #     with conn.cursor() as sql_cursor:
-            #         for _channel in _channel_list:
-            #             temp_id = _id_dict[_channel]
-            #             if temp_id == 0:
-            #                 temp_id = _id_db_save[_channel]
-            #             # print(_channel, temp_id)
-            #             sql_str = 'UPDATE "public"."%s_recording_data_raws" SET data = concat(data, %s) where id = %s'
-            #             sql_set = [_channel, _data_dict[_channel] + '"***"', temp_id]
-            #             sql_cursor.execute(sql_str, sql_set)
-            ### execute_batch
             with self._psql_conn as conn:
                 with conn.cursor() as sql_cursor:
-                    sql_str = 'UPDATE "public"."%s_recording_data_raws" SET data = concat(data, %s) where id = %s'
+                    para_list = []
                     for _channel in _channel_list:
-                        temp_id = _id_dict[_channel]
-                        if temp_id == 0:
-                            temp_id = _id_db_save[_channel]
-                        para_list.append((_channel, _data_dict[_channel] + '"***"', temp_id))
-                    execute_batch(sql_cursor,sql_str, para_list)
+                        temp_id = _id_dict[_channel] if _id_dict[_channel] != 0 else _id_db_save[_channel]
+                        para_list.append([_channel, _data_dict[_channel] + '"***"', temp_id])
+                    execute_batch(sql_cursor, self._data_raw_recording_sql_str, para_list)
         except psycopg2.Error as e:
             print('recording error', e)
         return None
-
+    
+    @calculate_time(1)
+    def data_raw_recording_new(self, _id_dict, _channel_list, _data_dict, _end_time_dict, _size_dict):
+        try:
+            para_list = []
+            for _channel in _channel_list:
+                para_list.append([_channel, _data_dict[_channel] + '"***"', _end_time_dict[_channel], _size_dict[_channel], _id_dict[_channel]])
+            with self._psql_conn as conn:
+                with conn.cursor() as sql_cursor:
+                    execute_batch(sql_cursor, self._data_raw_recording_sql_str, para_list)
+        except psycopg2.Error as e:
+            print('recording error', e)
+        return None
+    
+    # @calculate_time()
     def data_mini_create(self, _data_dict, _channel_list, _scale, device_id):
         for _channel in _channel_list:
             sql_str = 'INSERT INTO "public"."' + str(_channel) + '_recording_data_minis" ('
@@ -416,6 +423,7 @@ class DataBaseProcess(Process):
         # _conn.close()
         return True
 
+    # @calculate_time()
     def data_mini_recording(self, _id_dict, _channel_list, _start_time_dict, _data_mean_dict):
         with self._psql_conn as conn:
             with self._psql_conn.cursor() as sql_cursor:
@@ -435,9 +443,23 @@ class DataBaseProcess(Process):
         for _channel in _channel_list:
             del _start_time_dict[_channel], _data_mean_dict[_channel]
         gc.collect()
-        
+
         return True
     
+    @calculate_time(1)
+    def data_mini_recording_new(self, _id_dict, _channel_list, _data_mean_dict):
+        try:
+            para_list = []
+            for _channel in _channel_list:
+                para_list.append([_channel, _data_mean_dict[_channel], _id_dict[_channel]])
+            with self._psql_conn as conn:
+                with conn.cursor() as sql_cursor:
+                    execute_batch(sql_cursor, self._data_mini_recording_sql_str, para_list)
+        except psycopg2.Error as e:
+            print('recording error', e)
+        return None
+
+    # @calculate_time()
     def data_mini_update(self, _id, _channel, _data: JSON_OBJECT):
         sql_str = 'UPDATE "public"."' + str(_channel) + '_recording_data_minis" SET '
         sql_set = []
@@ -457,3 +479,74 @@ class DataBaseProcess(Process):
         sql_cursor.close()
 
         return True
+
+    def data_meta_update_raw_empty_channel(self, meta_id, channel_list):
+        try:
+            sql_str = "UPDATE recording_data_metas SET raw_data = jsonb_set(raw_data, '{%s}', '[]'), mini_data = jsonb_set(mini_data, '{%s}', '{\"10\": [], \"100\": [], \"1000\": []}') WHERE id = %s;"
+            sql_set = []
+            for channel in channel_list:
+                sql_set.append([channel, channel, meta_id])
+            
+            with self._psql_conn as conn:
+                with conn.cursor() as sql_cursor:
+                    execute_batch(sql_cursor, sql_str, sql_set)
+        except psycopg2.Error as e:
+            print('e', e)
+
+        return True
+    
+    # @calculate_time()
+    def data_meta_update_channel_raw_id(self, meta_id, channel, raw_id):
+        try:
+            with self._psql_conn as conn:
+                with conn.cursor() as sql_cursor:
+                    sql_str = "UPDATE recording_data_metas SET raw_data = jsonb_insert(raw_data, '{%s, -1}', '%s', TRUE) WHERE id = %s;"
+                    sql_set = [channel, raw_id, 571]
+                    sql_cursor.execute(sql_str, sql_set)
+        except psycopg2.Error as e:
+            print('e', e)
+
+        return True
+
+    @calculate_time(1)
+    def data_meta_update_all_channel_raw_id(self, meta_id:str, raw_id_dict:dict):
+        try:
+            sql_str = "UPDATE recording_data_metas SET raw_data = jsonb_insert(raw_data, '{%s, -1}', '%s', TRUE) WHERE id = %s;"
+            sql_set = []
+            for ch in raw_id_dict.keys():
+                sql_set.append([ch, raw_id_dict[ch], meta_id])
+            with self._psql_conn as conn:
+                    with conn.cursor() as sql_cursor:
+                        execute_batch(sql_cursor, sql_str, sql_set)
+        except psycopg2.Error as e:
+            print('e', e)
+
+        return True
+    
+    def data_meta_update_channel_mini_id(self, meta_id, channel, scale, mini_id):
+        try:
+            with self._psql_conn as conn:
+                    with conn.cursor() as sql_cursor:
+                        sql_str = "UPDATE recording_data_metas SET mini_data = jsonb_insert(mini_data, '{%s, %s, -1}', '%s', TRUE) WHERE id = %s;"
+                        sql_set = [channel, scale, mini_id, meta_id]
+                        sql_cursor.execute(sql_str, sql_set)
+        except psycopg2.Error as e:
+            print('e', e)
+
+        return True
+    
+    # @calculate_time()
+    def data_meta_update_all_channel_mini_id(self, meta_id, mini_id_dict):
+        try:
+            sql_str = "UPDATE recording_data_metas SET mini_data = jsonb_insert(mini_data, '{%s, %s, -1}', '%s', TRUE) WHERE id = %s;"
+            sql_set = []
+            for ch in mini_id_dict.keys():
+                for scale in mini_id_dict[ch].keys():
+                    sql_set.append([ch, scale, mini_id_dict[ch][scale], meta_id])
+            with self._psql_conn as conn:
+                with conn.cursor() as sql_cursor:
+                    execute_batch(sql_cursor, sql_str, sql_set)
+        except psycopg2.Error as e:
+            print('e', e)
+
+        return True

python/biopro/server/recording.py

@@ -98,6 +98,11 @@ class RecordingProcess(Process):
         self._last_cnt = [-1, -1, -1, -1, -1, -1, -1, -1]
         self._wrong_cnt = 0
 
+        # elite data length
+        self._elite_data_len = 40
+        self._mem_header_len = 3
+        self._mem_tailer_len = 6
+        self._single_data_len = self._elite_data_len + self._mem_header_len + self._mem_tailer_len
 
     def ensure_data_format(self) -> DataDecodeFormat:
         if isinstance(self._data_format, (str, bytes)):
@@ -160,7 +165,11 @@ class RecordingProcess(Process):
         """
         q = None
         try:
+            now = time()
             q = self._queue_rec.get()
+            get_queue_time_cost = time() - now
+            if get_queue_time_cost > 1.1:
+                print('get queue cost time', get_queue_time_cost, 'q_size', self._queue_rec.qsize())
         except:
             return False
         finally:
@@ -186,7 +195,7 @@ class RecordingProcess(Process):
         current_time = time()
         if self._timer is not None:
             if current_time - self._timer > 1.5:
-                print('time, sync_data routine_time', current_time, current_time - self._timer)
+                print('time, sync_data routine_time', 'device:', self._device, datetime.now(), current_time, current_time - self._timer)
                 self._isTimeOut = True
         self._timer = current_time
 
@@ -286,6 +295,7 @@ class RecordingProcess(Process):
                     self._last_cnt[7] = head_counter - 1
                 last_data_cnt = self._last_cnt[7]
 
+            # dont save to section when head or id is wrong
             if (head != 255 or device_id != device):
                 save = False
                 last_data_cnt = last_data_cnt + 1
@@ -328,61 +338,57 @@ class RecordingProcess(Process):
 
         return save
 
-    def _check_jump_ram(self, raw_data: bytes, colum_now: int, colum_total: int, save: bool, device: int):
-        i = colum_now
+    def _check_jump_ram(self, raw_data: bytes, colum_now: int, colum_total: int, save: bool, device: int, data_len: int):
+        col = colum_now
+        save = False
 
-        if (raw_data[i][0] == 255 and raw_data[i][3] == device):
-            if colum_total < 3: 
-                print('this ram data < 3 records, need to fix, colum_total = ', colum_total)
-                if colum_total == 1:
-                    print('raw_data[0]', raw_data[0])
+        if raw_data[col][0] != 255 or raw_data[col][3] != device:
+            return save
 
-                elif colum_total == 2:
-                    print('raw_data[0]', raw_data[0])
-                    print('raw_data[1]', raw_data[1])
+        if colum_total == 1:
+            print('this ram data < 3 records, colum_total = ', colum_total)
+            print('raw_data[0]', raw_data[0])
+            return save
 
-            else:
+        elif colum_total == 2:
+            print('this ram data < 3 records, colum_total = ', colum_total)
+            print('raw_data[0]', raw_data[0])
+            print('raw_data[1]', raw_data[1])
+            if (raw_data[col + 1][1] - raw_data[col][1] == 1) or (raw_data[col][1] == 255 and raw_data[col + 1][1] == 0):
+                save = True
 
-                if((raw_data[i + 1][1] - raw_data[i][1] == 1 and raw_data[i + 2][1] - raw_data[i + 1][1] == 1) or
-                    (raw_data[i][1] == 255 and raw_data[i + 1][1] == 0 and raw_data[i + 2][1] == 1) or
-                    (raw_data[i][1] == 254 and raw_data[i + 1][1] == 255 and raw_data[i + 2][1] == 0)):
+        elif colum_total >= 3:
+            if (raw_data[col + 1][1] - raw_data[col][1] == 1 and raw_data[col + 2][1] - raw_data[col + 1][1] == 1) or\
+                (raw_data[col][1] == 255 and raw_data[col + 1][1] == 0 and raw_data[col + 2][1] == 1) or\
+                (raw_data[col][1] == 254 and raw_data[col + 1][1] == 255 and raw_data[col + 2][1] == 0):
+                save = True
 
-                    if ((raw_data[i][1] == 255 and raw_data[i + 1][1] == 0 and raw_data[i + 2][1] == 1) or
-                        (raw_data[i][1] == 254 and raw_data[i + 1][1] == 255 and raw_data[i + 2][1] == 0)):
-                        print('cnt = [254, 255, 0] or [255, 0, 1]')
+        if save == True:
+            self._skip_ram_cnt += 1
+            last_data_cnt = raw_data[col][1]
+            if (device == 4):
+                print('self._last_cnt[4]:', self._last_cnt[4], ', last_data_cnt:', last_data_cnt)
+            if (device == 5):
+                print('self._last_cnt[5]:', self._last_cnt[5], ', last_data_cnt:', last_data_cnt)
+            if (device == 6):
+                print('self._last_cnt[6]:', self._last_cnt[6], ', last_data_cnt:', last_data_cnt)
+            if (device == 7):
+                print('self._last_cnt[7]:', self._last_cnt[7], ', last_data_cnt:', last_data_cnt)
+                
+            print('skip RAM, but data is right, solve data', list(raw_data[col][0:3]),'|', list(raw_data[colum_total-1][0:3]), 'skip Ram', self._skip_ram_cnt, 'times \n')
 
-                    save = True
-                    self._skip_ram_cnt += 1
-                    last_data_cnt = raw_data[i][1]
-                    if (device == 4):
-                        print('self._last_cnt[4]:', self._last_cnt[4], ', last_data_cnt:', last_data_cnt)
-                    if (device == 5):
-                        print('self._last_cnt[5]:', self._last_cnt[5], ', last_data_cnt:', last_data_cnt)
-                    if (device == 6):
-                        print('self._last_cnt[6]:', self._last_cnt[6], ', last_data_cnt:', last_data_cnt)
-                    if (device == 7):
-                        print('self._last_cnt[7]:', self._last_cnt[7], ', last_data_cnt:', last_data_cnt)
-                        
-                    print('skip RAM, but data is right, solve data', list(raw_data[i][0:3]), 'skip Ram', self._skip_ram_cnt, 'times')
-                    # print('data:')
-                    # print('|', list(raw_data[0]))
-                    # print('|', list(raw_data[1]))
-                    # print('| ... ... ...')
-                    # print('| ... ... ...')
-                    # print('|', list(raw_data[colum_total-1]))
-                    print()
+            if (device == 4):
+                self._last_cnt[4] = last_data_cnt
 
-                    if (device == 4):
-                        self._last_cnt[4] = last_data_cnt
+            elif (device == 5):
+                self._last_cnt[5] = last_data_cnt
 
-                    elif (device == 5):
-                        self._last_cnt[5] = last_data_cnt
+            elif (device == 6):
+                self._last_cnt[6] = last_data_cnt
 
-                    elif (device == 6):
-                        self._last_cnt[6] = last_data_cnt
+            elif (device == 7):
+                self._last_cnt[7] = last_data_cnt
 
-                    elif (device == 7):
-                        self._last_cnt[7] = last_data_cnt
         return save
 
     def _neu_foreach_data_section(self, data: bytes):
@@ -497,50 +503,59 @@ class RecordingProcess(Process):
         :return:
         """
         raw_data = []
-        index = 0
-        elite_data_len = 40
-        mem_header_len = 3
-        mem_tailer_len = 8
-        single_data_len = elite_data_len + mem_header_len + mem_tailer_len
-        device = self._device
+        records = 0
         print_flag = False
+        device = self._device
+        single_data_len = self._single_data_len
+        mem_header_len = self._mem_header_len
 
         # packet section data use two microarray 
         for i in range(0, len(data), single_data_len):
-            index = index + 1
-            for j in range(index, index + 1):
-                raw_data.append(data[i : i + single_data_len])
-                
+            records = records + 1
+            raw_data.append(data[i : i + single_data_len])
+            if len(data[i : i + 10]) < 10:
+                print('data dont be package:', raw_data[records - 1], 'index:', records - 1)
+                del raw_data[records - 1]
+                records = records - 1
+
         # check cnt
-        for i in range(index):  
+        for i in range(records):
 
             # if jump cnt, don't save data      
             save = self._check_cnt(raw_data[i], device)
 
             # # if jump Ram, also can handle data
             if save == False:
-                save = self._check_jump_ram(raw_data, i, index, save, device)
+                save = self._check_jump_ram(raw_data, i, records, save, device, single_data_len)
                             
             if (save == True):
                 section = raw_data[i]
 
-                if (section[0 : mem_header_len] == section[single_data_len - 3: single_data_len]):
-                    section = section + b'\x00'
-                
-                else:
+                check_sum = sum(section[0 : single_data_len - 1]) & 0b11111111
+
+                if (check_sum != section[single_data_len - 1]):
+                    print('check number not match,',
+                        list(section[0 : mem_header_len]), section[-1], '!=', check_sum, 'device:', device, ',', datetime.now())
+                    if (i-1 >= 0):
+                        print('check number not match', list(raw_data[i-1]), 'raw:', i-1)
+
+                    print('check number not match', list(raw_data[i]), 'raw:', i)
+                    
+                    if (i+1 <= records):
+                        print('check number not match', list(raw_data[i+1]), 'raw:', i+1, '\n')
                     section = section + b'\x01'
-                    print('header != tailer,', 
-                        list(section[0 : mem_header_len]), 
-                        list(section[single_data_len - 3: single_data_len]),
-                        'device:', device, ',', datetime.now())
-                    print('header != tailer', list(section), '\n')
-                
-                section = section[3:]
+
+                    print('delete data:', list(raw_data[i][0:3]), 'raw:', i, '\n')
+                    continue
+                else:
+                    section = section + b'\x00'
+
+                # section = section[3:]
                 yield None, section
 
             else:
                 print_flag = True
-                print('delete data:', list(raw_data[i]))
+                print('delete data:', list(raw_data[i][0:3]), 'raw:', i, '\n')
 
         # if print_flag:
         #     print('delete data context:')