qlsdk2 0.6.0a2__py3-none-any.whl → 0.6.0a3__py3-none-any.whl

qlsdk/core/entity/__init__.py

@@ -50,7 +50,8 @@ class RscPacket(Packet):
             for i in range(ch_num)
         ]
                 
-        # logger.trace(self)
+        logger.trace(packet)
+        
         return packet
         
     def __str__(self):
@@ -80,7 +81,7 @@ class ImpedancePacket(Packet):
         self.pkg_id = int.from_bytes(body[9: 13], 'little')
         self.channels = to_channels(body[13: 45])
         
-        logger.debug(f"impedance: {self}")
+        logger.trace(f"impedance: {self}")
         
     def __str__(self):
         return f"""

qlsdk/persist/rsc_edf.py

@@ -15,7 +15,7 @@ EDF_FILE_TYPE = {
 }
 
 class EDFStreamWriter(Thread):
-    def __init__(self, channels, sample_frequency, physical_max, digital_min, file_type, file_path, record_duration=None):
+    def __init__(self, channels, sample_frequency, physical_max, physical_min, file_type, file_path, record_duration=None):
         
         super().__init__()
         self._writer : EdfWriter = None
@@ -32,7 +32,7 @@ class EDFStreamWriter(Thread):
         self._n_channels = len(channels)
         self.sample_frequency = sample_frequency
         self.physical_max = physical_max
-        self.physical_min = digital_min
+        self.physical_min = physical_min
         # 和位数相关，edf 16 bits/bdf  24 bits
         self.digital_max = 8388607 if file_type == EDF_FILE_TYPE['bdf'] else 32767
         self.digital_min = -8388608 if file_type == EDF_FILE_TYPE['bdf'] else -32768
@@ -46,6 +46,7 @@ class EDFStreamWriter(Thread):
         self.equipment = "equipment"
         self.patient_code = "patient_code"
         self.patient_name = "patient_name"
+        logger.info(f'digital_max:{self.digital_max}, digital_min:{self.digital_min}, physical_max:{self.physical_max}, physical_min:{self.physical_min}')
         
     def set_channels(self, channels):
         self._channels = channels
@@ -127,6 +128,7 @@ class EDFStreamWriter(Thread):
         
         # 配置通道参数
         signal_headers = []
+        logger.trace(f"sf: {self.sample_frequency}, pm: {self.physical_max}, pn: {self.physical_min}, dm: {self.digital_max}, dn: {self.digital_min}")
         for ch in range(self._n_channels):
             signal_headers.append({
                 "label": f'channels {self._channels[ch]}',
@@ -169,14 +171,16 @@ class EDFStreamWriter(Thread):
     # 写入1秒的数据
     def _write_block(self, block):
         logger.trace(f"写入数据: {block}")
-        # 转换数据类型为float64
-        data_float64 = block.astype(np.float64)
+        # 转换数据类型为float64-物理信号uV int32-数字信号
+        data_input = block.astype(np.int32)
+        logger.trace(f"写入数据-real: {data_input}")
         # 写入时转置为(样本数, 通道数)格式
-        self._writer.writeSamples(data_float64)
+        self._writer.writeSamples(data_input, digital=True)
         self._duration += 1
         
         if self._duration % 10 == 0:  # 每10秒打印一次进度
             logger.info(f"数据记录中... 文件名：{self.file_path}, 已记录时长: {self._duration}秒")
+            
 
 # 用作数据结构一致化处理，通过调用公共类写入edf文件
 # 入参包含写入edf的全部前置参数
@@ -200,7 +204,7 @@ class RscEDFHandler(object):
         self.physical_max = physical_max
         self.physical_min = physical_min
         self.digital_max = 8388607 if resolution == 24 else 32767
-        self.digital_min = -8388607 if resolution == 24 else - 32768
+        self.digital_min = -8388608 if resolution == 24 else - 32768
         self.file_type = EDF_FILE_TYPE["bdf"] if resolution == 24 else EDF_FILE_TYPE["edf"]
         # 点分辨率
         self.resolution = resolution
@@ -226,8 +230,8 @@ class RscEDFHandler(object):
         self._end_time = None
         self._patient_code = "patient_code"
         self._patient_name = "patient_name"
-        self._device_type = "24130032"
-        self._device_no = "24130032"
+        self._device_type = "0000"
+        self._device_no = "00000000"
         self._total_packets = 0
         self._lost_packets = 0
         self._storage_path = storage_path
@@ -242,7 +246,7 @@ class RscEDFHandler(object):
         suffix = "bdf" if self.resolution == 24 else "edf"
         
         # 文件名称
-        file_name = f"{self._file_prefix}_{self._device_no}_{self._start_time.strftime('%y%m%d%H%I%M')}.{suffix}" if self._file_prefix else f"{self._device_no}_{self._start_time.strftime('%y%m%d%H%I%M')}.{suffix}"
+        file_name = f"{self._file_prefix}_{self._device_no}_{self._start_time.strftime('%y%m%d%H%M%S')}.{suffix}" if self._file_prefix else f"{self._device_no}_{self._start_time.strftime('%y%m%d%H%I%M')}.{suffix}"
         
         if self._storage_path:
             try:
@@ -260,6 +264,8 @@ class RscEDFHandler(object):
             self._device_type = "C64RS"
         elif device_type == 0x40:
             self._device_type = "LJ64S1"
+        elif device_type == 0x45:
+            self._device_type = "C256RS"
         elif device_type == 0x51:
             self._device_type = "C256RS"
         elif device_type == 0x60:
@@ -312,6 +318,7 @@ class RscEDFHandler(object):
                 self._edf_writer_thread.set_start_time(self._start_time)
                 self._edf_writer_thread.start()
                 logger.info(f"开始写入数据: {self.file_name}")
+                self._edf_writer_thread.equipment = f'{self._device_type}_{self._device_no}'
                 
             self._edf_writer_thread.append(packet.eeg)
             
@@ -331,5 +338,4 @@ class RscEDFHandler(object):
             else: onset = 0
         else:
             onset = cur_time - self._first_timestamp
-        self._edf_writer_thread.trigger(onset, desc)     
-    
+        self._edf_writer_thread.trigger(onset, desc)     

qlsdk/rsc/command/__init__.py

@@ -298,7 +298,7 @@ class ImpedanceDataCommand(DeviceCommand):
     
     def parse_body(self, body: bytes):
         # logger.info(f"Received impedance data: {body.hex()}")
-        packet = ImpedancePacket().transfer(body)
+        self.device.produce(body, type='impedance')
 
 # 信号数据
 class SignalDataCommand(DeviceCommand):

qlsdk/rsc/device/base.py

@@ -5,7 +5,7 @@ from typing import Any, Dict, Literal
 
 from loguru import logger
 import numpy as np
-from qlsdk.core.entity import RscPacket
+from qlsdk.core.entity import RscPacket, ImpedancePacket
 from qlsdk.core.utils import to_bytes
 from qlsdk.rsc.interface import IDevice, IParser
 from qlsdk.rsc.command import StartImpedanceCommand, StopImpedanceCommand, StartStimulationCommand, StopStimulationCommand, SetAcquisitionParamCommand, StartAcquisitionCommand, StopAcquisitionCommand
@@ -136,7 +136,24 @@ class QLBaseDevice(IDevice):
     
     # 数据包处理
     def produce(self, body: bytes, type:Literal['signal', 'impedance']="signal"):
-        if body is None: return     
+        if body is None: return      
+        
+        if type == "signal":
+            self._produce_signal(body)
+        elif type == "impedance":
+            self._produce_impedance(body)       
+        
+    def _produce_impedance(self, body: bytes):
+        packet = ImpedancePacket().transfer(body)
+        # 分发阻抗数据包给订阅者
+        if len(self._impedance_consumer) > 0:
+            for topic, q in self._impedance_consumer.items():
+                try:
+                    q.put(packet, timeout=1)
+                except Exception as e:
+                    logger.error(f"impedance data put to queue exception: {str(e)}")
+    
+    def _produce_signal(self, body: bytes):        
         
         # 处理信号数据
         data = self._signal_wrapper(body)   
@@ -152,8 +169,10 @@ class QLBaseDevice(IDevice):
             self._write_signal(data)
                         
         if len(self.signal_consumers) > 0 :
+            logger.trace(f"dg eeg: {data.eeg}")
             # 信号数字值转物理值
             data.eeg = self.eeg2phy(np.array(data.eeg))
+            logger.trace(f"ph eeg: {data.eeg}")
             
             # 发送数据包到订阅者
             for q in list(self.signal_consumers.values()):
@@ -161,7 +180,7 @@ class QLBaseDevice(IDevice):
                 if q.full(): 
                     q.get()
                     
-                q.put(data)
+                q.put(data)        
                 
     # 信号数据转换
     def _signal_wrapper(self, body: bytes):

qlsdk/rsc/device/c256_rs.py

@@ -189,19 +189,7 @@ class C256RS(QLBaseDevice):
        
     # 设置记录文件名称前缀 
     def set_file_prefix(self, prefix):
-        self._file_prefix = prefix
-        
-    # 接收socket消息
-    def accept(self):
-        pass
-        # while True:
-        #     # 缓冲去4M
-        #     data = self.socket.recv(4096*1024)
-        #     if not data:
-        #         logger.warning(f"设备{self.device_name}连接结束")
-        #         break
-            
-        #     self._parser.append(data)            
+        self._file_prefix = prefix              
        
     # socket发送数据    
     def send(self, data):

{qlsdk2-0.6.0a2.dist-info → qlsdk2-0.6.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qlsdk2
-Version: 0.6.0a2
+Version: 0.6.0a3
 Summary: SDK for quanlan device
 Home-page: https://github.com/hehuajun/qlsdk
 Author: hehuajun

{qlsdk2-0.6.0a2.dist-info → qlsdk2-0.6.0a3.dist-info}/RECORD

@@ -8,7 +8,7 @@ qlsdk/core/local.py,sha256=vbison4XZtS4SNYLJ9CqBhetEcukdviTWmvtdA1efkQ,811
 qlsdk/core/utils.py,sha256=yfCiLpufO96I68MLs6Drc6IECRjcQ-If8sXn7RaRHrk,4241
 qlsdk/core/crc/__init__.py,sha256=kaYSr6KN5g4U49xlxAvT2lnEeGtwX4Dz1ArwKDvUIIY,143
 qlsdk/core/crc/crctools.py,sha256=sDeE6CMccQX2cRAyMQK0SZUk1fa50XMuwqXau5UX5C8,4242
-qlsdk/core/entity/__init__.py,sha256=LOS5k_cIA-NYnvE94KUXCBUU_uu1v8FcXf7L399j8Yg,6610
+qlsdk/core/entity/__init__.py,sha256=b0EFz0ND7eXNXKQvxjsoaH-rylws4iEuiKBRZwvPKyU,6620
 qlsdk/core/filter/__init__.py,sha256=YIWIzDUKN30mq2JTr53ZGblggZfC_rLUp2FSRrsQFgU,36
 qlsdk/core/filter/norch.py,sha256=5RdIBX5eqs5w5nmVAnCB3ESSuAT_vVBZ2g-dg6HMZdY,1858
 qlsdk/core/message/__init__.py,sha256=sHuavOyHf4bhH6VdDpTA1EsCh7Q-XsPHcFiItpVz3Rs,51
@@ -30,7 +30,7 @@ qlsdk/interface/store.py,sha256=694WQnnrtXThP44JkQlBXzghvqA0PwHKK3uA640aiUo,23
 qlsdk/persist/__init__.py,sha256=b8qk1aOU6snEMCQNYDl1ijV3-2gwBmMt76fiAzNk1E8,107
 qlsdk/persist/ars_edf.py,sha256=_pYtHqucB-utMw-xUXZc9IB8_8ThbLFpTl_-WBQR-Sc,10555
 qlsdk/persist/edf.py,sha256=ETngb86CfkIUJYWmw86QR445MvTFC7Edk_CH9nyNgtY,7857
-qlsdk/persist/rsc_edf.py,sha256=-L8Qv_d39rog6vrIEBnO5yYnxCr6yfL4qUlM72AaFJg,13392
+qlsdk/persist/rsc_edf.py,sha256=SKvVXmQIJB5AA_3qvp0uh3PI-VaUk9cP8NXwsrpY4no,13977
 qlsdk/persist/stream.py,sha256=TCVF1sqDrHiYBsJC27At66AaCs-_blXeXA_WXdJiIVA,5828
 qlsdk/rsc/__init__.py,sha256=hOMiN0eYn4jYo7O4_0IPlQT0hD15SqqCQUihOVlTZvs,269
 qlsdk/rsc/device_manager.py,sha256=1ucd-lzHkNeQPKPzXV6OBkAMqPp_vOcsLyS-9TJ7wRc,4448
@@ -39,13 +39,13 @@ qlsdk/rsc/eegion.py,sha256=lxrktO-3Z_MYdFIwc4NxvgLM5AL5kU3UItjH6tsKmHY,11670
 qlsdk/rsc/entity.py,sha256=-fRWFkVWp9d8Y1uh6GiacXC5scdeEKNiNFf3aziGdCE,17751
 qlsdk/rsc/paradigm.py,sha256=DGfwY36sMdPIMRjbGo661GvUTEwsRRi3jrmG405mSTk,12840
 qlsdk/rsc/proxy.py,sha256=9CPdGNGWremwBUh4GvlXAykYB-x_BEPPLqsNvwuwIDE,2736
-qlsdk/rsc/command/__init__.py,sha256=DiuXvKQepVTc5hkHSB_YAAZPxobN2a7tYXpI7kZ3GQM,12296
+qlsdk/rsc/command/__init__.py,sha256=27MhUuyxUfvatezdjOCYgt9rooHH5HZATRsZLrDli9U,12298
 qlsdk/rsc/command/message.py,sha256=nTdG-Vp4MBnltyrgedAWiKD6kzOaPrg58Z_hq6yjhys,12220
 qlsdk/rsc/device/__init__.py,sha256=BzY9lRfssGPUlJ1ys-v3CWNgGihg7mPa2T4X0tl0Vg4,214
 qlsdk/rsc/device/arskindling.py,sha256=owci6MEGjyWqohEXzPdKj_ESeVIZKgO53StVj6Tmi18,15002
-qlsdk/rsc/device/base.py,sha256=oQ4Ev0LkDiJZXTqqTd6zqzzsn4ijYXkTLDUJKF0mn5U,19157
+qlsdk/rsc/device/base.py,sha256=_brT05Ef-gLUdEcD32D9M08AvWqBB3ontCnlSFLmZmQ,19963
 qlsdk/rsc/device/c16_rs.py,sha256=BHQRHOnsTMAKgqSXaAS2RjPIklZQAl2CVfe6i_iX-i4,5928
-qlsdk/rsc/device/c256_rs.py,sha256=x456zQJH2Q__v9nfgZIf947s0sghR8fCVm-ZetsRaKw,13971
+qlsdk/rsc/device/c256_rs.py,sha256=0hRS_sQaRI0AmJFFVpfewrq9zipFBRP7d1UPo60dAvo,13615
 qlsdk/rsc/device/c64_rs.py,sha256=cZIioIRGgd4Ub0ieho4_XujBNo8AQgJEjXcqgcEkyFQ,13644
 qlsdk/rsc/device/c64s1.py,sha256=L7nKmsoMCGj6GMjHYfYkKgkBtrGfP516kQHQ5I1FAUE,13986
 qlsdk/rsc/device/device_factory.py,sha256=6cPhm3pPGrVXA1s1HePFLjZqmhNI1vOAucFI0VRD_Y0,1317
@@ -70,7 +70,7 @@ qlsdk/sdk/libs/libAr4SDK.dll,sha256=kZp9_DRwPdAJ5OgTFQSqS8tEETxUs7YmmETuBP2g60U,
 qlsdk/sdk/libs/libwinpthread-1.dll,sha256=W77ySaDQDi0yxpnQu-ifcU6-uHKzmQpcvsyx2J9j5eg,52224
 qlsdk/x8/__init__.py,sha256=FDpDK7GAYL-g3vzfU9U_V03QzoYoxH9YLm93PjMlANg,4870
 qlsdk/x8m/__init__.py,sha256=cLeUqEEj65qXw4Qa4REyxoLh6T24anSqPaKe9_lR340,634
-qlsdk2-0.6.0a2.dist-info/METADATA,sha256=rwjV8tRXw0XYL8tIHZ2PYLaLWP3aD4R5AXi3TSX8QKU,1882
-qlsdk2-0.6.0a2.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-qlsdk2-0.6.0a2.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
-qlsdk2-0.6.0a2.dist-info/RECORD,,
+qlsdk2-0.6.0a3.dist-info/METADATA,sha256=dGKUPBYlPSKsgpSTADHDBNfMSQrCsvqx8xpdpgi3_Ds,1882
+qlsdk2-0.6.0a3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+qlsdk2-0.6.0a3.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
+qlsdk2-0.6.0a3.dist-info/RECORD,,