qlsdk2 0.5.1.1__py3-none-any.whl → 0.6.0a1__py3-none-any.whl

qlsdk/core/entity/__init__.py

@@ -21,33 +21,37 @@ class RscPacket(Packet):
         self.trigger = None
         self.eeg = None
     
-    def transfer(self, body: bytes) -> 'RscPacket':
-        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')
-        self.sample_num = int.from_bytes(body[53: 57], 'little')
-        self.resolution = int(int(body[57]) / 8)
-        self.filter = body[58]
-        self.data_len = int.from_bytes(body[59: 63], 'little')
+    @staticmethod
+    def transfer(body: bytes) -> 'RscPacket':
+        packet = RscPacket()
+        packet.time_stamp = int.from_bytes(body[0:8], 'little')
+        packet.result = body[8]
+        packet.pkg_id = int.from_bytes(body[9: 13], 'little')
+        logger.trace(f"pkg_id: {packet.pkg_id}")
+        packet.channels = to_channels(body[13: 45])
+        packet.origin_sample_rate = int.from_bytes(body[45: 49], 'little')
+        packet.sample_rate = int.from_bytes(body[49: 53], 'little')
+        packet.sample_num = int.from_bytes(body[53: 57], 'little')
+        packet.resolution = int(int(body[57]) / 8)
+        packet.filter = body[58]
+        packet.data_len = int.from_bytes(body[59: 63], 'little')
         # 步径 相同通道的点间隔
-        step = int(len(self.channels) * self.resolution + 4)
-        self.trigger = [int.from_bytes(body[i:i+4], 'little') for i in range(63, len(body) - 3, step)]
+        step = int(len(packet.channels) * packet.resolution + 4)
         b_eeg = body[63:]
-        ch_num = len(self.channels) 
-        self.eeg = [
+        ch_num = len(packet.channels) 
+        # 字节序列(4Cn{channel_size}){sample_num})
+        packet.trigger = [int.from_bytes(b_eeg[j * step : j * step + 4], 'little', signed=False) for j in range(packet.sample_num)]
+        
+        packet.eeg = [
             [
-                int.from_bytes(b_eeg[i * self.resolution + 4 + j * step:i * self.resolution + 4 + j * step + 3], 'big', signed=True)
-                for j in range(self.sample_num)
+                int.from_bytes(b_eeg[i * packet.resolution + 4 + j * step:i * packet.resolution + 4 + j * step + 3], 'big', signed=True)
+                for j in range(packet.sample_num)
             ]
             for i in range(ch_num)
         ]
                 
         # logger.trace(self)
-        return self
+        return packet
         
     def __str__(self):
         return f"""
@@ -86,4 +90,75 @@ class ImpedancePacket(Packet):
             channels: {self.channels}
             data len: {self.data_len}
             impedance: {self.impedance}
-        """
+        """
+        
+    
+class C256RSPacket(Packet):
+    def __init__(self):
+        super().__init__()
+        self.origin_sample_rate = None
+        self.sample_rate = None
+        self.sample_num = None
+        self.resolution = None
+        self.filter = None
+        self.data_len = None
+        self.trigger = None
+        self.eeg = None
+    
+    @staticmethod
+    def transfer(body: bytes) -> 'RscPacket':
+        packet = RscPacket()
+        packet.time_stamp = int.from_bytes(body[0:8], 'little')
+        packet.result = body[8]
+        packet.pkg_id = int.from_bytes(body[9: 13], 'little')
+        packet.channels = to_channels(body[13: 45])
+        logger.trace(f"pkg_id: {packet.pkg_id}, channels: {packet.channels}")
+            
+        packet.origin_sample_rate = int.from_bytes(body[45: 49], 'little')
+        packet.sample_rate = int.from_bytes(body[49: 53], 'little')
+        packet.sample_num = int.from_bytes(body[53: 57], 'little')
+        packet.resolution = int(int(body[57]) / 8)
+        packet.filter = body[58]
+        packet.data_len = int.from_bytes(body[59: 63], 'little')
+                
+        # 数据块
+        b_eeg = body[63:]
+        # 根据值域分割数组-代表设备的4个模块
+        ranges = [(1, 64), (65, 128), (129, 192), (193, 256)]
+        sub_channels = [[x for x in packet.channels if low <= x <= high] for low, high in ranges]
+        # 只处理选中的模块
+        sub_channels = [_ for _ in sub_channels if len(_) > 0]
+        # 步径 相同通道的点间隔
+        step = int(len(packet.channels) * packet.resolution + 4 * len(sub_channels))
+        offset = 0
+        
+        # 分按子模块处理
+        for channels in sub_channels:
+            logger.trace(f"子数组: {channels} 长度: {len(channels)}")
+            channel_size = len(channels) 
+            
+            # 模块没有选中通道的，跳过
+            if channel_size == 0:
+                continue
+            
+            # 只保留第一个有效模块的trigger，其他的模块是冗余信息，无实际含义
+            if packet.trigger is None:
+                packet.trigger = [int.from_bytes(b_eeg[j * step : j * step + 4], 'little', signed=False) for j in range(packet.sample_num)]
+                logger.trace(f"trigger: {packet.trigger}")
+                trigger_positions = [index for index, value in enumerate(packet.trigger) if value != 0]
+                if len(trigger_positions) > 0:
+                    logger.debug(f"Trigger触发点位置: {trigger_positions}, 触发点时间戳: {[packet.time_stamp + int(pos * 1000 / packet.sample_rate) for pos in trigger_positions]}")
+                
+            eeg = [
+                [
+                    int.from_bytes(b_eeg[offset + step * j + 4 +  k * packet.resolution : offset + step * j + 7 +  k * packet.resolution], 'big', signed=True)
+                    for j in range(packet.sample_num)
+                ]
+                for k in range(channel_size)
+            ]
+            packet.eeg = packet.eeg + eeg if packet.eeg else eeg
+            
+            offset += 4 + channel_size * packet.resolution 
+            
+        logger.trace(packet)
+        return packet

qlsdk/core/message/udp.py

@@ -2,7 +2,7 @@
 from enum import Enum
 from time import timezone
 from qlsdk.core.crc import check_crc, crc16
-from qlsdk.core.local import get_ip
+from qlsdk.core.local import get_ip, get_ips
 
 from loguru import logger
 
@@ -72,6 +72,14 @@ class UDPMessage(object):
         if server_ip is None:
             server_ip = get_ip()
             
+        return UDPMessage._search_(device_id, server_ip, server_port)
+    
+    @staticmethod
+    def _search_(device_id : str, server_ip : str, server_port : int=19216):
+        # 服务端Ip
+        if server_ip is None:
+            raise ValueError("server_ip is None")
+            
         logger.debug(f"search device {device_id} on {server_ip}:{server_port}")
             
         message = bytearray(28)

qlsdk/interface/__init__.py

@@ -0,0 +1,10 @@
+from parser import *
+
+from device import *
+
+
+'''
+    设备消息解析器
+'''
+class DeviceMessageParser:
+    pass

qlsdk/interface/analyzer.py

@@ -0,0 +1,2 @@
+class IAnalyzer:
+    pass

qlsdk/interface/collector.py

@@ -0,0 +1,10 @@
+class ICollector:
+    def __init__(self):
+        pass
+
+    def collect_data(self):
+        pass
+    
+class Collector(ICollector):
+    def __init__(self):
+        super().__init__()

qlsdk/interface/device.py

@@ -0,0 +1,2 @@
+class IDevice:
+    pass

qlsdk/interface/parser.py

@@ -0,0 +1,13 @@
+class IParser:
+    pass
+
+class Parser(IParser):
+    def __init__(self):
+        super().__init__()
+        
+class MessageParser(Parser):
+    def __init__(self):
+        super().__init__()
+        
+    def parse(self, data):
+        pass

qlsdk/interface/stimulator.py

@@ -0,0 +1,2 @@
+class IStimulator:
+    pass

qlsdk/interface/store.py

@@ -0,0 +1,2 @@
+class IStore:
+    pass

qlsdk/persist/rsc_edf.py

@@ -260,6 +260,8 @@ class RscEDFHandler(object):
             self._device_type = "C64RS"
         elif device_type == 0x40:
             self._device_type = "LJ64S1"
+        elif device_type == 0x51:
+            self._device_type = "C256RS"
         elif device_type == 0x60:
             self._device_type = "ARSKindling"
         elif device_type == 0x339:

qlsdk/rsc/command/__init__.py

@@ -309,11 +309,11 @@ class SignalDataCommand(DeviceCommand):
         return super().unpack(payload)
     
     def parse_body(self, body: bytes):     
-        # 解析数据包
-        packet = RscPacket()
-        packet.transfer(body)  
+        # # 解析数据包
+        # packet = RscPacket()
+        # packet.transfer(body)  
         # 将数据包传递给设备
-        self.device.produce(packet)
+        self.device.produce(body)
                 
             
 

qlsdk/rsc/device/__init__.py

@@ -4,4 +4,5 @@ from .device_factory import DeviceFactory
 # import devices
 from .c64_rs import C64RS
 from .c16_rs import C16RS
-from .arskindling import ARSKindling
+from .arskindling import ARSKindling
+from .c256_rs import C256RS

qlsdk/rsc/device/base.py

@@ -1,4 +1,3 @@
-
 from multiprocessing import Queue
 from threading import Thread
 from time import sleep, time_ns
@@ -8,10 +7,9 @@ from loguru import logger
 import numpy as np
 from qlsdk.core.entity import RscPacket
 from qlsdk.core.utils import to_bytes
-from qlsdk.persist import RscEDFHandler
 from qlsdk.rsc.interface import IDevice, IParser
-from qlsdk.rsc.parser import TcpMessageParser
 from qlsdk.rsc.command import StartImpedanceCommand, StopImpedanceCommand, StartStimulationCommand, StopStimulationCommand, SetAcquisitionParamCommand, StartAcquisitionCommand, StopAcquisitionCommand
+from qlsdk.rsc.parser.base import TcpMessageParser
 
 class QLBaseDevice(IDevice):
     def __init__(self, socket):
@@ -137,12 +135,18 @@ class QLBaseDevice(IDevice):
         self._record_duration = record_duration      
     
     # 数据包处理
-    def produce(self, data: RscPacket, type:Literal['signal', 'impedance']="signal"):
-        if data is None: return     
+    def produce(self, body: bytes, type:Literal['signal', 'impedance']="signal"):
+        if body is None: return     
         
         # 处理信号数据
-        self._signal_wrapper(data)   
-        
+        data = self._signal_wrapper(body)   
+        # logger.debug("pkg_id: {}, eeg len: {}".format(data.pkg_id, len(data.eeg)))
+        # 
+        trigger_positions = [index for index, value in enumerate(data.trigger) if value != 0]
+        if len(trigger_positions) > 0:
+            # logger.debug(f"Trigger触发点位置: {trigger_positions}, 触发点时间戳: {[data.time_stamp + int(pos * 1000 / data.sample_rate) for pos in trigger_positions]}")
+            for pos in trigger_positions:
+                self.trigger(data.trigger[pos])
         # 存储
         if self.storage_enable:
             self._write_signal(data)
@@ -159,9 +163,9 @@ class QLBaseDevice(IDevice):
                     
                 q.put(data)
                 
-    # 信号数据转换(默认不处理)
-    def _signal_wrapper(self, data: RscPacket):
-        pass
+    # 信号数据转换
+    def _signal_wrapper(self, body: bytes):
+        return RscPacket().transfer(body)
                 
     def _write_signal(self, data: RscPacket):
         # 文件写入到edf
@@ -175,8 +179,10 @@ class QLBaseDevice(IDevice):
     def start_listening(self):        
         
         try:
+            # 启动消息解析器
             self.start_message_parser()
             
+            # 启动消息监听器
             self.start_message_listening()
         except Exception as e:
             logger.error(f"设备{self.device_no}准备失败: {str(e)}")
@@ -188,7 +194,22 @@ class QLBaseDevice(IDevice):
         logger.trace(f"设备{self.device_no}停止socket监听")
         self._listening = False        
         self._parser.stop()
-        
+     
+    def read_msg(self, size: int) -> bytes:
+        try:
+            self.socket.settimeout(2.0)
+            return self.socket.recv(size)
+        except Exception as e:
+            logger.error(f"read_msg exception: {str(e)}")
+            raise ValueError("read_msg exception") from e
+      
+    @classmethod
+    def from_parent(cls, parent:IDevice) -> IDevice:
+        rlt = cls(parent.socket)
+        rlt.device_id = parent.device_id
+        rlt._device_no = parent.device_no
+        return rlt
+         
     @property
     def device_type(self) -> int:
         return self._device_type
@@ -196,18 +217,21 @@ class QLBaseDevice(IDevice):
     def start_message_parser(self) -> None:
         self._parser = TcpMessageParser(self)
         self._parser.start()
-        logger.debug("TCP消息解析器已启动")
+        logger.debug("RSC消息解析器已启动")
     
     def start_message_listening(self) -> None:
         def _accept():
             while self._listening:
-                # 缓冲区4M
-                data = self.socket.recv(4096*1024)
-                if not data:
-                    logger.warning(f"设备[{self.device_name}]连接结束")
+                try:
+                    # 缓冲区4M
+                    data = self.socket.recv(4096*1024)
+                    if not data:
+                        logger.warning(f"设备[{self.device_name}]连接结束")
+                        break
+                    self._parser.append(data)
+                except Exception as e:
+                    logger.debug(f"设备[{self.device_name}]接收数据异常: {str(e)}")
                     break
-                
-                self._parser.append(data)
     
         # 启动数据接收线程
         self._listening = True
@@ -252,11 +276,6 @@ class QLBaseDevice(IDevice):
     def init_edf_handler(self):
         logger.warning("init_edf_handler not implemented in base class, should be overridden in subclass")
         pass
-    #     self._edf_handler = RscEDFHandler(self.sample_rate,  self.sample_range * 1000 , - self.sample_range * 1000, self.resolution)  
-    #     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)
-    #     self._edf_handler.set_file_prefix(self._file_prefix)
         
     # eeg数字值转物理值
     def eeg2phy(self, digital:int):
@@ -444,12 +463,26 @@ class QLBaseDevice(IDevice):
         
         return body
     
+    def disconnect(self):
+        logger.info(f"[断开设备-{self.device_no}]的连接...")  
+        self._listening = False
+        try:
+            sleep(0.1)
+            self.socket.shutdown(2)
+            self.socket.close()
+            logger.info(f"[设备-{self.device_no}]设备连接已断开")  
+        except Exception as e:
+            logger.error(f"断开设备连接异常: {str(e)}")
+         
+        # 关闭解析器
+        self._parser.stop()   
+    
     def __str__(self):
         return f''' 
             Device: 
                 Name: {self.device_name}, 
                 Type: {hex(self.device_type) if self.device_type else None}, 
-                ID: {self.device_id if self.device_id else None}, 
+                ID: {self.device_no if self.device_no else None}, 
                 Software: {self.software_version}, 
                 Hardware: {self.hardware_version}, 
                 Connect Time: {self.connect_time},
@@ -459,8 +492,8 @@ class QLBaseDevice(IDevice):
                 Battery Total: {str(self.battery_total) + "%" if self.battery_total else None}
             '''
 
-    def __eq__(self, other):
-        return self.device_name == other.device_name and self.device_type == other.device_type and self.device_id == other.device_id
+    def __eq__(self, other:IDevice):
+        return self.device_type == other.device_type and self.device_no == other.device_no
 
     def __hash__(self):
-        return hash((self.device_name, self.device_type, self.device_id))    
+        return hash((self.device_type, self.device_no))    

qlsdk/rsc/device/c256_rs.py

@@ -5,15 +5,15 @@ from time import sleep, time_ns
 from typing import Any, Dict, Literal
 
 from loguru import logger
+from qlsdk.core.entity import C256RSPacket
 from qlsdk.persist import RscEDFHandler
-from qlsdk.rsc.interface import IDevice, IParser
+from qlsdk.rsc.device.device_factory import DeviceFactory
 from qlsdk.rsc.command import *
-from qlsdk.rsc.parser.base import TcpMessageParser
 from qlsdk.rsc.device.base import QLBaseDevice
 
 class C256RS(QLBaseDevice):
     
-    device_type = 0x40  # C64RS设备类型标识符
+    device_type = 0x51  # C64RS设备类型标识符
     
     def __init__(self, socket):
         super().__init__(socket)
@@ -125,13 +125,13 @@ class C256RS(QLBaseDevice):
         self._edf_handler = None       
         self.storage_enable = True 
         
-        self._parser: IParser = TcpMessageParser(self)
-        self._parser.start()
+        # self._parser: IParser = RSCMessageParser(self)
+        # self._parser.start()
         
         # 启动数据接收线程
-        self._accept = Thread(target=self.accept)
-        self._accept.daemon = True
-        self._accept.start()
+        # self._accept = Thread(target=self.accept)
+        # self._accept.daemon = True
+        # self._accept.start()
         
     @property
     def device_no(self):
@@ -140,21 +140,14 @@ class C256RS(QLBaseDevice):
     @device_no.setter
     def device_no(self, value: str):
         self._device_no = value
-    
-    @classmethod
-    def from_parent(cls, parent:IDevice) -> IDevice:
-        rlt = cls(parent.socket)
-        rlt.device_id = parent.device_id
-        rlt._device_no = parent.device_no
-        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.set_device_type(self.device_type)
-        self._edf_handler.set_device_no(self.device_name)
+        self._edf_handler.set_device_no(self.device_no)
         self._edf_handler.set_storage_path(self._storage_path)
-        self._edf_handler.set_file_prefix(self._file_prefix)
+        self._edf_handler.set_file_prefix(self._file_prefix if self._file_prefix else 'C256RS')
         
     @property
     def edf_handler(self):
@@ -169,7 +162,7 @@ class C256RS(QLBaseDevice):
     @property
     def acq_channels(self):
         if self._acq_channels is None:
-            self._acq_channels = [i for i in range(1, 63)]
+            self._acq_channels = [i for i in range(1, 256)]
         return self._acq_channels
     @property
     def sample_range(self):
@@ -199,15 +192,15 @@ class C256RS(QLBaseDevice):
         
     # 接收socket消息
     def accept(self):
-        while True:
-            # 缓冲去4M
-            data = self.socket.recv(4096*1024)
-            if not data:
-                logger.warning(f"设备{self.device_name}连接结束")
-                break
-            
-            self._parser.append(data)
+        pass
+        # while True:
+        #     # 缓冲去4M
+        #     data = self.socket.recv(4096*1024)
+        #     if not data:
+        #         logger.warning(f"设备{self.device_name}连接结束")
+        #         break
             
+        #     self._parser.append(data)            
        
     # socket发送数据    
     def send(self, data):
@@ -226,9 +219,8 @@ class C256RS(QLBaseDevice):
         self._sample_rate = sample_rate
         self._sample_range = sample_range
     
-    # 通用配置-TODO
-    def set_config(self, key:str, val: str):
-        pass      
+    def _signal_wrapper(self, body: bytes):
+        return C256RSPacket().transfer(body)
         
     def start_impedance(self):
         logger.info("启动阻抗测量")  
@@ -297,7 +289,7 @@ class C256RS(QLBaseDevice):
             
         # 数据队列
         if q is None:
-            q = Queue(maxsize=1000)
+            q = Queue(maxsize=10240000)  # 10M缓存
             
         # 队列名称     
         if topic is None:
@@ -362,4 +354,5 @@ class C256RS(QLBaseDevice):
     def __hash__(self):
         return hash((self.device_name, self.device_type, self.device_id))    
     
-    
+    
+DeviceFactory.register(C256RS.device_type, C256RS) 

qlsdk/rsc/device/device_factory.py

@@ -30,5 +30,6 @@ DeviceFactory.register(C64RS.device_type, C64RS)
 DeviceFactory.register(ARSKindling.device_type, ARSKindling) 
 
 
+
     
     

qlsdk/rsc/interface/device.py

@@ -10,118 +10,55 @@ class  IDevice(ABC):
         pass
     
     def set_device_type(self, value: int):
-        pass
+        raise NotImplementedError("Not Supported")
     
     def set_storage_path(self, path: str):
-        pass
+        raise NotImplementedError("Not Supported")
     
     def set_file_prefix(self, pre: str):
-        pass
+        raise NotImplementedError("Not Supported")
     
     def set_acq_param(self, channels, sample_rate = 500, sample_range = 188):
-        pass
+        raise NotImplementedError("Not Supported")
     
     @property
     def device_no(self) -> str:
         pass
     
-    def produce(self, data, type:Literal['signal', 'impedance']="signal") -> None:
-        pass
+    def read_msg(self, size: int) -> bytes:
+        raise NotImplementedError("Not Supported")
+        
+    def produce(self, body: bytes, type:Literal['signal', 'impedance']="signal") -> None:
+        raise NotImplementedError("Not Supported")
     
     def start_listening(self):
-        pass
+        raise NotImplementedError("Not Supported")
     
     def stop_listening(self):
-        pass
+        raise NotImplementedError("Not Supported")
     
     def set_device_no(self, value: str):
-        pass
+        raise NotImplementedError("Not Supported")
     
     def from_parent(cls, parent) :
-        pass
-        
-    def start_implementation(self) -> None:
-        pass
-    
-    def stop_implementation(self) -> None:
-        pass
+        raise NotImplementedError("Not Supported")
     
     def start_acquisition(self) -> None:
-        pass
+        raise NotImplementedError("Not Supported")
     
     def stop_acquisition(self) -> None:
-        pass
+        raise NotImplementedError("Not Supported")
     
     def subscribe(self, type="signal") -> None:
-        pass
-    
+        raise NotImplementedError("Not Supported")
     def unsubscribe(self, topic) -> None:
-        pass
+        raise NotImplementedError("Not Supported")
     
     def start_stimulation(self, type="signal", duration=0) -> None:
-        pass
+        raise NotImplementedError("Not Supported")
     
     def stop_stimulation(self) -> None:
-        pass
-    
-    def gen_set_acquirement_param(self) -> bytes:
-        pass
-        
-    
-    
-class RscDevice(IDevice):
-    def __init__(self, socket):
-        super().__init__(socket)
-        
-    def start_implementation(self):
-        """
-        Start the device implementation
-        """
-        raise NotImplementedError("This method should be overridden by subclasses")
-    
-    def stop_implementation(self):
-        """
-        Stop the device implementation
-        """
-        raise NotImplementedError("This method should be overridden by subclasses")
-    
-    def start_acquisition(self):
-        """
-        Start data acquisition
-        """
-        raise NotImplementedError("This method should be overridden by subclasses")
-    
-    def stop_acquisition(self):
-        """
-        Stop data acquisition
-        """
-        raise NotImplementedError("This method should be overridden by subclasses")
-    
-    def subscribe(self, type="signal"):
-        """
-        Subscribe to data of a specific type (default is "signal")
-        """
-        raise NotImplementedError("This method should be overridden by subclasses")
-    
-    def unsubscribe(self, topic):
-        """
-        Unsubscribe from a specific topic
-        """
-        raise NotImplementedError("This method should be overridden by subclasses")
-    
-    def start_stimulation(self, type="signal", duration=0):
-        """
-        Start stimulation of a specific type (default is "signal") for a given duration
-        """
-        raise NotImplementedError("This method should be overridden by subclasses")
-    
-    def stop_stimulation(self):
-        """
-        Stop stimulation
-        """
-        raise NotImplementedError("This method should be overridden by subclasses")
-        
-class ProxyDevice(IDevice):
-    def __init__(self, socket, proxy_socket):
-        super().__init__(socket)
-        self.proxy_socket = proxy_socket
+        raise NotImplementedError("Not Supported")
+    def disconnect(self) -> None:
+        raise NotImplementedError("Not Supported")
+        

qlsdk/rsc/interface/parser.py

@@ -9,4 +9,10 @@ class IParser(ABC):
         pass 
     
     def set_device(self, device):
+        pass
+    
+    def start(self):
+        pass
+    
+    def stop(self):
         pass

qlsdk/rsc/manager/container.py

@@ -90,11 +90,11 @@ class DeviceContainer(object):
             device.start_listening()
             # GET_DEVICE_INFO
             msg = GetDeviceInfoCommand.build(device).pack()
-            logger.trace(f"发送获取设备信息命令: {msg.hex()}")
+            logger.debug(f"发送获取设备信息命令: {msg.hex()}")
             device.send(msg)
             # 添加设备
             while True:
-                if device.device_name:
+                if device.device_no:
                     real_device = DeviceFactory.create_device(device)
                     device.stop_listening()
                     real_device.start_listening()
@@ -117,6 +117,14 @@ class DeviceContainer(object):
         # 标记设备为已连接
         self._broadcaster.mark_device_as_connected(device.device_no)
         
+    def remove_device(self, device_no:str=None):
+        if device_no is None:
+            return
+        
+        if device_no in self._devices:
+            del self._devices[device_no]
+            logger.info(f"从设备列表移除设备[{device_no}]，已连接设备数量：{len(self._devices)}")
+        
     def get_device(self, device_no:str=None)->IDevice:
         logger.info(f"已连接设备数量:{len(self._devices)}")
         if len(self._devices) == 0:

qlsdk/rsc/network/discover.py

@@ -4,6 +4,7 @@ from threading import Thread, Lock
 from loguru import logger
 
 from qlsdk.core.message import UDPMessage
+from qlsdk.core.local import get_ips
 
 '''
     广播器类，用于发送和接收设备广播消息
@@ -55,6 +56,7 @@ class UdpBroadcaster:
     def broadcast_devices(self):
         
         while self.running:
+            ips = get_ips()
             with self.lock:
                 for device_id in self.devices_to_broadcast:
                     message = UDPMessage.search(device_id)

qlsdk/rsc/parser/__init__.py

@@ -1 +1,2 @@
-from .base import TcpMessageParser
+from .base import TcpMessageParser
+from .rsc import RSCMessageParser

qlsdk/rsc/parser/base.py

@@ -53,7 +53,7 @@ class TcpMessageParser(IParser):
                 buf_len = get_len(self.buffer)
                 
                 if buf_len < self.header_len:
-                    logger.trace(f"操作区缓存数据不足: expect: {self.header_len}, actual: {buf_len}, 等待数据...")
+                    logger.trace(f"等待数据中...: expect: {self.header_len}, actual: {buf_len}")
                     if not self.__fill_from_cache():
                         time.sleep(0.1)
                         continue

qlsdk/rsc/parser/rsc.py

@@ -0,0 +1,130 @@
+from multiprocessing import Lock
+from qlsdk.rsc.interface import IDevice, IParser
+
+from loguru import logger
+from threading import Thread
+from time import time_ns
+from qlsdk.rsc.command import CommandFactory
+
+class RSCMessageParser(IParser):
+    def __init__(self, device : IDevice):
+        # 待解析的数据来源于该设备
+        self.device = device    
+        self.running = False
+        
+        # 缓冲区-用于处理数据
+        self.buffer:bytearray = bytearray()
+        # 读写锁-用于临时缓冲区（避免读写冲突）
+        self._lock = Lock()
+        
+    @property
+    def header(self):
+        return b'\x5A\xA5'
+    
+    @property
+    def header_len(self):
+        return 14
+    
+    @property
+    def cmd_pos(self):
+        return 12
+    
+    def set_device(self, device):
+        self.device = device
+        
+    def append(self, value):
+        print(f"append value len: {len(value)}")
+    def __parser__(self):
+        logger.info("数据解析开始")
+                
+        try:
+            while self.running:
+                
+                # 查找消息头
+                while len(self.buffer) < len(self.header):
+                    read_data = self.device.read_msg(1)
+                    if read_data is None:
+                        if self.running:
+                            continue
+                        else:
+                            break
+                    if read_data[0] == self.header[len(self.buffer)]:
+                        self.buffer.extend(read_data)
+                    else:
+                        self.buffer.clear()
+                        break            
+                
+                if len(self.buffer) < len(self.header):
+                    continue
+                
+                
+                # 判断消息头
+                while len(self.buffer) < self.header_len:
+                    read_data = self.device.read_msg(self.header_len - len(self.buffer))
+                    if read_data is None:
+                        if self.running:
+                            continue
+                        else:
+                            break
+                    self.buffer.extend(read_data)                    
+                
+                # # 移动下标(指向包长度的位置)
+                # self.buffer.seek(self.start_pos + 8)
+                # 包总长度
+                pkg_len = int.from_bytes(self.buffer[8:12], 'little')
+                # 256*32K = 8388608
+                # 太长2M
+                if pkg_len > 2048000:
+                    print(f"error message pkg_len={pkg_len} > 1000000")
+                    self.buffer.clear()
+                    continue
+                # 太短
+                if pkg_len < self.header_len:
+                    print(f"error message pkg_len={pkg_len} < {self.header_len}")
+                    self.buffer.clear()
+                    continue
+                
+                # 读取消息体
+                while len(self.buffer) < pkg_len:
+                    read_data = self.device.read_msg(pkg_len - len(self.buffer))
+                    if read_data is None:
+                        if self.running:
+                            continue
+                        else:
+                            break
+                    self.buffer.extend(read_data)
+                
+                if len(self.buffer) < pkg_len:
+                    continue
+                    
+                # msg_crc = self.buffer[-2:]
+                # cal_crc = (bytes_buffer, len(bytes_buffer) - 2)
+                # if cal_crc != msg_crc:
+                #     print(f'crc fail {cal_crc} {msg_crc}')
+                # if cal_crc != msg_crc:
+                #     print(f'crc fail {cal_crc} {msg_crc}')                    
+                
+                self.unpack(self.buffer)
+                self.buffer.clear()
+                
+        except Exception as e:
+            logger.error(f"数据解析异常: {e}")
+                
+        logger.info(f"数据解析结束:{self.running}")
+    
+    def unpack(self, packet):        
+        # 提取指令码
+        cmd_code = int.from_bytes(packet[self.cmd_pos : self.cmd_pos + 2], 'little')
+        cmd_class = CommandFactory.create_command(cmd_code)
+        instance = cmd_class(self.device)
+        instance.parse_body(packet[self.header_len:-2])
+        return instance
+            
+    def start(self):
+        self.running = True
+        parser = Thread(target=self.__parser__, daemon=True)
+        parser.start()
+        
+    def stop(self):
+        self.running = False
+        

{qlsdk2-0.5.1.1.dist-info → qlsdk2-0.6.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: qlsdk2
-Version: 0.5.1.1
+Version: 0.6.0a1
 Summary: SDK for quanlan device
 Home-page: https://github.com/hehuajun/qlsdk
 Author: hehuajun
@@ -10,12 +10,21 @@ 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
+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'
+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.1.1** (2025-08-24)
 #### 🐛 Bug Fixed

{qlsdk2-0.5.1.1.dist-info → qlsdk2-0.6.0a1.dist-info}/RECORD

@@ -8,19 +8,29 @@ 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=1BBbL41zqb0_UsxgoiuyG5zM0CKVzT5VUA_BXSKZmAs,3177
+qlsdk/core/entity/__init__.py,sha256=LOS5k_cIA-NYnvE94KUXCBUU_uu1v8FcXf7L399j8Yg,6610
 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
 qlsdk/core/message/command.py,sha256=94AyM6qmgVHQ8qzNLczdL8iY6N-2uEP5oBU6kD6pOG8,12102
 qlsdk/core/message/tcp.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qlsdk/core/message/udp.py,sha256=KS_pKZcCEFhNGABCOZTOHiVFkfPNZl_0K5RXppwMIvA,3085
+qlsdk/core/message/udp.py,sha256=e_w35NSlgmhptzlMNGee7rE7KVgeLDO2WhE6FEnuy-0,3387
 qlsdk/core/network/__init__.py,sha256=9Ww0cGgBEU_TVrwmgiDz20zA2fMFgepI_kOF4ggHcS0,1111
 qlsdk/core/network/monitor.py,sha256=QqjjPwSr1kgqDTTySp5bpalZmsBQTaAWSxrfPLdROZo,1810
+qlsdk/entity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qlsdk/entity/message.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qlsdk/entity/signal.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qlsdk/interface/__init__.py,sha256=zvXbyjbMWlPBt7AhD7fF4JwTrDqwkdyH8rH2xkmslGE,123
+qlsdk/interface/analyzer.py,sha256=-muX0wWUn2e-PvUJicSstCGXHJZw2yP7Er1soJsWybw,26
+qlsdk/interface/collector.py,sha256=ye9dVjRVYfCjeJsGV8Jc4ppwp58qKW5_u5e8IIcvL4U,190
+qlsdk/interface/device.py,sha256=09Z2KQ1dj6gP-7CdPXfMvT8YhyadgqIfo4rf6PAyXog,24
+qlsdk/interface/parser.py,sha256=00Ds01Xp9eUPwx7okL4B1Bl0_fRbgaxfm_2GOeWoZiM,248
+qlsdk/interface/stimulator.py,sha256=MJbgiI-4qTMjbdhcBAZe8zb10hV9x8yhFCPL3Iq_QyI,28
+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=WRuVZ8bvji8ztByukp0tkQiaM_Na4ezgfwsJU3PEdS8,13315
+qlsdk/persist/rsc_edf.py,sha256=-L8Qv_d39rog6vrIEBnO5yYnxCr6yfL4qUlM72AaFJg,13392
 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,29 +39,30 @@ 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=2rqWM23fFqvFfgN7K3PLT7rkTyW9mawK4OGCo63hnJg,12292
+qlsdk/rsc/command/__init__.py,sha256=DiuXvKQepVTc5hkHSB_YAAZPxobN2a7tYXpI7kZ3GQM,12296
 qlsdk/rsc/command/message.py,sha256=nTdG-Vp4MBnltyrgedAWiKD6kzOaPrg58Z_hq6yjhys,12220
-qlsdk/rsc/device/__init__.py,sha256=xtTXLT9QFKtb-qS-A8-ewSxJ3zXgImFCX0OoAPw6hHE,185
+qlsdk/rsc/device/__init__.py,sha256=BzY9lRfssGPUlJ1ys-v3CWNgGihg7mPa2T4X0tl0Vg4,214
 qlsdk/rsc/device/arskindling.py,sha256=owci6MEGjyWqohEXzPdKj_ESeVIZKgO53StVj6Tmi18,15002
-qlsdk/rsc/device/base.py,sha256=osLToxNrb745OzCpgXZU5AH72emMh4OxATeqy4fCxsg,17856
+qlsdk/rsc/device/base.py,sha256=oQ4Ev0LkDiJZXTqqTd6zqzzsn4ijYXkTLDUJKF0mn5U,19157
 qlsdk/rsc/device/c16_rs.py,sha256=BHQRHOnsTMAKgqSXaAS2RjPIklZQAl2CVfe6i_iX-i4,5928
-qlsdk/rsc/device/c256_rs.py,sha256=K1XmLqZpvHTAfCm_dr2VsGxHc67aJQVDV1cI41a1WTI,13955
+qlsdk/rsc/device/c256_rs.py,sha256=CVnxxegyTNHQAfFVda6lQITQGGB-A958TEaqz7RjLq8,13883
 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=AL_dtjx6ThcyWTHxGSrLKjEDaCt1Y9gClK4HQ5FGjFI,1315
+qlsdk/rsc/device/device_factory.py,sha256=6cPhm3pPGrVXA1s1HePFLjZqmhNI1vOAucFI0VRD_Y0,1317
 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=VEV-Ige8tjvASdddP6SPRolTqPuIuHrIZP8wiX-Fhu8,3391
+qlsdk/rsc/interface/device.py,sha256=__ap7aJFaaktzMaZ253MMeZy9vgvJmX0Hha1dISGkOk,2064
 qlsdk/rsc/interface/handler.py,sha256=ADDe_a2RAxGMuooLyivH0JBPTGBcFP2JaTVX41R1A4w,198
-qlsdk/rsc/interface/parser.py,sha256=DxuFZiprJJbG4pfFbbZPaG8MlBiBRe0S0lJrvc2Iees,251
+qlsdk/rsc/interface/parser.py,sha256=Z4PND5LXcJ_8CQ-OIq3KlOEVOceU1hKUuZkoFSIGGLM,334
 qlsdk/rsc/manager/__init__.py,sha256=4ljT3mR8YPBDQur46B5xPqK5tjLKlsWfgCJVuA0gs-8,40
-qlsdk/rsc/manager/container.py,sha256=mowoFJNVDSEhqsz-EDzPVDcMRiuu_oakdGLZbJrPvlM,5071
+qlsdk/rsc/manager/container.py,sha256=S6E0_ZXejC_YM_kzMQQHr7daPJPbVwZINBbYhreFW5w,5389
 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/network/discover.py,sha256=GRXP0WxxIorDZWXq1X5CPAV60raSRvNiVwMQE8647XA,3044
+qlsdk/rsc/parser/__init__.py,sha256=cVKk06bRYOnwE3XMoksGlatKJSaZE1GVrYypQm-9aro,69
 qlsdk/rsc/parser/base-new.py,sha256=cAOy1V_1fAJyGq7bm7uLxpW41DbkllWOprnfWKpjtsQ,5116
-qlsdk/rsc/parser/base.py,sha256=Cqel02BA_AH-deSmzTyUvqecIGoYVBre5UuFlG1eNGA,5728
+qlsdk/rsc/parser/base.py,sha256=VoVYoy2B583EohRRLPX3GcRiuQxT7RG7-y24WgICP2k,5702
+qlsdk/rsc/parser/rsc.py,sha256=RuBqsg5KZNio7mTyM14svQEeU0_0CLhnRmfbP0NBM2o,4724
 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
@@ -59,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.5.1.1.dist-info/METADATA,sha256=jeill3HEYJtHhFF2MVR_AIfm8LJAJcIdYOfbVnP3Xjk,1820
-qlsdk2-0.5.1.1.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-qlsdk2-0.5.1.1.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
-qlsdk2-0.5.1.1.dist-info/RECORD,,
+qlsdk2-0.6.0a1.dist-info/METADATA,sha256=noX9rMQ0g9zxwyRCgDOQct_z1PBF-S5hEauk3d4x9Sk,2019
+qlsdk2-0.6.0a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qlsdk2-0.6.0a1.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
+qlsdk2-0.6.0a1.dist-info/RECORD,,

{qlsdk2-0.5.1.1.dist-info → qlsdk2-0.6.0a1.dist-info}/WHEEL

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