[update] get battery value

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

python/biopro/devlib/data.py

@@ -882,15 +882,18 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         if len(data) < 18:
             return None
 
-        time_stamp: float = struct.unpack('<I', data[1:5])[0]  # unit: ms 0x18030000
-        current = struct.unpack('<i', data[5:9])[0]  # unit: nA
-        voltage = struct.unpack('<i', data[9:13])[0]  # unit: uV
-        impedance = struct.unpack('<i', data[13:17])[0]  # unit: mOm
-        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] # mem_wrong_information = green retry, green wrong, red retry, red wrong
-        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):
@@ -942,12 +945,15 @@ 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, ram_num)
-        ret.append_data(5, broken_flag)
+        ret.append_data(7, ram_num)
+        ret.append_data(8, broken_flag)
         try:
-            ret.append_data(6, mem_wrong_information)
+            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))

python/biopro/impl/ext_mem.py

@@ -46,7 +46,7 @@ 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
@@ -167,10 +167,33 @@ 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
+        tx_temp = [0] * (red_length + 3)
 
         while True:
             tx_temp[0] = MEM_INS_READ
@@ -216,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:15]))
+                    print(list(data))
 
             data[0:3] = [255, 255, 255]
             # ----------------------------------------------------------------------------------------------
@@ -235,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
@@ -253,27 +276,7 @@ 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_section1 = data[3:7]
-            green_data_section2 = data[7:11]
-            green_data_section3 = data[11:15]
-
-            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
+            green_data_section = self._compare_green_data_addr_and_flag(data, device)
 
             length = (green_data_section[0] << 8) | green_data_section[1]
             header = data[15]
@@ -311,18 +314,9 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             if (flag_print):
                 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)
-
             address = 12
             red_length = int(length / 2)
-            tx_d = [0] * red_length
-
-            # elite read len(_tx_buffer_data) byte
-            # address = 12
-            # tx_d = self._tx_buffer_data
+            tx_d = [0] * (red_length + 3)
 
             while True:
                 tx_d[0] = MEM_INS_READ
@@ -377,11 +371,40 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             #  * 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_MARKED1)
             self._spi.send_byte(self.MEM_INS_MARKED2)

python/biopro/recording/file.py

@@ -8,7 +8,6 @@ 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 *
 
@@ -116,8 +115,8 @@ class RecordingMetaFile(JsonSerialize):
     __slots__ = ('_filename', '_filepath', '_id_db', '_create_time', '_file_version', '_file_uuid', '_data_format', '_last_time',
                  '_device', '_configuration', '_channel_mask', '_database',
                  '_dirty', '_last_modify_time', '_file_size_cache',
-                 '_recording_file_ch', '_recording_sub_file', '_size',
-                 '_parameter', '_parent', '_recording_file_name', '_recording_sub_mini', '_recording_mini_ch',
+                 '_recording_file_ch', '_size',
+                 '_parameter', '_parent', '_recording_file_name', '_recording_mini_ch',
                  '_raw_serial_number', '_mini_serial_number', '_device_id')
 
     def __init__(self, filepath: Union[str, Path], data_format: bytes = None, id_db = 0, database = None):
@@ -168,10 +167,6 @@ class RecordingMetaFile(JsonSerialize):
         self._raw_serial_number = {}
         self._mini_serial_number = {}
 
-        self._recording_sub_file = {}
-        self._recording_sub_mini = {}
-
-
         self._size = 0
 
         self._dirty = True
@@ -309,7 +304,6 @@ class RecordingMetaFile(JsonSerialize):
         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])
                 
         with self._filepath.open('wb') as _f:
             f = FileEncoder(_f)
@@ -359,58 +353,15 @@ class RecordingMetaFile(JsonSerialize):
 
     def update_subfile(self, database = None):
         meta_data = {
-            'raw_data': self._recording_sub_file,
-            'mini_data': self._recording_sub_mini,
             '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_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
@@ -1014,8 +965,7 @@ 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', '_raw_create_not_done',
-                 '_mini_create_not_done')
+                 '_data_time_ch_for_rl', '_device_id', '_send_data', '_data_mqtt_ch', '_id_db_save')
 
     def __init__(self, meta: RecordingMetaFile, device_id, database = None):
         self._meta = meta
@@ -1096,9 +1046,6 @@ class RecordingFileWriter:
 
         self._splitting_size = None
 
-        self._raw_create_not_done = True
-        self._mini_create_not_done = True
-
 
     @property
     def meta_file(self) -> RecordingMetaFile:
@@ -1119,6 +1066,7 @@ class RecordingFileWriter:
 
     def channels_update(self, channels):
         channels.sort()
+        self._database.put_queue(['data_meta_update_raw_empty_channel', self._meta._id_db, channels])
         self._channel_list.extend(channels)
         return self._channel_list
 
@@ -1132,9 +1080,6 @@ class RecordingFileWriter:
         return None
 
     def close(self):
-        # if self._recording_file is not None:
-        #     self._recording_file.close()
-        #     self._recording_file = None
         print('close1')
         self._close = True
         if len(self._recording_file_dict) > 0:
@@ -1314,8 +1259,7 @@ 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
@@ -1374,34 +1318,18 @@ class RecordingFileWriter:
                 
                 self.get_data_iter(d, mqtt_thread)
 
-            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
-
             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._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[ch] > 2000000:
                         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)
@@ -1417,11 +1345,9 @@ class RecordingFileWriter:
                     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] = data_mean
+                            self._mini_save[str(scale)]['data_mean'][ch] = self._data_mini_ch[ch][str(scale)]['mean'].copy()
                             # 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])
@@ -1434,20 +1360,19 @@ class RecordingFileWriter:
                     if self._database is not None:
                         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)
+                        self._meta.update_subfile(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_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)
+                            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)
+
         del data
 
         return None
 
 
     def _switch_recording_file(self):
-        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
@@ -1468,14 +1393,13 @@ class RecordingFileWriter:
             self._database.put_queue(['data_raw_create', raw_data_dict, self._channel_list, self._device_id])
 
         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():
@@ -1495,7 +1419,7 @@ class RecordingFileWriter:
             self._database.put_queue(['data_mini_create', mini_data_dict, self._channel_list, scale, self._device_id])
             
         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):
@@ -1504,16 +1428,10 @@ class RecordingFileWriter:
     
     def update_raw_dict_id(self, _channel, _id):
         self._recording_file_dict[int(_channel)]._id_db = _id
-        if int(_channel) not in self._meta._recording_sub_file:
-            self._meta._recording_sub_file[int(_channel)] = []
-        self._meta._recording_sub_file[int(_channel)].append(_id)
+        self._database.put_queue(['data_meta_update_channel_raw_id', self._meta._id_db, _channel, _id])
         return None
 
     def update_mini_dict_id(self, _scale, _channel, _id):
         self._recording_mini_dict[str(_scale)][int(_channel)]._id_db = _id
-        if int(_channel) not in self._meta._recording_sub_mini:
-            self._meta._recording_sub_mini[int(_channel)] = {}
-        if int(_scale) not in self._meta._recording_sub_mini[int(_channel)]:
-            self._meta._recording_sub_mini[int(_channel)][int(_scale)] = []
-        self._meta._recording_sub_mini[int(_channel)][int(_scale)].append(_id)
+        self._database.put_queue(['data_meta_update_channel_mini_id', self._meta._id_db, _channel, _scale, _id])
         return None

python/biopro/server/database.py

@@ -23,7 +23,6 @@ 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
 
@@ -70,7 +69,6 @@ class DataBaseProcess(Process):
         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:
@@ -87,6 +85,13 @@ class DataBaseProcess(Process):
     @property
     def api_token(self) -> str:
         return self._api_token
+    
+    def calculate_time(func):
+        def warp(*args, **kwargs):
+            now = time()
+            func(*args, **kwargs)
+            print(func.__name__,'cost:', time() - now)
+        return warp
 
     def run(self) -> None:
         self.setup()
@@ -160,7 +165,7 @@ class DataBaseProcess(Process):
             getattr(self, do)(*args)
         return None
 
-    @calculate_time(1)
+    # @calculate_time
     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 '
@@ -263,7 +268,6 @@ 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'
@@ -298,7 +302,6 @@ 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:
@@ -320,7 +323,7 @@ class DataBaseProcess(Process):
         # _conn.close()
         return None
 
-    # @calculate_time()
+    # @calculate_time
     def data_raw_create(self, _data_dict, _channel_list, device_id):
         if self._data_raw_create_sql_str == None:
             sql_str_list = []
@@ -342,7 +345,7 @@ class DataBaseProcess(Process):
 
         return True
 
-    # @calculate_time()
+    # @calculate_time
     def data_raw_update(self, _id, _channel, _data: JSON_OBJECT):
         sql_str = 'UPDATE "public"."' + str(_channel) + '_recording_data_raws" SET '
         sql_set = []
@@ -362,7 +365,7 @@ class DataBaseProcess(Process):
         sql_cursor.close()
         return None
 
-    # @calculate_time()
+    # @calculate_time
     def data_raw_recording(self, _id_dict, _channel_list, _data_dict, _id_db_save):
         try:
             with self._psql_conn as conn:
@@ -376,20 +379,19 @@ class DataBaseProcess(Process):
             print('recording error', e)
         return None
     
-    @calculate_time(1)
+    # @calculate_time
     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:
+                    para_list = []
+                    for _channel in _channel_list:
+                        para_list.append([_channel, _data_dict[_channel] + '"***"', _end_time_dict[_channel], _size_dict[_channel], _id_dict[_channel]])
                     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" ('
@@ -423,7 +425,6 @@ 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:
@@ -443,23 +444,9 @@ 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 = []
@@ -494,58 +481,26 @@ class DataBaseProcess(Process):
             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()
-    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_str = "UPDATE recording_data_metas SET raw_data = jsonb_insert(raw_data, '{%s, -1}', '%s', TRUE) WHERE id = %s;"
+                        sql_set = [channel, raw_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):
+    def data_meta_update_channel_mini_id(self, meta_id, channel, scale, raw_id):
         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)
+                    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, raw_id, meta_id]
+                        sql_cursor.execute(sql_str, sql_set)
         except psycopg2.Error as e:
             print('e', e)
 

python/biopro/server/recording.py

@@ -160,11 +160,7 @@ 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:
-                print('get queue cost time', get_queue_time_cost)
         except:
             return False
         finally:
@@ -190,7 +186,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
 
@@ -503,7 +499,7 @@ class RecordingProcess(Process):
         index = 0
         elite_data_len = 40
         mem_header_len = 3
-        mem_tailer_len = 8
+        mem_tailer_len = 6
         single_data_len = elite_data_len + mem_header_len + mem_tailer_len
         device = self._device
         print_flag = False
@@ -527,27 +523,31 @@ class RecordingProcess(Process):
             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:
-                    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())
+                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('header != tailer', list(raw_data[i-1]), 'raw:', i-1)
-                    print('header != tailer', list(section), 'raw:', i)
+                        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 <= index):
-                        print('header != tailer', list(raw_data[i+1]), 'raw:', i+1, '\n')
-                
-                section = section[3:]
+                        print('check number not match', list(raw_data[i+1]), 'raw:', i+1, '\n')
+                    section = section + b'\x01'
+
+                    print('delete data:', list(raw_data[i][0:3]), 'raw:', i, '\n')
+                    continue
+                else:
+                    section = section + b'\x00'
+
+                # section = section[3:]
                 yield None, section
 
             else:
                 print_flag = True
-                print('delete data:', list(raw_data[i][0:3]), 'raw:', i+1, '\n')
+                print('delete data:', list(raw_data[i][0:3]), 'raw:', i, '\n')
 
         # if print_flag:
         #     print('delete data context:')

python/biopro/util/logger.py

@@ -3,7 +3,6 @@ import inspect
 import os
 import sys
 import threading as _threading
-from time import time
 from datetime import datetime
 from functools import wraps
 from typing import Any, Optional, Tuple, Union
@@ -521,17 +520,3 @@ def logging_error(f):
         return f(self, *args, **kwargs)
 
     return _logger
-
-    
-def calculate_time(time_limit=None):
-    def actual_calculate_time(func):
-        def warp(*args, **kwargs):
-            now = time()
-            func(*args, **kwargs)
-            if time_limit == None:
-                print(func.__name__,'cost:', time() - now)
-            else:
-                if time() - now > time_limit:
-                    print(func.__name__,'cost:', time() - now)
-        return warp
-    return actual_calculate_time