qlsdk2 0.4.0a3__py3-none-any.whl → 0.4.2__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/entity/__init__.py

@@ -26,6 +26,7 @@ class RscPacket(object):
         self.time_stamp = int.from_bytes(body[0:8], 'little')
         self.result = body[8]
         self.pkg_id = int.from_bytes(body[9: 13], 'little')
+        logger.trace(f"pkg_id: {self.pkg_id}")
         self.channels = to_channels(body[13: 45])
         self.origin_sample_rate = int.from_bytes(body[45: 49], 'little')
         self.sample_rate = int.from_bytes(body[49: 53], 'little')

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/core/utils.py

@@ -52,19 +52,24 @@ def bytes_to_ints2(b):
 import numpy as np 
 if __name__ == "__main__":
     
-    channels = [1]
-    channels1 = [1, 2, 3, 4]
-    channels2 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64]
-    channels3 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238,239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256]
-    channels4 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63]
-    logger.info(to_bytes(channels).hex())
-    logger.info(to_bytes(channels1).hex())
-    logger.info(to_bytes(channels2).hex())
-    logger.info(to_bytes(channels3).hex())
-    logger.info(to_bytes(channels4).hex())
+    # channels = [1]
+    # channels1 = [1, 2, 3, 4]
+    # channels2 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64]
+    # channels3 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238,239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256]
+    # channels4 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63]
+    # logger.info(to_bytes(channels).hex())
+    # logger.info(to_bytes(channels1).hex())
+    # logger.info(to_bytes(channels2).hex())
+    # logger.info(to_bytes(channels3).hex())
+    # logger.info(to_bytes(channels4).hex())
     
-    bs = 'ffffffffffffff7f000000000000000000000000000000000000000000000000'
-    bs1 = '8000000000000000000000000000000000000000000000000000000000000000'
-    bs2 = '0100000000000000000000000000000000000000000000000000000000000000'
-    logger.info(to_channels(bytes.fromhex(bs1)))
-    logger.info(to_channels(bytes.fromhex(bs2)))
+    # bs = 'ffffffffffffff7f000000000000000000000000000000000000000000000000'
+    # bs1 = '8000000000000000000000000000000000000000000000000000000000000000'
+    # bs2 = '0100000000000000000000000000000000000000000000000000000000000000'
+
+    # logger.info(to_channels(bytes.fromhex(bs1)))
+    # logger.info(to_channels(bytes.fromhex(bs2)))
+    
+    aa = 'ff3fff3fff3fff3f000000000000000000000000000000000000000000000000'
+    
+    logger.info(to_channels(bytes.fromhex(aa)))

qlsdk/persist/__init__.py

@@ -1,2 +1,3 @@
 from .edf import EdfHandler
-from .rsc_edf import RscEDFHandler
+from .rsc_edf import RscEDFHandler
+from .ars_edf import ARSKindlingEDFHandler

qlsdk/persist/ars_edf.py

@@ -0,0 +1,278 @@
+from datetime import datetime
+import os
+from threading import Lock
+from loguru import logger
+import numpy as np
+
+from qlsdk.core.entity import RscPacket
+from qlsdk.persist.rsc_edf import RscEDFHandler
+from qlsdk.persist.stream import EDF_FILE_TYPE, EDFStreamWriter
+
+
+def intersection_positions(A, B):
+    setB = set(B)
+    seen = set()
+    return [idx for idx, elem in enumerate(A) 
+            if elem in setB and elem not in seen and not seen.add(elem)]
+
+# 用作数据结构一致化处理，通过调用公共类写入edf文件
+# 入参包含写入edf的全部前置参数
+# 实时数据包为个性化数据包，含有eeg数据部分
+class ARSKindlingEDFHandler(object):
+    '''
+        Rsc EDF Handler
+        处理EDF文件的读写
+        RSC设备通道数根据选择变化，不同通道采样频率相同
+        eeg_sample_rate: 采样频率
+        physical_max: 物理最大值 (uV)   
+        physical_min: 物理最小值 (uV)
+        resolution: 分辨率
+        storage_path: 存储路径        
+        
+        @author: qlsdk
+        @since: 0.4.0
+    '''
+    def __init__(self, eeg_sample_rate, physical_max, physical_min, resolution=24, storage_path = None):
+        # edf文件参数
+        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.file_type = EDF_FILE_TYPE["bdf"] if resolution == 24 else EDF_FILE_TYPE["edf"]
+        # 点分辨率
+        self.resolution = resolution
+        # eeg通道数
+        self.channels = None
+        # eeg采样率
+        self.sample_rate = eeg_sample_rate
+        # bytes per second
+        self.bytes_per_second = 0
+        self._edf_writer = None
+        self._cache2 = tuple()
+        self._recording = False
+        self._edf_writer = None
+        self.annotations = None
+        # 每个数据块大小
+        self._chunk = np.array([])
+        self._duration = 0
+        self._points = 0
+        self._first_pkg_id = None
+        self._last_pkg_id = None
+        self._first_timestamp = None
+        self._start_time = None
+        self._end_time = None
+        self._patient_code = "patient_code"
+        self._patient_name = "patient_name"
+        self._device_type = "24130032"
+        self._device_no = "24130032"
+        self._total_packets = 0
+        self._lost_packets = 0
+        self._storage_path = storage_path
+        self._edf_writer_thread = None
+        self._file_prefix = None
+        
+        # 癫痫造模仪1对4， 这个是固定模式，写死，规则随设备
+        self._edf_handler = {}
+        self._edf_Handler_A = None
+        self._edf_Handler_B = None  
+        self._edf_Handler_C = None
+        self._edf_Handler_D = None
+        
+        self._channel_spilt = {
+            "A" : [49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62],
+            "B" : [33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46],
+            "C" : [17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
+            "D" : [7, 8, 5, 6, 3, 4, 1, 2, 9, 10, 11, 12, 13, 14],
+        }
+        
+        self._channel_mapping = {
+            1: "D7", 
+            2: "D8",
+            3: "D5", 
+            4: "D6",
+            5: "D3", 
+            6: "D4",
+            7: "D1", 
+            8: "D2",
+            9: "D9", 
+            10: "D10",
+            11: "D11", 
+            12: "D12",
+            13: "D13", 
+            14: "D14",
+            
+            17: "C7", 
+            18: "C8",
+            19: "C5", 
+            20: "C6",
+            21: "C3", 
+            22: "C4",
+            23: "C1", 
+            24: "C2",
+            25: "C9", 
+            26: "C10",
+            27: "C11", 
+            28: "C12",
+            29: "C13", 
+            30: "C14",
+            
+            33: "B7", 
+            34: "B8",
+            35: "B5", 
+            36: "B6",
+            37: "B3", 
+            38: "B4",
+            39: "B1", 
+            40: "B2",
+            41: "B9", 
+            42: "B10",
+            43: "B11", 
+            44: "B12",
+            45: "B13", 
+            46: "B14",
+            
+            49: "A7", 
+            50: "A8",
+            51: "A5", 
+            52: "A6",
+            53: "A3", 
+            54: "A4",
+            55: "A1", 
+            56: "A2",
+            57: "A9", 
+            58: "A10",
+            59: "A11", 
+            60: "A12",
+            61: "A13", 
+            62: "A14"
+        }
+        
+        self._lock = Lock()
+        
+    @property
+    def file_name(self): 
+        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}"
+        
+        if self._storage_path:
+            try:
+                # 自动创建目录，存在则忽略
+                os.makedirs(self._storage_path, exist_ok=True)  
+                
+                return f"{self._storage_path}/{file_name}"
+            except Exception as e:
+                logger.error(f"创建目录[{self._storage_path}]失败: {e}")            
+        
+        return file_name
+    
+    def set_device_type(self, device_type):
+        if device_type == 0x39:
+            self._device_type = "C64RS"
+        elif device_type == 0x40:
+            self._device_type = "LJ64S1"
+        else:
+            self._device_type = hex(device_type)
+        
+    def set_device_no(self, device_no):
+        self._device_no = device_no
+        
+    def set_storage_path(self, storage_path):
+        self._storage_path = storage_path
+        
+    def set_file_prefix(self, file_prefix):
+        self._file_prefix = file_prefix
+        
+    def set_patient_code(self, patient_code):
+        self._patient_code = patient_code
+        
+    def set_patient_name(self, patient_name):
+        self._patient_name = patient_name
+    
+    def write(self, packet: RscPacket):
+        # logger.trace(f"packet: {packet}")    
+        if packet is None:
+            # self._edf_writer_thread.stop_recording()
+            for k in self._edf_handler.keys():
+                self._edf_handler[k].append(None)
+            return
+         
+        #按分区写入数据
+        
+        for k in self._channel_spilt.keys():      
+            logger.info(f'分区{k}, {self._channel_spilt[k]}')      
+            p = packet
+            self.writeA(p, self._channel_spilt[k], k)
+    
+        # with self._lock:
+        #     if self.channels is None:
+        #         logger.info(f"开始记录数据到文件...")
+        #         self.channels = packet.channels
+        #         self._first_pkg_id = packet.pkg_id if self._first_pkg_id is None else self._first_pkg_id
+        #         self._first_timestamp = packet.time_stamp if self._first_timestamp is None else self._first_timestamp
+        #         self._start_time = datetime.now()
+        #         logger.info(f"第一个包id: {self._first_pkg_id }, 时间戳:{self._first_timestamp}， 当前时间:{datetime.now().timestamp()}  offset: {datetime.now().timestamp() - self._first_timestamp}")
+                
+        #     if self._last_pkg_id and self._last_pkg_id != packet.pkg_id - 1:  
+        #         self._lost_packets += packet.pkg_id - self._last_pkg_id - 1
+        #         logger.warning(f"数据包丢失: {self._last_pkg_id} -> {packet.pkg_id}, 丢包数: {packet.pkg_id - self._last_pkg_id - 1}")
+                
+        #     self._last_pkg_id = packet.pkg_id
+        #     self._total_packets += 1
+            
+        #     if self._edf_writer_thread is None:
+        #         self._edf_writer_thread = EDFStreamWriter(self.channels, self.sample_rate, self.physical_max, self.physical_min, self.file_type, self.file_name)
+        #         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.append(packet.eeg)
+     
+    def writeA(self, packet: RscPacket, channel_filter, name='A'):
+        # 参数检查
+        if packet is None or channel_filter is None:
+            logger.warning("空数据，忽略")
+            return
+        
+        channel_pos = intersection_positions(packet.channels, channel_filter)
+        
+        if channel_pos is None or len(channel_pos) == 0 :
+            logger.debug(f"没有指定分区{name}的通道，跳过")
+            pass
+        
+        # 分区数据包写入
+        if name not in self._edf_handler.keys():
+            edf_handler = RscEDFHandler(self.sample_rate,  self.digital_max , self.digital_min, self.resolution)  
+            edf_handler.set_device_type(self._device_type)
+            edf_handler.set_device_no(self._device_no)
+            edf_handler.set_storage_path(self._storage_path)
+            edf_handler.set_file_prefix(f'{self._file_prefix}_{name}' if self._file_prefix else name)
+            logger.info(f"开始写入分区{name}的数据到文件")
+            self._edf_handler[name] = edf_handler
+        
+        # 保留本分区的通道和数据
+        channels = [packet.channels[p] for p in channel_pos]
+        eeg = [packet.eeg[p] for p in channel_pos]
+        
+        # 新建数据包实例
+        data = RscPacket()
+        data.time_stamp = packet.time_stamp
+        data.pkg_id = packet.pkg_id
+        data.channels = channels
+        data.origin_sample_rate = packet.origin_sample_rate
+        data.sample_rate = packet.sample_rate
+        data.sample_num = packet.sample_num
+        data.resolution = packet.resolution
+        data.trigger = packet.trigger
+        data.eeg = eeg
+        
+        self._edf_handler[name].write(data)
+    
+    # trigger标记
+    # desc: 标记内容
+    # cur_time: 设备时间时间戳，非设备发出的trigger不要设置
+    def trigger(self, desc, cur_time=None):
+        # trigger现在（20250702）多个分区共享， 分发到所有分区文件中标记
+        for k in self._edf_handler.keys():
+            self._edf_handler[k].trigger(desc, cur_time) 

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