qlsdk2 0.5.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

qlsdk/core/entity/__init__.py

@@ -1,18 +1,17 @@
 from qlsdk.core.utils import to_channels
 from loguru import logger
 
-class DataPacket(object):
-    def __init__(self, device_type, device_id, channels, data):
-        self.data = data
-        self.channels = None
-        
-            
-class RscPacket(object):
+class Packet(object):
     def __init__(self):
         self.time_stamp = None
         self.pkg_id = None
         self.result = None
         self.channels = None
+        
+            
+class RscPacket(Packet):
+    def __init__(self):
+        super().__init__()
         self.origin_sample_rate = None
         self.sample_rate = None
         self.sample_num = None
@@ -65,12 +64,9 @@ class RscPacket(object):
             eeg: {self.eeg}
         """
         
-class ImpedancePacket(object):
+class ImpedancePacket(Packet):
     def __init__(self):
-        self.time_stamp = None
-        self.pkg_id = None
-        self.result = None
-        self.channels = None
+        super().__init__()
         self.data_len = None
         self.impedance = None
         

qlsdk/persist/rsc_edf.py

@@ -15,7 +15,8 @@ EDF_FILE_TYPE = {
 }
 
 class EDFStreamWriter(Thread):
-    def __init__(self, channels, sample_frequency, physical_max, digital_min, file_type, file_path):
+    def __init__(self, channels, sample_frequency, physical_max, digital_min, file_type, file_path, record_duration=None):
+        
         super().__init__()
         self._writer : EdfWriter = None
         self.data_queue : Queue = Queue()
@@ -23,6 +24,8 @@ class EDFStreamWriter(Thread):
         self._points = 0
         self._duration = 0
         self._buffer = None
+        # 设置edf/bdf文件参数，设置[0.001, 1)可以在1秒内记录多个事件（不建议开启）
+        self.record_duration = record_duration
         
         # signal info
         self._channels = channels
@@ -62,9 +65,10 @@ class EDFStreamWriter(Thread):
             # 数据
             self.data_queue.put(data)
             
-    def trigger(self, onset, desc):
+    def trigger(self, onset, desc: str):
         if self._writer:            
-            self._writer.writeAnnotation(onset, 1, desc)
+            logger.trace(f"[{onset} : {desc}]")
+            self._writer.writeAnnotation(onset, -1, desc)
         else:
             logger.warning("未创建文件，无法写入Trigger标记")
         
@@ -135,6 +139,8 @@ class EDFStreamWriter(Thread):
             })
         
         self._writer.setSignalHeaders(signal_headers)
+        if self.record_duration:
+            self._writer.setDatarecordDuration(self.record_duration)  # 每个数据块1秒
         
     def _write_file(self, eeg_data):
         try:            
@@ -189,7 +195,7 @@ class RscEDFHandler(object):
         @author: qlsdk
         @since: 0.4.0
     '''
-    def __init__(self, eeg_sample_rate, physical_max, physical_min, resolution=24, storage_path = None):
+    def __init__(self, eeg_sample_rate, physical_max, physical_min, resolution=24, storage_path = None, record_duration=None):
         # edf文件参数
         self.physical_max = physical_max
         self.physical_min = physical_min
@@ -225,6 +231,7 @@ class RscEDFHandler(object):
         self._total_packets = 0
         self._lost_packets = 0
         self._storage_path = storage_path
+        self._record_duration = record_duration
         self._edf_writer_thread = None
         self._file_prefix = None
         
@@ -299,7 +306,7 @@ class RscEDFHandler(object):
             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 = EDFStreamWriter(self.channels, self.sample_rate, self.physical_max, self.physical_min, self.file_type, self.file_name, self._record_duration)
                 self._edf_writer_thread.set_start_time(self._start_time)
                 self._edf_writer_thread.start()
                 logger.info(f"开始写入数据: {self.file_name}")
@@ -310,9 +317,16 @@ class RscEDFHandler(object):
     # trigger标记
     # desc: 标记内容
     # cur_time: 设备时间时间戳，非设备发出的trigger不要设置
-    def trigger(self, desc, cur_time=None):
+    def trigger(self, desc: str, cur_time=None):
+        if self._edf_writer_thread is None:
+            logger.warning(f"File writing has not started, discarding trigger {desc}")
+            return
+        
         if cur_time is None:
-            onset = datetime.now().timestamp() - self._start_time.timestamp()
+            # 计算trigger位置
+            if self._start_time:
+                onset = datetime.now().timestamp() - self._start_time.timestamp()
+            else: onset = 0
         else:
             onset = cur_time - self._first_timestamp
         self._edf_writer_thread.trigger(onset, desc)     

qlsdk/rsc/command/__init__.py

@@ -170,7 +170,7 @@ class QueryBatteryCommand(DeviceCommand):
             self.device.battery_total = body[12]
             # state - 1b
             # state = body[13]
-            logger.debug(f"电量更新: {self.device}")
+            logger.trace(f"电量更新: {self.device}")
         else:
             logger.warning(f"QueryBatteryCommand message received but result is failed.")
 
@@ -214,6 +214,10 @@ class StartImpedanceCommand(DeviceCommand):
         body += to_bytes(self.device.acq_channels)
         body += bytes.fromhex('0000000000000000') # 8字节占位符
         return body
+    
+    def parse_body(self, body):
+        logger.info(f"Received StartImpedance response: {body.hex()}")
+        return super().parse_body(body) 
         
 
 # 停止阻抗测量
@@ -293,7 +297,7 @@ class ImpedanceDataCommand(DeviceCommand):
     cmd_desc = "阻抗数据"
     
     def parse_body(self, body: bytes):
-        logger.info(f"Received impedance data: {body.hex()}")
+        # logger.info(f"Received impedance data: {body.hex()}")
         packet = ImpedancePacket().transfer(body)
 
 # 信号数据

qlsdk/rsc/device/base.py

@@ -20,6 +20,9 @@ class QLBaseDevice(IDevice):
         # 启动数据解析线程
         self._parser: IParser = None
         
+        # 用在edf/bdf文件写入中，不建议使用
+        self._record_duration = None    
+        
         # 设备信息
         self.device_id = None
         self.device_name = None
@@ -130,8 +133,11 @@ class QLBaseDevice(IDevice):
     def parser(self) -> IParser:
         return self._parser
     
+    def set_record_duration(self, record_duration: float):
+        self._record_duration = record_duration      
+    
     # 数据包处理
-    def produce(self, data: RscPacket):
+    def produce(self, data: RscPacket, type:Literal['signal', 'impedance']="signal"):
         if data is None: return     
         
         # 处理信号数据
@@ -147,6 +153,10 @@ class QLBaseDevice(IDevice):
             
             # 发送数据包到订阅者
             for q in list(self.signal_consumers.values()):
+                # 队列满了就丢弃最早的数据
+                if q.full(): 
+                    q.get()
+                    
                 q.put(data)
                 
     # 信号数据转换(默认不处理)
@@ -176,7 +186,8 @@ class QLBaseDevice(IDevice):
     
     def stop_listening(self):
         logger.trace(f"设备{self.device_no}停止socket监听")
-        self._listening = False
+        self._listening = False        
+        self._parser.stop()
         
     @property
     def device_type(self) -> int:

qlsdk/rsc/device/c16_rs.py

@@ -23,7 +23,8 @@ class C16RS(QLBaseDevice):
         
         super().__init__(socket)
         # 存储通道反向映射位置值
-        self._reverse_ch_pos  = None        
+        self._reverse_ch_pos  = None    
+        
         self.channel_name_mapping = {
             "FP1": 1, 
             "FP2": 2, 
@@ -45,79 +46,59 @@ class C16RS(QLBaseDevice):
             "P3": 18, 
             "P7": 19, 
             "P4": 20, 
-            "P8": 21
+            "P8": 21,
+            "T3": 8,
+            "T4": 9, 
+            "A1": 10, 
+            "A2": 11, 
         }
         
-        # self.channel_mapping = {
-        #     "1": 61, 
-        #     "2": 62, 
-        #     "3": 63, 
-        #     "4": 64, 
-        #     "5": 65, 
-        #     "6": 66, 
-        #     "7": 68, 
-        #     "8": 67,
-        #     "9": 53, 
-        #     "10": 54, 
-        #     "11": 55, 
-        #     "12": 57, 
-        #     "13": 59, 
-        #     "14": 58, 
-        #     "15": 60, 
-        #     "16": 56, 
-        #     "17": 26, 
-        #     "18": 25, 
-        #     "19": 24, 
-        #     "20": 23, 
-        #     "21": 22
-        # }        
-        
         self.channel_mapping = {
-            "1": 2, 
-            "2": 3, 
-            "3": 27, 
-            "4": 31, 
-            "5": 60, 
-            "6": 61, 
-            "7": 25, 
-            "8": 29,
-            "9": 33, 
-            "10": 62, 
-            "11": 63, 
-            "12": 10, 
-            "13": 14, 
-            "14": 8, 
-            "15": 12, 
-            "16": 16, 
-            "17": 43, 
-            "18": 45, 
-            "19": 47, 
-            "20": 49, 
-            "21": 51
+            "1": 59, 
+            "2": 60, 
+            "3": 53, 
+            "4": 50, 
+            "5": 51, 
+            "6": 64, 
+            "7": 49, 
+            "8": 63,
+            "9": 24, 
+            "10": 14, 
+            "11": 10, 
+            "12": 11, 
+            "13": 57, 
+            "14": 16, 
+            "15": 55, 
+            "16": 15, 
+            "17": 40, 
+            "18": 37, 
+            "19": 34, 
+            "20": 18, 
+            "21": 47
         }
         
         self.channel_display_mapping = {
-            2: 1, 
-            3: 2, 
-            27: 3, 
-            31: 4, 
-            60: 5, 
-            61: 6, 
-            25: 7, 
-            29: 8,
-            33: 9, 
-            62: 10, 
-            63: 11, 
-            10: 12, 
-            14: 13, 
-            8: 14, 
-            12: 15, 
-            16: 16, 
-            43: 17, 
-            45: 18, 
-            47: 19, 
-            49: 20, 
-            51: 21
+            59: 1, 
+            60: 2, 
+            53: 3, 
+            50: 4, 
+            51: 5, 
+            64: 6, 
+            49: 7, 
+            63: 8,
+            24: 9, 
+            14: 10, 
+            10: 11, 
+            11: 12, 
+            57: 13, 
+            16: 14, 
+            55: 15, 
+            15: 16, 
+            40: 17, 
+            37: 18, 
+            34: 19, 
+            18: 20, 
+            47: 21
         }
     
     
@@ -126,11 +107,10 @@ class C16RS(QLBaseDevice):
         rlt = cls(parent.socket)
         rlt.device_id = parent.device_id
         rlt._device_no = parent.device_no
-        return rlt
-        
+        return rlt  
         
     def init_edf_handler(self):
-        self._edf_handler = RscEDFHandler(self.sample_rate,  self.sample_range * 1000 , - self.sample_range * 1000, self.resolution)  
+        self._edf_handler = RscEDFHandler(self.sample_rate,  self.sample_range * 1000 , - self.sample_range * 1000, self.resolution, record_duration = self._record_duration)  
         self._edf_handler.set_device_type(self.device_type)
         self._edf_handler.set_device_no(self.device_no)
         self._edf_handler.set_storage_path(self._storage_path)

qlsdk/rsc/device/device_factory.py

@@ -16,7 +16,7 @@ class DeviceFactory(object):
     
     @classmethod
     def create_device(cls, device: IDevice) -> Type[IDevice]:
-        logger.debug(f"Creating device for device type: {hex(device.device_type)}, support types: {cls._devices.keys()}")
+        logger.trace(f"Creating device for device type: {hex(device.device_type)}, support types: {cls._devices.keys()}")
         if device.device_type not in cls._devices.keys():
             logger.warning(f"不支持的设备类型: {hex(device.device_type)}")
             raise ValueError(f"Unsupported device type: {hex(device.device_type)}")

qlsdk/rsc/interface/device.py

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 import abc
+from typing import Literal
 
 class  IDevice(ABC):     
     
@@ -11,11 +12,20 @@ class  IDevice(ABC):
     def set_device_type(self, value: int):
         pass
     
+    def set_storage_path(self, path: str):
+        pass
+    
+    def set_file_prefix(self, pre: str):
+        pass
+    
+    def set_acq_param(self, channels, sample_rate = 500, sample_range = 188):
+        pass
+    
     @property
     def device_no(self) -> str:
         pass
     
-    def produce(self, data) -> None:
+    def produce(self, data, type:Literal['signal', 'impedance']="signal") -> None:
         pass
     
     def start_listening(self):

qlsdk/rsc/manager/container.py

@@ -50,7 +50,7 @@ class DeviceContainer(object):
         try:
             # 绑定到所有接口的19216端口
             tcp_socket.bind(('0.0.0.0', self._tcp_port))
-            tcp_socket.listen(5)
+            tcp_socket.listen(100)
             logger.info(f"端口[{self._tcp_port}]监听服务已启动")
 
             while True:
@@ -59,16 +59,21 @@ class DeviceContainer(object):
                 
                 
                 # 为每个新连接创建线程处理
-                client_handler = Thread(
-                    target=self.client_handler,
-                    args=(client_socket,),
-                    daemon=True
-                )
-                
-                client_handler.start()
+                try:
+                    client_handler = Thread(
+                        target=self.client_handler,
+                        args=(client_socket,),
+                        daemon=False
+                    )
+                    
+                    client_handler.start()
+                except Exception as e:
+                    logger.error(f"Handler Error: {e}")
                 
         except KeyboardInterrupt:
             logger.error(f"端口[{self._tcp_port}]监听服务异常关闭")
+        except Exception as e:
+            logger.error(f"端口[{self._tcp_port}]监听服务异常: {e}")
         finally:
             logger.error(f"端口[{self._tcp_port}]监听服务关闭")
             tcp_socket.close()

qlsdk/rsc/parser/base-new.py

@@ -0,0 +1,135 @@
+from enum import Enum
+import threading
+import collections
+from typing import Optional
+
+from loguru import logger
+from qlsdk.rsc.interface import IDevice, IParser
+from qlsdk.rsc.command import CommandFactory
+
+# 解析状态机
+class ParserState(Enum):
+    FIND_HEADER = 1
+    READ_LENGTH = 2
+    READ_BODY = 3
+
+class TcpMessageParser(IParser):
+    HEADER = b'\x5a\xa5'
+    HEADER_LEN = 14
+    MAX_PKG_LEN = 1 * 1024 * 1024        # 1 MB
+    MAX_BUF_LEN = 100 * 1024 * 1024       # 10 MB
+    READ_CHUNK = 4096
+
+    def __init__(self, device: IDevice):
+        self.device = device
+
+        # 生产者-消费者缓冲区：线程安全 deque + bytearray
+        self._buf = bytearray()
+        self._lock = threading.Lock()
+        self._not_empty = threading.Condition(self._lock)
+
+        self._running = threading.Event()
+
+    # ---------- 生产者 ----------
+    def append(self, data: bytes) -> None:
+        logger.info(f"接收数据: {data.hex()}")
+        with self._not_empty:
+            if len(self._buf) + len(data) > self.MAX_BUF_LEN:
+                logger.warning("缓冲区超限，丢弃旧数据")
+                self._buf.clear()
+            self._buf.extend(data)
+            self._not_empty.notify()
+
+    # ---------- 消费者 ----------
+    def start(self) -> None:
+        self._running.set()
+        self._thread = threading.Thread(target=self._parser_loop, daemon=True)
+        self._thread.start()
+
+    def stop(self) -> None:
+        self._running.clear()
+        with self._not_empty:
+            self._not_empty.notify_all()
+        self._thread.join(timeout=1)
+
+    # ---------- 解析主循环 ----------
+    def _parser_loop(self) -> None:
+        """状态机：找头 -> 读长度 -> 读体 -> 校验 -> 投递"""
+        state = ParserState.FIND_HEADER
+        need = len(self.HEADER)
+        header_pos = 0
+        pkg_len = 0
+        logger.info("数据解析开始")
+
+        while self._running.is_set():
+            with self._not_empty:
+                while len(self._buf) < need:
+                    if not self._running.is_set():
+                        return
+                    self._not_empty.wait(timeout=0.1)
+
+                view = memoryview(self._buf)  # 零拷贝视图
+
+                if state == ParserState.FIND_HEADER:
+                    # idx = view.find(self.HEADER)
+                    # if idx == -1:
+                    #     # 整段数据都没有头，全部丢弃
+                    #     del self._buf[:len(self._buf) - 1]
+                    #     continue
+                    # # 去掉头部之前可能残留的脏数据
+                    # del self._buf[:idx]
+                    # state = 'READ_LENGTH'
+                    # need = self.HEADER_LEN
+                    # continue
+                    with self._not_empty:
+                        while len(view) < need:
+                            if not self._running.is_set():
+                                return
+                            self._not_empty.wait(timeout=0.1)
+
+                    # 1. 用 bytearray.find 找包头
+                    idx = view.find(self.HEADER)
+                    if idx == -1:
+                        # 没有包头，保留最后 len(self.HEADER)-1 个字节即可
+                        del self._buf[:-len(self.HEADER) + 1 or None]
+                        continue
+
+                    # 2. 去掉头部的脏数据
+                    del self._buf[:idx]
+                    state = 'READ_LENGTH'
+                    need = self.HEADER_LEN
+                    continue
+
+                if state == 'READ_LENGTH':
+                    pkg_len = int.from_bytes(view[8:12], 'little')
+                    if pkg_len < self.HEADER_LEN or pkg_len > self.MAX_PKG_LEN:
+                        logger.warning(f"非法包长度 {pkg_len}，丢弃")
+                        del self._buf[:1]        # 跳过当前头继续找下一个
+                        state = 'FIND_HEADER'
+                        need = len(self.HEADER)
+                        continue
+
+                    state = 'READ_BODY'
+                    need = pkg_len
+                    continue
+
+                if state == 'READ_BODY':
+                    packet = bytes(view[:pkg_len])      # 拷贝一份完整包
+                    del self._buf[:pkg_len]             # 从缓冲区删除
+                    self._dispatch(packet)
+                    state = 'FIND_HEADER'
+                    need = len(self.HEADER)
+
+    # ---------- 业务分发 ----------
+    def _dispatch(self, packet: bytes) -> None:
+        try:
+            cmd = int.from_bytes(packet[12:14], 'little')
+            cls = CommandFactory.create_command(cmd)
+            inst = cls(self.device)
+            inst.parse_body(packet[self.HEADER_LEN:-2])  # 去掉头尾
+        except Exception as exc:
+            logger.exception(f"解析失败: {exc}")
+
+    # ---------- 工具 ----------
+    def set_device(self, device: IDevice) -> None:
+        self.device = device

qlsdk/rsc/parser/base.py

@@ -41,64 +41,67 @@ class TcpMessageParser(IParser):
         # self.cache.write(buffer)
         with self._lock:
             self.cache.write(value)
-        
+            
     def __parser__(self):
-        logger.trace("数据解析开始")
+        logger.info("数据解析开始")
         
         # 告警阈值（10M)
         warn_len = 10 * 1024 * 1024
         
-        while self.running:
-            buf_len = get_len(self.buffer)
-            
-            # logger.info(f"当前操作区缓存长度: {buf_len}, 缓存内容: {self.buffer.getvalue().hex()}")
-            if buf_len < self.header_len:
-                # logger.trace(f"操作区缓存数据不足: {len}, 等待数据...")
-                if not self.__fill_from_cache():
-                    time.sleep(0.05)
+        try:
+            while self.running:
+                buf_len = get_len(self.buffer)
+                
+                if buf_len < self.header_len:
+                    logger.trace(f"操作区缓存数据不足: expect: {self.header_len}, actual: {buf_len}, 等待数据...")
+                    if not self.__fill_from_cache():
+                        time.sleep(0.1)
+                        continue
+                    
+                if buf_len > warn_len:
+                    logger.warning(f"操作区缓存数据过大: {buf_len} bytes, 可能存在数据丢失风险")
+                    
+                start_pos = self.buffer.tell()
+                head = self.buffer.read(2)
+                if head != self.header:
+                    logger.debug(f"数据包头部不匹配: {head.hex()}, 期望: {self.header.hex()},继续查找...")
+                    self.buffer.seek(start_pos + 1)  # 移动到下一个字节
                     continue
                 
-            if buf_len > warn_len:
-                logger.warning(f"操作区缓存数据过大: {buf_len} bytes, 可能存在数据丢失风险")
+                # 移动下标(指向包长度的位置)
+                self.buffer.seek(start_pos + 8)
+                # 包总长度
+                pkg_len = int.from_bytes(self.buffer.read(4), 'little')
+                buf_len = get_len(self.buffer)
                 
-            start_pos = self.buffer.tell()
-            # logger.info(f"当前缓存位置: {start_pos}")
-            head = self.buffer.read(2)
-            # logger.info(f'当前缓存头部: {head.hex()}')
-            if head != self.header:
-                logger.debug(f"数据包头部不匹配: {head.hex()}, 期望: {self.header.hex()},继续查找...")
-                self.buffer.seek(start_pos + 1)  # 移动到下一个字节
-                continue
-            
-            # 移动下标(指向包长度的位置)
-            self.buffer.seek(start_pos + 8)
-            # 包总长度
-            pkg_len = int.from_bytes(self.buffer.read(4), 'little')
-            # logger.trace(f" cache len: {len(self.cache)}, pkg_len len: {len(self.cache)}")
-            
-            buf_len = get_len(self.buffer)
-            # 直接等待长度足够（如果从头开始判断，因为逻辑相同，所以会执行一样的操作）
-            while buf_len < pkg_len:
-                if self.__fill_from_cache():
-                    continue
-                else:
-                    time.sleep(0.05)
-                    
-            # 读取剩余数据
-            self.buffer.seek(pkg_len)
-            tmp = self.buffer.read()    
-            
-            # 读取当前数据包         
-            self.buffer.seek(start_pos)
-            pkg = self.buffer.read(pkg_len)
-            
-            # 清空操作区缓存(truncate会保留内存，重新初始化）
-            self.buffer = BytesIO()
-            if len(tmp) > 0:
-                self.buffer.write(tmp)                
-            self.buffer.seek(0)
-            
-            self.unpack(pkg)
+                # 直接等待长度足够（如果从头开始判断，因为逻辑相同，所以会执行一样的操作）
+                while buf_len < pkg_len:
+                    logger.trace(f"操作区缓存数据不足: expect: {pkg_len}, actual: {buf_len}, 等待数据...")
+                    if self.__fill_from_cache():
+                        buf_len = get_len(self.buffer)
+                        continue
+                    else:
+                        time.sleep(0.05)
+                        
+                # 读取剩余数据
+                self.buffer.seek(pkg_len)
+                tmp = self.buffer.read()    
+                
+                # 读取当前数据包         
+                self.buffer.seek(start_pos)
+                pkg = self.buffer.read(pkg_len)
+                
+                # 清空操作区缓存(truncate会保留内存，重新初始化）
+                self.buffer = BytesIO()
+                if len(tmp) > 0:
+                    self.buffer.write(tmp)                
+                self.buffer.seek(0)
+                
+                self.unpack(pkg)
+        except Exception as e:
+            logger.error(f"数据解析异常: {e}")
+                
+        logger.info(f"数据解析结束:{self.running}")
     
     # 填充操作区缓存
     def __fill_from_cache(self) -> bool:   
@@ -107,13 +110,18 @@ class TcpMessageParser(IParser):
         cur_pos = self.buffer.tell()
         # 移动到操作区缓存末尾，内容追加到缓冲区尾部
         self.buffer.seek(0,2)
+        len = self.buffer.tell()
         # 操作缓冲区
-        with self._lock:
-            self.cache.seek(0, 2)     
+        with self._lock: 
+            cache_len = get_len(self.cache)
             
             # 临时缓冲区只要有数据，就写入操作缓冲区（避免分片传输导致数据不完整）
-            if self.cache.tell() > 0:       
-                self.buffer.write(self.cache.getvalue())
+            if cache_len > 0:      
+                if len == 0:
+                    self.buffer = self.cache
+                    cur_pos = 0
+                else: 
+                    self.buffer.write(self.cache.getvalue())
                 self.cache = BytesIO()  # 清空缓冲区
                 result = True
             
@@ -125,12 +133,8 @@ class TcpMessageParser(IParser):
         # 提取指令码
         cmd_code = int.from_bytes(packet[self.cmd_pos : self.cmd_pos + 2], 'little')
         cmd_class = CommandFactory.create_command(cmd_code)
-        # logger.trace(f"收到指令：{cmd_class.cmd_desc}[{hex(cmd_code)}]")
         instance = cmd_class(self.device)
-        start = time_ns()
-        # logger.trace(f"开始解析: {start}")
         instance.parse_body(packet[self.header_len:-2])
-        # logger.trace(f"解析完成:{time_ns()}, 解析耗时：{time_ns() - start}ns")
         return instance
             
     def start(self):
@@ -138,6 +142,9 @@ class TcpMessageParser(IParser):
         parser = Thread(target=self.__parser__, daemon=True)
         parser.start()
         
+    def stop(self):
+        self.running = False
+        
 # 工具方法
 def get_len(buf: BytesIO) -> int:
         if buf is None:

qlsdk2-0.5.1.dist-info/METADATA

@@ -0,0 +1,57 @@
+Metadata-Version: 2.1
+Name: qlsdk2
+Version: 0.5.1
+Summary: SDK for quanlan device
+Home-page: https://github.com/hehuajun/qlsdk
+Author: hehuajun
+Author-email: hehuajun@eegion.com
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: Microsoft :: Windows :: Windows 10
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+Requires-Dist: loguru >=0.6.0
+Requires-Dist: numpy >=1.23.5
+Requires-Dist: bitarray >=1.5.3
+Provides-Extra: dev
+Requires-Dist: pytest >=6.0 ; extra == 'dev'
+Requires-Dist: twine >=3.0 ; extra == 'dev'
+
+# 版本 v0.5.1 (2025-08-04)
+
+## ⚙️ 优化
+#### 修复C16R通道映射的问题
+
+#### 支持设置记录参数，在需要保存大量事件时使用
+
+#### 订阅队列满的时候，丢弃最早的数据
+
+
+# 版本 v0.5.0 (2025-07-29)
+
+## 🚀 新特性
+
+1. **C16R设备连接**  
+   支持C16R类型设备的搜索与连接
+
+2. **C16R信号采集/停止控制**  
+   支持信号采集的参数配置
+   支持信号采集的启动与停止控制
+
+3. **C16R数据自动记录**  
+   采集到的信号数据自动保存为bdf文件
+
+4. **C16R采集通道设置**  
+   - 支持数字模式通道配置
+   - 支持名称模式通道配置  
+   - 支持两种模式混合使用
+
+## ⚙️ 优化
+
+1. **性能提升**  
+   - 信号接收效率优化  
+   - 指令拆包方式优化
+
+2. **日志系统改进**  
+   - 日志级别精细化调整，减少不必要的日志信息
+   - 日志文案清晰化

{qlsdk2-0.5.0.dist-info → qlsdk2-0.5.1.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=OHedug2XusjSuxQ479bcX5IVq35FTFWEfYriFT3rEzY,3339
+qlsdk/core/entity/__init__.py,sha256=1BBbL41zqb0_UsxgoiuyG5zM0CKVzT5VUA_BXSKZmAs,3177
 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
@@ -20,7 +20,7 @@ qlsdk/core/network/monitor.py,sha256=QqjjPwSr1kgqDTTySp5bpalZmsBQTaAWSxrfPLdROZo
 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=wV3akdwzEihDAyR9DtmO0jNdLH1jEvx34ghJQtrfk2k,12578
+qlsdk/persist/rsc_edf.py,sha256=89Wv7r6u_J4fHlGKsIBAUYD7SOdfqFRxbwV2asvutH8,13315
 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
@@ -29,28 +29,29 @@ 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=FpumdCRV3aSnCvLT7MceMb7lF8WgGbdi_w0L8wX7ryg,12137
+qlsdk/rsc/command/__init__.py,sha256=2rqWM23fFqvFfgN7K3PLT7rkTyW9mawK4OGCo63hnJg,12292
 qlsdk/rsc/command/message.py,sha256=nTdG-Vp4MBnltyrgedAWiKD6kzOaPrg58Z_hq6yjhys,12220
 qlsdk/rsc/device/__init__.py,sha256=xtTXLT9QFKtb-qS-A8-ewSxJ3zXgImFCX0OoAPw6hHE,185
 qlsdk/rsc/device/arskindling.py,sha256=owci6MEGjyWqohEXzPdKj_ESeVIZKgO53StVj6Tmi18,15002
-qlsdk/rsc/device/base.py,sha256=6cMaACVVgZ7oKdqbyVRl3B32M9Em6_jjr-FUuxRW6Ys,17404
-qlsdk/rsc/device/c16_rs.py,sha256=IpJn4hBFHg67lvWkl8kAAztdZYsgi2-njFuxMi2SsHQ,6390
+qlsdk/rsc/device/base.py,sha256=osLToxNrb745OzCpgXZU5AH72emMh4OxATeqy4fCxsg,17856
+qlsdk/rsc/device/c16_rs.py,sha256=BHQRHOnsTMAKgqSXaAS2RjPIklZQAl2CVfe6i_iX-i4,5928
 qlsdk/rsc/device/c256_rs.py,sha256=K1XmLqZpvHTAfCm_dr2VsGxHc67aJQVDV1cI41a1WTI,13955
 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=P8nNDB2qk0kbu4OMYtEZMKSdXWp-7fLDzuNyR1Thf8Q,1315
+qlsdk/rsc/device/device_factory.py,sha256=AL_dtjx6ThcyWTHxGSrLKjEDaCt1Y9gClK4HQ5FGjFI,1315
 qlsdk/rsc/interface/__init__.py,sha256=xeRzIlQSB7ZSf4r5kLfH5cDQLzCyWeJAReG8Xq5nOE0,70
 qlsdk/rsc/interface/command.py,sha256=1s5Lxb_ejsd-JNvKMqU2aFSnOoW-_cx01VSD3czxmQI,199
-qlsdk/rsc/interface/device.py,sha256=apBQAeu1g0Qmw73qQqr6uG1re9qCep6oKfjWKlGJdp4,3092
+qlsdk/rsc/interface/device.py,sha256=VEV-Ige8tjvASdddP6SPRolTqPuIuHrIZP8wiX-Fhu8,3391
 qlsdk/rsc/interface/handler.py,sha256=ADDe_a2RAxGMuooLyivH0JBPTGBcFP2JaTVX41R1A4w,198
 qlsdk/rsc/interface/parser.py,sha256=DxuFZiprJJbG4pfFbbZPaG8MlBiBRe0S0lJrvc2Iees,251
 qlsdk/rsc/manager/__init__.py,sha256=4ljT3mR8YPBDQur46B5xPqK5tjLKlsWfgCJVuA0gs-8,40
-qlsdk/rsc/manager/container.py,sha256=N9QB85FOA_7Oa_8M1y1M2UODA_tpS9JQONhGj8ObBG8,4811
+qlsdk/rsc/manager/container.py,sha256=mowoFJNVDSEhqsz-EDzPVDcMRiuu_oakdGLZbJrPvlM,5071
 qlsdk/rsc/manager/search.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qlsdk/rsc/network/__init__.py,sha256=PfYiqXS2pZV__uegQ1TjaeYhY1pefZ_shwE_X5HNVbs,23
 qlsdk/rsc/network/discover.py,sha256=4aojzRFInTC3d8K2TYGbnP1Ji5fOFEi31ekghj7ce5k,2977
 qlsdk/rsc/parser/__init__.py,sha256=8RgwbKCINu3eTsxVLF9cMoBXJnVrDocOEFP6NGP_atk,34
-qlsdk/rsc/parser/base.py,sha256=s6tkWQXoMq8ZA4Nns_aG1JS5PV3UXLMFarTZiCoPagM,5504
+qlsdk/rsc/parser/base-new.py,sha256=cAOy1V_1fAJyGq7bm7uLxpW41DbkllWOprnfWKpjtsQ,5116
+qlsdk/rsc/parser/base.py,sha256=Cqel02BA_AH-deSmzTyUvqecIGoYVBre5UuFlG1eNGA,5728
 qlsdk/sdk/__init__.py,sha256=v9LKP-5qXCqnAsCkiRE9LDb5Tagvl_Qd_fqrw7y9yd4,68
 qlsdk/sdk/ar4sdk.py,sha256=tugH3UUeNebdka78AzLyrtAXbYQQE3iFJ227zUit6tY,27261
 qlsdk/sdk/hub.py,sha256=uEOGZBZtMDCWlV8G2TZe6FAo6eTPcwHAW8zdqr1eq_0,1571
@@ -58,7 +59,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.5.0.dist-info/METADATA,sha256=Lp7nByzF1dCM1LGXQxyKv8sc-vkTDuLjZtw9nu_JFBk,1134
-qlsdk2-0.5.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-qlsdk2-0.5.0.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
-qlsdk2-0.5.0.dist-info/RECORD,,
+qlsdk2-0.5.1.dist-info/METADATA,sha256=vJ3DPDoa8rM-m9YdziuNsMNlnx5o21C570W8uZ7FtZU,1572
+qlsdk2-0.5.1.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+qlsdk2-0.5.1.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
+qlsdk2-0.5.1.dist-info/RECORD,,

{qlsdk2-0.5.0.dist-info → qlsdk2-0.5.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

qlsdk2-0.5.0.dist-info/METADATA

@@ -1,40 +0,0 @@
-Metadata-Version: 2.2
-Name: qlsdk2
-Version: 0.5.0
-Summary: SDK for quanlan device
-Home-page: https://github.com/hehuajun/qlsdk
-Author: hehuajun
-Author-email: hehuajun@eegion.com
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-Requires-Dist: loguru>=0.6.0
-Requires-Dist: numpy>=1.23.5
-Requires-Dist: bitarray>=1.5.3
-Provides-Extra: dev
-Requires-Dist: pytest>=6.0; extra == "dev"
-Requires-Dist: twine>=3.0; extra == "dev"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
-版本：v0.5.0 
-时间：2025-07-29
-[新特性]
-1. C16R设备搜索
-2、C16R设备连接
-3、C16R信号采集/停止
-4、C16R数据自动记录到文件
-5、C16R采集通道设置支持数字和名称两种模式（可混用）
-
-[优化]
-1、提升信号接收及指令解析性能
-2、日志级别及文案优化