qlsdk2 0.5.0__tar.gz → 0.5.1.1__tar.gz

qlsdk2-0.5.1.1/PKG-INFO

@@ -0,0 +1,62 @@
+Metadata-Version: 2.1
+Name: qlsdk2
+Version: 0.5.1.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.1** (2025-08-24)
+#### 🐛 Bug Fixed
+- 修复仅选择一个通道时，自动保存功能异常的问题
+
+
+## **v0.5.1** (2025-08-04)
+
+#### ⚙️ Changed
+- C16R通道映射调整为按老的脑电帽位点映射（固件端做了映射）
+
+- 开放底层参数，支持EDF/BDF文件中存储大量事件(>1个/秒)
+
+- 优化实时信号数据订阅（发布/订阅模式），在调用者使用不规范时，多个订阅者之间不会互相干扰
+
+
+## **v0.5.0** (2025-07-29)
+
+#### 🚀 Added
+
+- *新增C16R搜索与连接*  
+   支持C16R类型设备的搜索与连接
+
+- *C16R信号采集/停止控制*  
+   支持信号采集的参数配置
+   支持信号采集的启动与停止控制
+
+- *C16R数据自动记录*  
+   采集到的信号数据自动保存为bdf文件
+
+- *C16R采集通道设置*  
+   - 支持数字模式通道配置
+   - 支持名称模式通道配置  
+   - 支持两种模式混合使用
+
+#### ⚙️ Changed
+
+- *性能提升*
+   - 信号接收效率优化  
+   - 指令拆包方式优化
+
+- *日志系统改进* 
+   - 日志级别精细化调整，减少不必要的日志信息
+   - 日志文案清晰化

qlsdk2-0.5.1.1/README.md

@@ -0,0 +1,43 @@
+## **v0.5.1.1** (2025-08-24)
+#### 🐛 Bug Fixed
+- 修复仅选择一个通道时，自动保存功能异常的问题
+
+
+## **v0.5.1** (2025-08-04)
+
+#### ⚙️ Changed
+- C16R通道映射调整为按老的脑电帽位点映射（固件端做了映射）
+
+- 开放底层参数，支持EDF/BDF文件中存储大量事件(>1个/秒)
+
+- 优化实时信号数据订阅（发布/订阅模式），在调用者使用不规范时，多个订阅者之间不会互相干扰
+
+
+## **v0.5.0** (2025-07-29)
+
+#### 🚀 Added
+
+- *新增C16R搜索与连接*  
+   支持C16R类型设备的搜索与连接
+
+- *C16R信号采集/停止控制*  
+   支持信号采集的参数配置
+   支持信号采集的启动与停止控制
+
+- *C16R数据自动记录*  
+   采集到的信号数据自动保存为bdf文件
+
+- *C16R采集通道设置*  
+   - 支持数字模式通道配置
+   - 支持名称模式通道配置  
+   - 支持两种模式混合使用
+
+#### ⚙️ Changed
+
+- *性能提升*
+   - 信号接收效率优化  
+   - 指令拆包方式优化
+
+- *日志系统改进* 
+   - 日志级别精细化调整，减少不必要的日志信息
+   - 日志文案清晰化

{qlsdk2-0.5.0 → qlsdk2-0.5.1.1}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8' ) as fh:
 
 setuptools.setup(
     name="qlsdk2",
-    version="0.5.0",
+    version="0.5.1.1",
     author="hehuajun",
     author_email="hehuajun@eegion.com",
     description="SDK for quanlan device",
@@ -18,13 +18,12 @@ setuptools.setup(
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
+        "Operating System :: Microsoft :: Windows :: Windows 10",
     ],
     python_requires='>=3.9',
     install_requires=open("requirements.txt").read().splitlines(),
     include_package_data=True,
     package_data={
-        # "qlsdk2": ["/**/*.dll"],
         "qlsdk": ["./**/*.dll"]
     }
 )

{qlsdk2-0.5.0 → qlsdk2-0.5.1.1}/src/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
         

{qlsdk2-0.5.0 → qlsdk2-0.5.1.1}/src/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标记")
         
@@ -87,7 +91,7 @@ class EDFStreamWriter(Thread):
                         logger.debug("收到结束信号，停止写入数据")
                         break
                     # 处理数据
-                    self._points += len(data[1])
+                    self._points += len(data[0])
                     logger.trace(f"已处理数据点数：{self._points}")
                     self._write_file(data)
                     # 有数据重置计数器
@@ -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)     

{qlsdk2-0.5.0 → qlsdk2-0.5.1.1}/src/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)
 
 # 信号数据

{qlsdk2-0.5.0 → qlsdk2-0.5.1.1}/src/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:

{qlsdk2-0.5.0 → qlsdk2-0.5.1.1}/src/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)

{qlsdk2-0.5.0 → qlsdk2-0.5.1.1}/src/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)}")

{qlsdk2-0.5.0 → qlsdk2-0.5.1.1}/src/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):

{qlsdk2-0.5.0 → qlsdk2-0.5.1.1}/src/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()