qlsdk2 0.4.0a3__py3-none-any.whl → 0.4.1__py3-none-any.whl

qlsdk/ar4/__init__.py

@@ -39,12 +39,12 @@ class AR4(LMDevice):
                 consumer.put(packet)
              
             if len(self._phy_subscriber) > 0:
-                logger.info(f"dig data eeg: {packet.eeg}")
-                logger.info(f"dig data acc: {packet.acc}")
+                logger.debug(f"dig data eeg: {packet.eeg}")
+                logger.debug(f"dig data acc: {packet.acc}")
                 packet.eeg = self.eeg2phy(np.array(packet.eeg))
                 packet.acc = self.acc2phy(np.array(packet.acc))
-                logger.info(f"phy data eeg: {packet.eeg}")
-                logger.info(f"phy data acc: {packet.acc}")
+                logger.debug(f"phy data eeg: {packet.eeg}")
+                logger.debug(f"phy data acc: {packet.acc}")
                 for consumer2 in self._phy_subscriber.values():
                     consumer2.put(packet)
             
@@ -74,7 +74,11 @@ class AR4(LMDevice):
             self._edf_handler = None
             self._recording = False
             logger.info(f"停止记录数据: {self.box_mac}")
-
+            
+    def trigger(self, desc):
+        if self._edf_handler:
+            self._edf_handler.trigger(desc)
+            
     # 订阅推送消息 
     def subscribe(self, topic: str = None, q: Queue = Queue(), value_type: Literal['phy', 'dig'] = 'phy') -> tuple[str, Queue]:
         if topic is None:

qlsdk/core/device.py

@@ -4,9 +4,18 @@ class BaseDevice(object):
     def __init__(self, socket = None):
         self.socket = socket
         self.device_name = None
-        self.device_type = None
+        self._device_type = None
         self.device_id = None
         
+        
+    @property
+    def device_type(self) -> int:
+        return self._device_type
+    
+    @device_type.setter
+    def device_type(self, value: int):
+        self._device_type = value
+        
     @property
     def acq_channels(self) :
         return None

qlsdk/core/message/command.py

@@ -1,8 +1,10 @@
 import abc
+import numpy as np
 from time import time_ns
 from typing import Dict, Type
-from enum import Enum
 from loguru import logger
+
+
 from qlsdk.core.crc import crc16
 from qlsdk.core.device import BaseDevice
 from qlsdk.core.entity import RscPacket, ImpedancePacket
@@ -64,6 +66,13 @@ class DeviceCommand(abc.ABC):
         # 解析消息体
         body = payload[self.HEADER_LEN:-2]   
     
+    def parse_body(self, body: bytes):
+        time = int.from_bytes(body[0:8], 'little')
+        # result - 1B
+        result = body[8]
+        logger.info(f"[{time}]{self.cmd_desc}{'成功' if result == 0 else '失败'}")
+        
+    
 
 class CommandFactory:
     """Registry for command implementations"""
@@ -114,6 +123,8 @@ class GetDeviceInfoCommand(DeviceCommand):
         flag = int.from_bytes(body[41:45], 'little')
         logger.debug(f"Received device info: {result}, {flag}, {self.device}")
         
+        # 创建设备对象
+        
 
 # 握手
 class HandshakeCommand(DeviceCommand):
@@ -160,8 +171,6 @@ class SetAcquisitionParamCommand(DeviceCommand):
         body += bytes.fromhex('00')        
 
         return body
-    def parse_body(self, body: bytes):
-        logger.info(f"Received SetAcquisitionParam response: {body.hex()}")
         
 # 启动采集
 class StartAcquisitionCommand(DeviceCommand):
@@ -170,8 +179,6 @@ class StartAcquisitionCommand(DeviceCommand):
     
     def pack_body(self):
         return bytes.fromhex('0000')
-    def parse_body(self, body: bytes):
-        logger.info(f"Received acquisition start response: {body.hex()}")
 
 # 停止采集
 class StopAcquisitionCommand(DeviceCommand):
@@ -180,17 +187,14 @@ class StopAcquisitionCommand(DeviceCommand):
     
     def pack_body(self):
         return b''
-    def parse_body(self, body: bytes):
-        logger.info(f"Received acquisition stop response: {body.hex()}")
+
         
 # 设置阻抗采集参数
 class SetImpedanceParamCommand(DeviceCommand):
     cmd_code = 0x411
     cmd_desc = "设置阻抗测量参数"
-    def parse_body(self, body: bytes):
-        logger.info(f"Received SetImpedanceParamCommand response: {body.hex()}")
         
-# 启动采集
+# 启动阻抗测量
 class StartImpedanceCommand(DeviceCommand):
     cmd_code = 0x412
     cmd_desc = "启动阻抗测量"
@@ -200,19 +204,14 @@ class StartImpedanceCommand(DeviceCommand):
         body += bytes.fromhex('0000000000000000') # 8字节占位符
         return body
         
-    def parse_body(self, body: bytes):
-        logger.info(f"Received StartImpedanceCommand response: {body.hex()}")
 
-# 停止采集
+# 停止阻抗测量
 class StopImpedanceCommand(DeviceCommand):
     cmd_code = 0x413
     cmd_desc = "停止阻抗测量"
     
     def pack_body(self):
         return b''
-
-    def parse_body(self, body: bytes):
-        logger.info(f"Received StopImpedanceCommand response: {body.hex()}")
             
 # 启动刺激
 class StartStimulationCommand(DeviceCommand):
@@ -229,19 +228,36 @@ class StartStimulationCommand(DeviceCommand):
         # error_channel - 8B
         # error_channel= int.from_bytes(body[9:17], 'big')
         channels = to_channels(body[9:17])
-        logger.warning(f"通道 {channels} 刺激开始")
+        logger.success(f"通道 {channels} 刺激开始")
+        self.device.trigger(f"通道 {channels} 刺激开始")
         # error_type - 1B
         error_type = body[17]
 
-# 停止采集
+# 停止刺激
 class StopStimulationCommand(DeviceCommand):
     cmd_code = 0x488
     cmd_desc = "停止刺激"
-    
+     
+# 启动刺激
+class StopStimulationNotifyCommand(DeviceCommand):
+    cmd_code = 0x48D
+    cmd_desc = "停止刺激通知"
+    def pack_body(self):
+        return self.device.stim_paradigm.to_bytes()
+        # return bytes.fromhex('01000000000000008813000000000000010000000000000000000140420f00640064000000803f0000010000000000000000000000000000000000000000008813000000000000')
     def parse_body(self, body: bytes):
-        logger.info(f"Received stimulation stop response: {body.hex()}")
-        
-# 停止采集
+        # time - 8B
+        time = int.from_bytes(body[0:8], 'little')
+        # result - 1B
+        result = body[8]
+        # error_channel - 8B
+        # error_channel= int.from_bytes(body[9:17], 'big')
+        channels = to_channels(body[9:17])
+        logger.success(f"通道 {channels} 刺激结束")
+        self.device.trigger(f"通道 {channels} 刺激结束", time)
+        # error_type - 1B
+        error_type = body[17]   
+# 刺激信息
 class StimulationInfoCommand(DeviceCommand):
     cmd_code = 0x48e
     cmd_desc = "刺激告警信息"
@@ -254,9 +270,10 @@ class StimulationInfoCommand(DeviceCommand):
         channels = to_channels(body[9:17])
         # 保留位-8B
         # error_type - 1B
+        err_type = body[17]
         # 特征位-4B
-        characteristic  = int.from_bytes(body[25:29], 'little')
-        logger.warning(f"[{characteristic}]刺激告警，通道 {channels} 刺激驱动不足")
+        # errType  = int.from_bytes(body[25:29], 'little')
+        logger.warning(f"刺激告警信息[{err_type}]，通道 {channels} 刺激驱动不足")
         
 
 # 阻抗数据
@@ -276,24 +293,28 @@ class SignalDataCommand(DeviceCommand):
     def unpack(self, payload):
         return super().unpack(payload)
     
-    def parse_body(self, body: bytes):                
-        if len(self.device.signal_consumers) > 0 or self.device.edf_handler:
-            # 解析数据包
-            rsc = RscPacket()
-            rsc.transfer(body)
+    def parse_body(self, body: bytes):     
+        # 解析数据包
+        packet = RscPacket()
+        packet.transfer(body)  
+        
+        # 文件写入到edf
+        if self.device.edf_handler:
+            self.device.edf_handler.write(packet)
+                        
+        if len(self.device.signal_consumers) > 0 :
+            # 信号数字值转物理值
+            packet.eeg = self.device.eeg2phy(np.array(packet.eeg))
             
             # 发送数据包到订阅者
             for q in list(self.device.signal_consumers.values()):
-                q.put(rsc)
+                q.put(packet)
                 
-            # 文件写入到edf
-            if self.device.edf_handler:
-                self.device.edf_handler.append(rsc)
+            
 
 # =============================================================================
-# Command Registration
+# 指令实现类注册到指令工厂
 # =============================================================================
-
 CommandFactory.register_command(DefaultCommand.cmd_code, DefaultCommand)
 CommandFactory.register_command(GetDeviceInfoCommand.cmd_code, GetDeviceInfoCommand)
 CommandFactory.register_command(HandshakeCommand.cmd_code, HandshakeCommand)

qlsdk/persist/edf.py

@@ -34,6 +34,7 @@ class EdfHandler(object):
         self._first_pkg_id = None
         self._last_pkg_id = None
         self._first_timestamp = None
+        self._first_time = None
         self._end_time = None
         self._patient_code = "patient_code"
         self._patient_name = "patient_name"
@@ -77,6 +78,7 @@ class EdfHandler(object):
                 self.acc_channels = data.acc_ch_count
                 self._first_pkg_id = data.pkg_id
                 self._first_timestamp = data.time_stamp
+                self._first_time = datetime.now()
                 
             if self._last_pkg_id and self._last_pkg_id != data.pkg_id - 1:  
                 self._lost_packets += data.pkg_id - self._last_pkg_id - 1
@@ -90,8 +92,25 @@ class EdfHandler(object):
         if not self._recording:
             self.start()
     
-    def trigger(self, data):
-        pass        
+    # trigger标记
+    # desc: 标记内容
+    # cur_time: 设备时间时间戳，非设备发出的trigger不要设置
+    def trigger(self, desc, cur_time=None):
+        if self._edf_writer is None:
+            logger.warning("EDF writer未初始化，无法写入trigger标记")
+            return
+        
+        if cur_time is None:
+            onset = datetime.now().timestamp() - self._first_time.timestamp()
+        else:
+            onset = cur_time - self._first_timestamp
+            
+        self._edf_writer.writeAnnotation(onset, 1, desc)
+    
+    
+    # def trigger(self, desc):
+    #     if self._edf_writer:            
+    #         self._edf_writer.writeAnnotation(0, 1, desc)
     
     def start(self):
         self._recording = True