qlsdk2 0.4.2__tar.gz → 0.5.1__tar.gz

qlsdk2-0.5.1/PKG-INFO

@@ -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.1/README.md

@@ -0,0 +1,38 @@
+# 版本 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.4.2 → qlsdk2-0.5.1}/setup.py

@@ -1,12 +1,12 @@
 # setup.py
 import setuptools
 
-with open("README.md", "r") as fh:
+with open("README.md", "r", encoding='utf-8' ) as fh:
     long_description = fh.read()
 
 setuptools.setup(
     name="qlsdk2",
-    version="0.4.2",
+    version="0.5.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.4.2 → qlsdk2-0.5.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.4.2 → qlsdk2-0.5.1}/src/qlsdk/persist/rsc_edf.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+import time
 from multiprocessing import Lock, Queue
 from time import time_ns
 from pyedflib import FILETYPE_BDFPLUS, FILETYPE_EDFPLUS, EdfWriter
@@ -14,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()
@@ -22,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
@@ -61,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标记")
         
@@ -77,8 +82,9 @@ class EDFStreamWriter(Thread):
         if self._writer is None:
             self._init_writer()
             
-        while True:
-            if self._recording or (not self.data_queue.empty()):
+        waits = 300
+        while waits > 0:
+            if not self.data_queue.empty():
                 try:
                     data = self.data_queue.get(timeout=30)
                     if data is None:
@@ -88,13 +94,20 @@ class EDFStreamWriter(Thread):
                     self._points += len(data[1])
                     logger.trace(f"已处理数据点数：{self._points}")
                     self._write_file(data)
+                    # 有数据重置计数器
+                    waits = 100  # 重置等待计数器
                 except Exception as e:
                     logger.error(f"异常或超时(30s)结束: {str(e)}")
                     break
             else:
-                logger.debug("数据记录完成")
-                break
+                time.sleep(0.1)
+                # 记录状态等待30s、非记录状态等待3s
+                if self._recording:
+                    waits -= 1
+                else:
+                    waits -= 10
             
+        logger.info(f"数据记录完成：{self.file_path}")
         self.close()
         
     def _init_writer(self):
@@ -126,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:            
@@ -159,6 +174,9 @@ class EDFStreamWriter(Thread):
         # 写入时转置为(样本数, 通道数)格式
         self._writer.writeSamples(data_float64)
         self._duration += 1
+        
+        if self._duration % 10 == 0:  # 每10秒打印一次进度
+            logger.info(f"数据记录中... 文件名：{self.file_path}, 已记录时长: {self._duration}秒")
 
 # 用作数据结构一致化处理，通过调用公共类写入edf文件
 # 入参包含写入edf的全部前置参数
@@ -177,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
@@ -213,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
         
@@ -243,6 +262,8 @@ class RscEDFHandler(object):
             self._device_type = "LJ64S1"
         elif device_type == 0x60:
             self._device_type = "ARSKindling"
+        elif device_type == 0x339:
+            self._device_type = "C16R"
         else:
             self._device_type = device_type
         
@@ -264,17 +285,18 @@ class RscEDFHandler(object):
     def write(self, packet: RscPacket):
         # logger.trace(f"packet: {packet}")    
         if packet is None:
+            logger.info(f"收到结束信号，即将停止写入数据:{self.file_name}")
             self._edf_writer_thread.stop_recording()
             return
     
         with self._lock:
             if self.channels is None:
-                logger.info(f"开始记录数据到文件...")
+                logger.debug(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}")
+                logger.debug(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
@@ -284,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}")
@@ -295,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.4.2 → qlsdk2-0.5.1}/src/qlsdk/rsc/command/__init__.py

@@ -51,15 +51,29 @@ class DeviceCommand(abc.ABC):
         device_id = int(self.device.device_id) if self.device and self.device.device_id else 0
         device_type = int(self.device.device_type) if self.device and self.device.device_type else 0
         
-        """构建消息头"""
-        return (
-            DeviceCommand.HEADER_PREFIX
-            + int(2).to_bytes(1, 'little')     # pkgType  
-            + device_type.to_bytes(1, 'little')
-            + device_id.to_bytes(4, 'little')
-            + (DeviceCommand.HEADER_LEN + body_len + 2).to_bytes(4, 'little')  # +1 for checksum
-            + self.cmd_code.to_bytes(2, 'little')
-        )
+        #兼容设计
+        b_device_type = None
+        if device_type > 0xFF:
+            b_device_type = int.to_bytes(device_type, 2, 'little')
+        
+        if b_device_type is None:
+            return (
+                DeviceCommand.HEADER_PREFIX
+                + int(2).to_bytes(1, 'little')     # pkgType  
+                + device_type.to_bytes(1, 'little')
+                + device_id.to_bytes(4, 'little')
+                + (DeviceCommand.HEADER_LEN + body_len + 2).to_bytes(4, 'little')  # +1 for checksum
+                + self.cmd_code.to_bytes(2, 'little')
+            )
+        else:
+            return (
+                DeviceCommand.HEADER_PREFIX
+                + b_device_type[0].to_bytes(1, 'little')     # pkgType  
+                + b_device_type[1].to_bytes(1, 'little')
+                + device_id.to_bytes(4, 'little')
+                + (DeviceCommand.HEADER_LEN + body_len + 2).to_bytes(4, 'little')  # +1 for checksum
+                + self.cmd_code.to_bytes(2, 'little')
+            )
     
     def unpack(self, payload: bytes) -> bytes:
         """解析消息体"""
@@ -70,7 +84,7 @@ class DeviceCommand(abc.ABC):
         time = int.from_bytes(body[0:8], 'little')
         # result - 1B
         result = body[8]
-        logger.info(f"[{time}]{self.cmd_desc}{'成功' if result == 0 else '失败'}")
+        logger.debug(f"[{time}]{self.cmd_desc}{'成功' if result == 0 else '失败'}")
         
     
 
@@ -156,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.")
 
@@ -200,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) 
         
 
 # 停止阻抗测量
@@ -279,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)
 
 # 信号数据
@@ -294,18 +312,8 @@ class SignalDataCommand(DeviceCommand):
         # 解析数据包
         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(packet)
+        # 将数据包传递给设备
+        self.device.produce(packet)
                 
             
 

qlsdk2-0.5.1/src/qlsdk/rsc/device/__init__.py

@@ -0,0 +1,7 @@
+from .base import QLBaseDevice
+from .device_factory import DeviceFactory
+
+# import devices
+from .c64_rs import C64RS
+from .c16_rs import C16RS
+from .arskindling import ARSKindling

{qlsdk2-0.4.2 → qlsdk2-0.5.1}/src/qlsdk/rsc/device/arskindling.py

@@ -167,7 +167,7 @@ class ARSKindling(QLBaseDevice):
         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)
+        self._edf_handler.set_file_prefix(self._file_prefix if self._file_prefix else 'ARS')
         
     @property
     def edf_handler(self):
@@ -233,6 +233,8 @@ class ARSKindling(QLBaseDevice):
     # 设置采集参数
     def set_acq_param(self, channels, sample_rate = 500, sample_range = 188):
         self._acq_param["original_channels"] = channels
+        
+        # 根据映射关系做通道转换
         for k in channels.keys():
             if isinstance(channels[k], list):
                 temp = [k + str(i) for i in channels[k]]
@@ -241,7 +243,7 @@ class ARSKindling(QLBaseDevice):
                 channels[k] = [k + str(channels[k])]
                 
                 
-                
+        # 更新采集参数        
         self._acq_param["channels"] = channels 
         self._acq_param["sample_rate"] = sample_rate
         self._acq_param["sample_range"] = sample_range