qlsdk2 0.6.0a6__py3-none-any.whl → 0.6.0a8__py3-none-any.whl

qlsdk/persist/ars_edf.py

@@ -195,39 +195,14 @@ class ARSKindlingEDFHandler(object):
         if packet is None:
             # self._edf_writer_thread.stop_recording()
             for k in self._edf_handler.keys():
-                self._edf_handler[k].append(None)
+                self._edf_handler[k].write(None)
             return
          
-        #按分区写入数据
-        
+        #按分区写入数据        
         for k in self._channel_spilt.keys():      
-            logger.info(f'分区{k}, {self._channel_spilt[k]}')      
+            logger.trace(f'分区{k}, {self._channel_spilt[k]}')      
             p = packet
             self.writeA(p, self._channel_spilt[k], k)
-    
-        # with self._lock:
-        #     if self.channels is None:
-        #         logger.info(f"开始记录数据到文件...")
-        #         self.channels = packet.channels
-        #         self._first_pkg_id = packet.pkg_id if self._first_pkg_id is None else self._first_pkg_id
-        #         self._first_timestamp = packet.time_stamp if self._first_timestamp is None else self._first_timestamp
-        #         self._start_time = datetime.now()
-        #         logger.info(f"第一个包id: {self._first_pkg_id }, 时间戳:{self._first_timestamp}， 当前时间:{datetime.now().timestamp()}  offset: {datetime.now().timestamp() - self._first_timestamp}")
-                
-        #     if self._last_pkg_id and self._last_pkg_id != packet.pkg_id - 1:  
-        #         self._lost_packets += packet.pkg_id - self._last_pkg_id - 1
-        #         logger.warning(f"数据包丢失: {self._last_pkg_id} -> {packet.pkg_id}, 丢包数: {packet.pkg_id - self._last_pkg_id - 1}")
-                
-        #     self._last_pkg_id = packet.pkg_id
-        #     self._total_packets += 1
-            
-        #     if self._edf_writer_thread is None:
-        #         self._edf_writer_thread = EDFStreamWriter(self.channels, self.sample_rate, self.physical_max, self.physical_min, self.file_type, self.file_name)
-        #         self._edf_writer_thread.set_start_time(self._start_time)
-        #         self._edf_writer_thread.start()
-        #         logger.info(f"开始写入数据: {self.file_name}")
-                
-        #     self._edf_writer_thread.append(packet.eeg)
      
     def writeA(self, packet: RscPacket, channel_filter, name='A'):
         # 参数检查
@@ -238,12 +213,12 @@ class ARSKindlingEDFHandler(object):
         channel_pos = intersection_positions(packet.channels, channel_filter)
         
         if channel_pos is None or len(channel_pos) == 0 :
-            logger.debug(f"没有指定分区{name}的通道，跳过")
+            logger.trace(f"没有指定分区{name}的通道，跳过")
             pass
         
         # 分区数据包写入
         if name not in self._edf_handler.keys():
-            edf_handler = RscEDFHandler(self.sample_rate,  self.digital_max , self.digital_min, self.resolution)  
+            edf_handler = RscEDFHandler(self.sample_rate,  self.physical_max , self.physical_min, self.resolution)  
             edf_handler.set_device_type(self._device_type)
             edf_handler.set_device_no(self._device_no)
             edf_handler.set_storage_path(self._storage_path)

qlsdk/persist/rsc_edf.py

@@ -62,7 +62,7 @@ class EDFStreamWriter(Thread):
         self._recording = False
         
     def append(self, data):
-        if data:
+        if data is not None:
             # 数据
             self.data_queue.put(data)
             

qlsdk/rsc/command/__init__.py

@@ -243,8 +243,9 @@ class StartStimulationCommand(DeviceCommand):
         # error_channel - 8B
         # error_channel= int.from_bytes(body[9:17], 'big')
         channels = to_channels(body[9:17])
-        logger.success(f"通道 {channels} 刺激开始")
-        self.device.trigger(f"通道 {channels} 刺激开始")
+        logger.info(f"通道 {channels} 刺激开始")
+        if self.device:
+            self.device.trigger(f"通道 {channels} 刺激开始")
         # error_type - 1B
         error_type = body[17]
 
@@ -268,8 +269,9 @@ class StopStimulationNotifyCommand(DeviceCommand):
         # error_channel - 8B
         # error_channel= int.from_bytes(body[9:17], 'big')
         channels = to_channels(body[9:17])
-        logger.success(f"通道 {channels} 刺激结束")
-        self.device.trigger(f"通道 {channels} 刺激结束", time)
+        logger.info(f"通道 {channels} 刺激结束")
+        if self.device:
+            self.device.trigger(f"通道 {channels} 刺激结束", time)
         # error_type - 1B
         error_type = body[17]   
 # 刺激信息

qlsdk/rsc/device/arskindling.py

@@ -1,14 +1,7 @@
-
-from multiprocessing import Queue
-from threading import Thread
-from time import sleep, time_ns
-from typing import Any, Dict, Literal
-
 from loguru import logger
 from qlsdk.persist import ARSKindlingEDFHandler
-from qlsdk.rsc.interface import IDevice, IParser
+from qlsdk.rsc.interface import IDevice
 from qlsdk.rsc.command import *
-from qlsdk.rsc.parser.base import TcpMessageParser
 from qlsdk.rsc.device.base import QLBaseDevice
 
 class ARSKindling(QLBaseDevice):
@@ -17,117 +10,6 @@ class ARSKindling(QLBaseDevice):
     
     def __init__(self, socket):
         super().__init__(socket)
-        # self.socket = socket
-        
-        self._id = None
-        
-        # 设备信息
-        # self.device_id = None
-        # self.device_name = None
-        self._device_no = None
-        # self.software_version = None
-        # self.hardware_version = None
-        # self.connect_time = None
-        # self.current_time = None
-        # # mV
-        # self.voltage = None
-        # # %
-        # self.battery_remain = None
-        # # %
-        # self.battery_total = None
-        # persist
-        self._recording = False
-        self._storage_path = None
-        self._file_prefix = None
-        
-        # 可设置参数
-        # 采集：采样量程、采样率、采样通道
-        # 刺激：刺激电流、刺激频率、刺激时间、刺激通道
-        # 采样量程（mV）：188、375、563、750、1125、2250、4500
-        self._sample_range:Literal[188, 375, 563, 750, 1125, 2250, 4500] = 188        
-        # 采样率（Hz）：250、500、1000、2000、4000、8000、16000、32000
-        self._sample_rate:Literal[250, 500, 1000, 2000, 4000, 8000, 16000, 32000] = 500
-        self._physical_max = self._sample_range * 1000  # 物理最大值（uV）
-        self._physical_min = -self._sample_range * 1000  # 物理最小值（uV）
-        self._digital_max = 8388607
-        self._digital_min = -8388608
-        self._physical_range = self._physical_max - self._physical_min
-        self._digital_range = 16777215
-        self._acq_channels = None
-        self._acq_param = {
-            "sample_range": 188,
-            "sample_rate": 500,
-            "channels": [],
-        }
-        
-        self._stim_param = {
-            "stim_type": 0,                 # 刺激类型：0-所有通道参数相同, 1: 通道参数不同
-            "channels": [],
-            "param": [{
-                    "channel_id": 0,        #通道号 从0开始                          -- 必填
-                    "waveform": 3,          #波形类型：0-直流，1-交流 2-方波 3-脉冲   -- 必填
-                    "current": 1,           #电流强度(mA)                            -- 必填
-                    "duration": 30,         #平稳阶段持续时间(s)                      -- 必填
-                    "ramp_up": 5,           #上升时间(s) 默认0
-                    "ramp_down": 5,         #下降时间(s) 默认0
-                    "frequency": 500,       #频率(Hz) -- 非直流必填
-                    "phase_position": 0,    #相位 -- 默认0
-                    "duration_delay": "0",  #延迟启动时间(s) -- 默认0
-                    "pulse_width": 0,       #脉冲宽度(us) -- 仅脉冲类型电流有效， 默认100us
-                },
-                {
-                    "channel_id": 1,        #通道号 从0开始                          -- 必填
-                    "waveform": 3,          #波形类型：0-直流，1-交流 2-方波 3-脉冲   -- 必填
-                    "current": 1,           #电流强度(mA)                            -- 必填
-                    "duration": 30,         #平稳阶段持续时间(s)                      -- 必填
-                    "ramp_up": 5,           #上升时间(s) 默认0
-                    "ramp_down": 5,         #下降时间(s) 默认0
-                    "frequency": 500,       #频率(Hz) -- 非直流必填
-                    "phase_position": 0,    #相位 -- 默认0
-                    "duration_delay": "0",  #延迟启动时间(s) -- 默认0
-                    "pulse_width": 0,       #脉冲宽度(us) -- 仅脉冲类型电流有效， 默认100us
-                }
-            ]
-        }
-        
-        self.stim_paradigm = None
-                      
-        signal_info = {
-            "param" : None,
-            "start_time" : None,
-            "finished_time" : None,
-            "packet_total" : None,
-            "last_packet_time" : None,
-            "state" : 0
-        }
-        stim_info = {
-            
-        }
-        Impedance_info = {
-            
-        }
-        # 信号采集状态
-        # 信号数据包总数（一个信号采集周期内）
-        # 信号采集参数
-        # 电刺激状态
-        # 电刺激开始时间（最近一次）
-        # 电刺激结束时间（最近一次）
-        # 电刺激参数
-        # 启动数据解析线程
-        # 数据存储状态
-        # 存储目录
-        
-        # 
-        self.__signal_consumer: Dict[str, Queue[Any]]={}
-        self.__impedance_consumer: Dict[str, Queue[Any]]={}
-        
-        # EDF文件处理器
-        self._edf_handler = None       
-        self.storage_enable = True 
-        
-        # self.start_message_listening()
-        # self.start()
-        # self.parser.set_device(self)
         
         self.channel_mapping = {
             "A1": 55, "A2": 56, "A3": 53, "A4": 54, "A5": 51, "A6": 52, "A7": 49, "A8": 50,
@@ -143,18 +25,6 @@ class ARSKindling(QLBaseDevice):
             "D9": 9, "D10": 10, "D11": 11, "D12": 12, "D13": 13, "D14": 14, 
         }
         
-    @property
-    def device_no(self):
-        return self._device_no
-    
-    @device_no.setter
-    def device_no(self, value: str):
-        self._device_no = value
-    
-    @property
-    def parser(self) -> IParser:
-        return self._parser
-    
     @classmethod
     def from_parent(cls, parent:IDevice) -> IDevice:
         rlt = cls(parent.socket)
@@ -168,68 +38,8 @@ class ARSKindling(QLBaseDevice):
         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 if self._file_prefix else 'ARS')
+        logger.debug(f"EDF Handler initialized")
         
-    @property
-    def edf_handler(self):
-        if not self.storage_enable:
-            return None
-        
-        if self._edf_handler is None:
-            self.init_edf_handler() 
-            
-        return self._edf_handler  
-    
-    @property
-    def acq_channels(self):
-        if self._acq_channels is None:
-            self._acq_channels = [i for i in range(1, 63)]
-        return self._acq_channels
-    @property
-    def sample_range(self):
-        return self._sample_range if self._sample_range else 188
-    @property
-    def sample_rate(self):
-        return self._sample_rate if self._sample_rate else 500
-    @property
-    def resolution(self):
-        return 24
-    
-    @property
-    def signal_consumers(self):
-        return self.__signal_consumer
-    
-    @property
-    def impedance_consumers(self):
-        return self.__impedance_consumer
-    
-    # 设置记录文件路径
-    def set_storage_path(self, path):
-        self._storage_path = path
-       
-    # 设置记录文件名称前缀 
-    def set_file_prefix(self, prefix):
-        self._file_prefix = prefix
-        
-    # 接收socket消息
-    def accept(self):
-        while True:
-            # 缓冲去4M
-            data = self.socket.recv(4096*1024)
-            if not data:
-                logger.warning(f"设备{self.device_no}连接结束")
-                break
-            
-            self._parser.append(data)
-            
-       
-    # socket发送数据    
-    def send(self, data):
-        self.socket.sendall(data)
-    
-    # 设置刺激参数
-    def set_stim_param(self, param):
-        self.stim_paradigm = param
-    
     # 设置采集参数
     def set_acq_param(self, channels, sample_rate = 500, sample_range = 188):
         self._acq_param["original_channels"] = channels
@@ -249,108 +59,7 @@ class ARSKindling(QLBaseDevice):
         self._acq_param["sample_range"] = sample_range
         self._acq_channels = channels
         self._sample_rate = sample_rate
-        self._sample_range = sample_range
-    
-    # 通用配置-TODO
-    def set_config(self, key:str, val: str):
-        pass      
-        
-    def start_impedance(self):
-        logger.info("启动阻抗测量")  
-        msg = StartImpedanceCommand.build(self).pack()
-        logger.debug(f"start_impedance message is {msg.hex()}")
-        self.socket.sendall(msg)
-    
-    def stop_impedance(self):
-        logger.info("停止阻抗测量")  
-        msg = StopImpedanceCommand.build(self).pack()
-        logger.debug(f"stop_impedance message is {msg.hex()}")
-        self.socket.sendall(msg)
-    
-    def start_stimulation(self):
-        if self.stim_paradigm is None:
-            logger.warning("刺激参数未设置，请先设置刺激参数")
-            return
-        logger.info("启动电刺激")  
-        msg = StartStimulationCommand.build(self).pack()
-        logger.debug(f"start_stimulation message is {msg.hex()}")
-        self.socket.sendall(msg)
-        t = Thread(target=self._stop_stimulation_trigger, args=(self.stim_paradigm.duration,))
-        t.start()
-        
-    def _stop_stimulation_trigger(self, duration):
-        delay = duration
-        while delay > 0:
-            sleep(1)
-            delay -= 1
-        logger.info(f"_stop_stimulation_trigger duration: {duration}")
-        if self._edf_handler:
-            self._edf_handler.trigger("stimulation should be stopped")
-        else:
-            logger.warning("stop stim trigger fail. no edf writer alive")
-        
-    def stop_stimulation(self):
-        logger.info("停止电刺激")  
-        msg = StopStimulationCommand.pack()
-        logger.debug(f"stop_stimulation message is {msg.hex()}")
-        self.socket.sendall(msg)
-        
-    # 启动采集
-    def start_acquisition(self, recording = True):
-        logger.info("启动信号采集")  
-        self._recording = recording
-        # 设置数据采集参数
-        param_bytes = SetAcquisitionParamCommand.build(self).pack()
-        # 启动数据采集
-        start_bytes = StartAcquisitionCommand.build(self).pack()
-        msg = param_bytes + start_bytes
-        logger.debug(f"start_acquisition message is {msg.hex()}")
-        self.socket.sendall(msg)
-        
-    # 停止采集
-    def stop_acquisition(self):
-        logger.info("停止信号采集")  
-        msg = StopAcquisitionCommand.build(self).pack()
-        logger.debug(f"stop_acquisition message is {msg.hex()}")
-        self.socket.sendall(msg)
-        if self._edf_handler:
-            # 发送结束标识
-            self.edf_handler.write(None)
-        
-    # 订阅实时数据
-    def subscribe(self, topic:str=None, q : Queue=None, type : Literal["signal","impedance"]="signal"):  
-        logger.info(f"订阅{self.device_no}的数据流")    
-        # 数据队列
-        if q is None:
-            q = Queue(maxsize=1000)
-            
-        # 队列名称     
-        if topic is None:
-            topic = f"{type}_{time_ns()}"
-        
-        # 订阅生理电信号数据
-        if type == "signal":
-            # topic唯一，用来区分不同的订阅队列（下同）
-            if topic in list(self.__signal_consumer.keys()):
-                logger.warning(f"exists {type} subscribe of {topic}")
-            else:
-                self.__signal_consumer[topic] = q
-            
-        # 订阅阻抗数据
-        if type == "impedance":
-            if topic in list(self.__signal_consumer.keys()):
-                logger.warning(f"exists {type} subscribe of {topic}")
-            else:
-                self.__impedance_consumer[topic] = q
-            
-        return topic, q
-    
-    def trigger(self, desc):
-        if self._edf_handler:
-            self.edf_handler.trigger(desc)
-        else:
-            logger.warning("no edf handler, no place to recording trigger")
-        
+        self._sample_range = sample_range     
     
     def gen_set_acquirement_param(self) -> bytes:
         

qlsdk/rsc/device/base.py

@@ -93,21 +93,6 @@ class QLBaseDevice(IDevice):
         }
         
         self.stim_paradigm: StimulationParadigm = None
-                      
-        signal_info = {
-            "param" : None,
-            "start_time" : None,
-            "finished_time" : None,
-            "packet_total" : None,
-            "last_packet_time" : None,
-            "state" : 0
-        }
-        stim_info = {
-            
-        }
-        Impedance_info = {
-            
-        }
         # 信号采集状态
         # 信号数据包总数（一个信号采集周期内）
         # 信号采集参数
@@ -128,6 +113,8 @@ class QLBaseDevice(IDevice):
         self.storage_enable = True 
         self._listening = False
         # self.ready()
+        self._signal_cache: Queue = None
+        self._recording = False
         
     def parser(self) -> IParser:
         return self._parser
@@ -166,9 +153,16 @@ class QLBaseDevice(IDevice):
             for pos in trigger_positions:
                 self.trigger(data.trigger[pos])
         # 存储
-        if self.storage_enable:
-            self._write_signal(data)
-                        
+        if self.storage_enable:            
+            # 确保记录线程启动
+            if self._recording is False:
+                self._start_recording() 
+                
+            # 写入文件的缓存队列
+            if self._signal_cache is None:
+                self._signal_cache = Queue(256 * 1024 * 1024)  # 256MB缓存
+            self._signal_cache.put(data)
+                                    
         if len(self.signal_consumers) > 0 :
             logger.trace(f"dg eeg: {data.eeg}")
             # 信号数字值转物理值
@@ -187,14 +181,35 @@ class QLBaseDevice(IDevice):
     def _signal_wrapper(self, body: bytes):
         return RscPacket().transfer(body)
                 
-    def _write_signal(self, data: RscPacket):
+    def _write_signal(self):
         # 文件写入到edf
         if self._edf_handler is None:
             logger.debug("Initializing EDF handler for data storage")
             self.init_edf_handler()
         
-        if self._edf_handler:  
+        while self._recording:            
+            data = self._signal_cache.get()
             self._edf_handler.write(data)
+            if data is None:
+                break
+            
+        self._recording = False
+    def _start_recording(self):
+        if self.storage_enable is False:
+            logger.trace("Storage is disabled, will not start recording")
+            return  
+        
+        if self._signal_cache is None:
+            self._signal_cache = Queue(256 * 1024 * 1024)  # 256MB缓存
+            
+        try: 
+            self._recording = True
+            t = Thread(target=self._write_signal, daemon=True)
+            t.start()
+            logger.info(f"开启记录")
+        except Exception as e:
+            logger.error(f"开启记录失败: {str(e)}")
+            return
         
     def start_listening(self):        
         
@@ -305,7 +320,7 @@ class QLBaseDevice(IDevice):
     @property
     def edf_handler(self):
         if not self.storage_enable:
-            logger.warning("EDF storage is disabled, no edf handler available")
+            logger.info("已关闭文件记录，不会生成edf/bdf文件")
             return None
         
         if self._edf_handler is None:
@@ -339,8 +354,12 @@ class QLBaseDevice(IDevice):
         return self._impedance_consumer
     
     # 设置记录文件路径
-    def set_storage_path(self, path):
-        self._storage_path = path
+    def set_storage_path(self, dir: str):
+        import os
+        
+        abs_path = os.path.abspath(dir)
+        os.makedirs(abs_path, exist_ok=True)
+        self._storage_path = abs_path
        
     # 设置记录文件名称前缀 
     def set_file_prefix(self, prefix):
@@ -362,10 +381,6 @@ class QLBaseDevice(IDevice):
         self._acq_channels = channels
         self._sample_rate = sample_rate
         self._sample_range = sample_range
-    
-    # 通用配置-TODO
-    def set_config(self, key:str, val: str):
-        pass      
         
     def start_impedance(self):
         logger.info(f"[设备-{self.device_no}]启动阻抗测量")  
@@ -399,8 +414,8 @@ class QLBaseDevice(IDevice):
             sleep(1)
             delay -= 1
         logger.debug(f"_stop_stimulation_trigger duration: {duration}")
-        if self._edf_handler:
-            self._edf_handler.trigger("stimulation should be stopped")
+        if self.edf_handler:
+            self.edf_handler.trigger("stimulation should be stopped")
         else:
             logger.warning("stop stim trigger fail. no edf writer alive")
         
@@ -411,11 +426,10 @@ class QLBaseDevice(IDevice):
         self.socket.sendall(msg)
         
     # 启动采集
-    def start_acquisition(self, recording = True):
+    def start_acquisition(self):
         logger.info(f"[设备-{self.device_no}]启动信号采集")  
-        self._recording = recording
-        # 初始化EDF处理器
-        self.init_edf_handler()
+        # 记录准备
+        self._start_recording()
         # 设置数据采集参数
         param_bytes = SetAcquisitionParamCommand.build(self).pack()
         # 启动数据采集
@@ -430,9 +444,10 @@ class QLBaseDevice(IDevice):
         msg = StopAcquisitionCommand.build(self).pack()
         logger.trace(f"stop_acquisition message is {msg.hex()}")
         self.socket.sendall(msg)
-        if self._edf_handler:
+        # 结束标识
+        if self._signal_cache:
             # 发送结束标识
-            self.edf_handler.write(None)
+            self._signal_cache.put(None)
         
     '''
         订阅数据
@@ -450,7 +465,7 @@ class QLBaseDevice(IDevice):
             
         # 数据队列
         if q is None:
-            q = Queue(maxsize=1024 * 1024)
+            q = Queue(maxsize=100 * 1024 * 1024)
         
         # 订阅生理电信号数据
         if type == "signal":
@@ -470,10 +485,10 @@ class QLBaseDevice(IDevice):
         return topic, q
     
     def trigger(self, desc):
-        if self._edf_handler:
+        if self.edf_handler:
             self.edf_handler.trigger(desc)
         else:
-            logger.warning("没有开启文件记录时，无法记录trigger信息")
+            logger.info("已关闭文件记录，不会记录trigger信息")
         
     def gen_set_acquirement_param(self) -> bytes:
         
@@ -499,6 +514,9 @@ class QLBaseDevice(IDevice):
          
         # 关闭解析器
         self._parser.stop()   
+        
+    def enable_storage(self, enable: bool = True):
+        self.storage_enable = enable
     
     def __str__(self):
         return f''' 

qlsdk/rsc/device/c16_rs.py

@@ -115,11 +115,7 @@ class C16RS(QLBaseDevice):
         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 if self._file_prefix else 'C16R')
-            
-    # 设置刺激参数
-    def set_stim_param(self, param):
-        self.stim_paradigm = param
-    
+                
     # 设置采集参数
     def set_acq_param(self, channels, sample_rate = 500, sample_range = 188):
         # 保存原始通道参数

qlsdk/rsc/device/c256_rs.py

@@ -13,6 +13,13 @@ class C256RS(QLBaseDevice):
     def __init__(self, socket):
         super().__init__(socket)
         
+    @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)
@@ -20,7 +27,12 @@ class C256RS(QLBaseDevice):
         self._edf_handler.set_storage_path(self._storage_path)
         self._edf_handler.set_file_prefix(self._file_prefix if self._file_prefix else 'C256RS')
         logger.debug(f"EDF Handler initialized")
-        
+      
+    @property
+    def acq_channels(self):
+        if self._acq_channels is None:
+            self._acq_channels = [i for i in range(1, 256)]
+        return self._acq_channels  
     
     def _signal_wrapper(self, body: bytes):
         return C256RSPacket().transfer(body)

qlsdk/rsc/device/c64s1.py

@@ -1,145 +1,15 @@
-
-from multiprocessing import Queue
-from threading import Thread
-from time import sleep, time_ns
-from typing import Any, Dict, Literal
-
 from loguru import logger
 from qlsdk.persist import RscEDFHandler
-from qlsdk.rsc.interface import IDevice, IParser
+from qlsdk.rsc.interface import IDevice
 from qlsdk.rsc.command import *
-from qlsdk.rsc.parser.base import TcpMessageParser
 from qlsdk.rsc.device.base import QLBaseDevice
 
 class C64S1(QLBaseDevice):
     
-    device_type = 0x40  # C64RS设备类型标识符
+    device_type = 0x40  # C64RS-S1设备类型标识符
     
     def __init__(self, socket):
         super().__init__(socket)
-        self.socket = socket
-        
-        self._id = None
-        
-        # 设备信息
-        self.device_id = None
-        self.device_name = None
-        self._device_no = None
-        self.software_version = None
-        self.hardware_version = None
-        self.connect_time = None
-        self.current_time = None
-        # mV
-        self.voltage = None
-        # %
-        self.battery_remain = None
-        # %
-        self.battery_total = None
-        # persist
-        self._recording = False
-        self._storage_path = None
-        self._file_prefix = None
-        
-        # 可设置参数
-        # 采集：采样量程、采样率、采样通道
-        # 刺激：刺激电流、刺激频率、刺激时间、刺激通道
-        # 采样量程（mV）：188、375、563、750、1125、2250、4500
-        self._sample_range:Literal[188, 375, 563, 750, 1125, 2250, 4500] = 188        
-        # 采样率（Hz）：250、500、1000、2000、4000、8000、16000、32000
-        self._sample_rate:Literal[250, 500, 1000, 2000, 4000, 8000, 16000, 32000] = 500
-        self._physical_max = self._sample_range * 1000  # 物理最大值（uV）
-        self._physical_min = -self._sample_range * 1000  # 物理最小值（uV）
-        self._digital_max = 8388607
-        self._digital_min = -8388608
-        self._physical_range = self._physical_max - self._physical_min
-        self._digital_range = 16777215
-        self._acq_channels = None
-        self._acq_param = {
-            "sample_range": 188,
-            "sample_rate": 500,
-            "channels": [],
-        }
-        
-        self._stim_param = {
-            "stim_type": 0,                 # 刺激类型：0-所有通道参数相同, 1: 通道参数不同
-            "channels": [],
-            "param": [{
-                    "channel_id": 0,        #通道号 从0开始                          -- 必填
-                    "waveform": 3,          #波形类型：0-直流，1-交流 2-方波 3-脉冲   -- 必填
-                    "current": 1,           #电流强度(mA)                            -- 必填
-                    "duration": 30,         #平稳阶段持续时间(s)                      -- 必填
-                    "ramp_up": 5,           #上升时间(s) 默认0
-                    "ramp_down": 5,         #下降时间(s) 默认0
-                    "frequency": 500,       #频率(Hz) -- 非直流必填
-                    "phase_position": 0,    #相位 -- 默认0
-                    "duration_delay": "0",  #延迟启动时间(s) -- 默认0
-                    "pulse_width": 0,       #脉冲宽度(us) -- 仅脉冲类型电流有效， 默认100us
-                },
-                {
-                    "channel_id": 1,        #通道号 从0开始                          -- 必填
-                    "waveform": 3,          #波形类型：0-直流，1-交流 2-方波 3-脉冲   -- 必填
-                    "current": 1,           #电流强度(mA)                            -- 必填
-                    "duration": 30,         #平稳阶段持续时间(s)                      -- 必填
-                    "ramp_up": 5,           #上升时间(s) 默认0
-                    "ramp_down": 5,         #下降时间(s) 默认0
-                    "frequency": 500,       #频率(Hz) -- 非直流必填
-                    "phase_position": 0,    #相位 -- 默认0
-                    "duration_delay": "0",  #延迟启动时间(s) -- 默认0
-                    "pulse_width": 0,       #脉冲宽度(us) -- 仅脉冲类型电流有效， 默认100us
-                }
-            ]
-        }
-        
-        self.stim_paradigm = None
-                      
-        signal_info = {
-            "param" : None,
-            "start_time" : None,
-            "finished_time" : None,
-            "packet_total" : None,
-            "last_packet_time" : None,
-            "state" : 0
-        }
-        stim_info = {
-            
-        }
-        Impedance_info = {
-            
-        }
-        # 信号采集状态
-        # 信号数据包总数（一个信号采集周期内）
-        # 信号采集参数
-        # 电刺激状态
-        # 电刺激开始时间（最近一次）
-        # 电刺激结束时间（最近一次）
-        # 电刺激参数
-        # 启动数据解析线程
-        # 数据存储状态
-        # 存储目录
-        
-        # 
-        self.__signal_consumer: Dict[str, Queue[Any]]={}
-        self.__impedance_consumer: Dict[str, Queue[Any]]={}
-        
-        # EDF文件处理器
-        self._edf_handler = None       
-        self.storage_enable = True 
-        
-        self._parser: IParser = TcpMessageParser(self)
-        self._parser.start()
-        
-        # 启动数据接收线程
-        self._accept = Thread(target=self.accept)
-        self._accept.daemon = True
-        self._accept.start()
-        
-    @property
-    def device_no(self):
-        return self._device_no
-    
-    @device_no.setter
-    def device_no(self, value: str):
-        self._device_no = value
     
     @classmethod
     def from_parent(cls, parent:IDevice) -> IDevice:
@@ -155,211 +25,5 @@ class C64S1(QLBaseDevice):
         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 if self._file_prefix else 'C64S1')
-        
-    @property
-    def edf_handler(self):
-        if not self.storage_enable:
-            return None
-        
-        if self._edf_handler is None:
-            self.init_edf_handler() 
-            
-        return self._edf_handler  
-    
-    @property
-    def acq_channels(self):
-        if self._acq_channels is None:
-            self._acq_channels = [i for i in range(1, 63)]
-        return self._acq_channels
-    @property
-    def sample_range(self):
-        return self._sample_range if self._sample_range else 188
-    @property
-    def sample_rate(self):
-        return self._sample_rate if self._sample_rate else 500
-    @property
-    def resolution(self):
-        return 24
-    
-    @property
-    def signal_consumers(self):
-        return self.__signal_consumer
-    
-    @property
-    def impedance_consumers(self):
-        return self.__impedance_consumer
-    
-    # 设置记录文件路径
-    def set_storage_path(self, path):
-        self._storage_path = path
-       
-    # 设置记录文件名称前缀 
-    def set_file_prefix(self, prefix):
-        self._file_prefix = prefix
-        
-    # 接收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)
-            
-       
-    # socket发送数据    
-    def send(self, data):
-        self.socket.sendall(data)
-    
-    # 设置刺激参数
-    def set_stim_param(self, param):
-        self.stim_paradigm = param
-    
-    # 设置采集参数
-    def set_acq_param(self, channels, sample_rate = 500, sample_range = 188):
-        self._acq_param["channels"] = channels 
-        self._acq_param["sample_rate"] = sample_rate
-        self._acq_param["sample_range"] = sample_range
-        self._acq_channels = channels
-        self._sample_rate = sample_rate
-        self._sample_range = sample_range
-    
-    # 通用配置-TODO
-    def set_config(self, key:str, val: str):
-        pass      
-        
-    def start_impedance(self):
-        logger.info("启动阻抗测量")  
-        msg = StartImpedanceCommand.build(self).pack()
-        logger.debug(f"start_impedance message is {msg.hex()}")
-        self.socket.sendall(msg)
-    
-    def stop_impedance(self):
-        logger.info("停止阻抗测量")  
-        msg = StopImpedanceCommand.build(self).pack()
-        logger.debug(f"stop_impedance message is {msg.hex()}")
-        self.socket.sendall(msg)
-    
-    def start_stimulation(self):
-        if self.stim_paradigm is None:
-            logger.warning("刺激参数未设置，请先设置刺激参数")
-            return
-        logger.info("启动电刺激")  
-        msg = StartStimulationCommand.build(self).pack()
-        logger.debug(f"start_stimulation message is {msg.hex()}")
-        self.socket.sendall(msg)
-        t = Thread(target=self._stop_stimulation_trigger, args=(self.stim_paradigm.duration,))
-        t.start()
-        
-    def _stop_stimulation_trigger(self, duration):
-        delay = duration
-        while delay > 0:
-            sleep(1)
-            delay -= 1
-        logger.info(f"_stop_stimulation_trigger duration: {duration}")
-        if self._edf_handler:
-            self._edf_handler.trigger("stimulation should be stopped")
-        else:
-            logger.warning("stop stim trigger fail. no edf writer alive")
-        
-    def stop_stimulation(self):
-        logger.info("停止电刺激")  
-        msg = StopStimulationCommand.pack()
-        logger.debug(f"stop_stimulation message is {msg.hex()}")
-        self.socket.sendall(msg)
-        
-    # 启动采集
-    def start_acquisition(self, recording = True):
-        logger.info("启动信号采集")  
-        self._recording = recording
-        # 设置数据采集参数
-        param_bytes = SetAcquisitionParamCommand.build(self).pack()
-        # 启动数据采集
-        start_bytes = StartAcquisitionCommand.build(self).pack()
-        msg = param_bytes + start_bytes
-        logger.debug(f"start_acquisition message is {msg.hex()}")
-        self.socket.sendall(msg)
-        
-    # 停止采集
-    def stop_acquisition(self):
-        logger.info("停止信号采集")  
-        msg = StopAcquisitionCommand.build(self).pack()
-        logger.debug(f"stop_acquisition message is {msg.hex()}")
-        self.socket.sendall(msg)
-        if self._edf_handler:
-            # 发送结束标识
-            self.edf_handler.write(None)
-        
-    # 订阅实时数据
-    def subscribe(self, topic:str=None, q : Queue=None, type : Literal["signal","impedance"]="signal"):  
-            
-        # 数据队列
-        if q is None:
-            q = Queue(maxsize=1000)
-            
-        # 队列名称     
-        if topic is None:
-            topic = f"{type}_{time_ns()}"
-        
-        # 订阅生理电信号数据
-        if type == "signal":
-            # topic唯一，用来区分不同的订阅队列（下同）
-            if topic in list(self.__signal_consumer.keys()):
-                logger.warning(f"exists {type} subscribe of {topic}")
-            else:
-                self.__signal_consumer[topic] = q
-            
-        # 订阅阻抗数据
-        if type == "impedance":
-            if topic in list(self.__signal_consumer.keys()):
-                logger.warning(f"exists {type} subscribe of {topic}")
-            else:
-                self.__impedance_consumer[topic] = q
-            
-        return topic, q
-    
-    def trigger(self, desc):
-        if self._edf_handler:
-            self.edf_handler.trigger(desc)
-        else:
-            logger.warning("no edf handler, no place to recording trigger")
-        
-    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}, 
-                Software: {self.software_version}, 
-                Hardware: {self.hardware_version}, 
-                Connect Time: {self.connect_time},
-                Current Time: {self.current_time},
-                Voltage: {str(self.voltage) + "mV" if self.voltage else None},
-                Battery Remain: {str(self.battery_remain)+ "%" if self.battery_remain else None},
-                Battery Total: {str(self.battery_total) + "%" if self.battery_total else None}
-            '''
-
-    def __repr__(self):
-        return f''' 
-            Device: 
-                Name: {self.device_name}, 
-                Type: {hex(self.device_type)}, 
-                ID: {self.device_id}, 
-                Software: {self.software_version}, 
-                Hardware: {self.hardware_version}, 
-                Connect Time: {self.connect_time},
-                Current Time: {self.current_time},
-                Voltage: {self.voltage}mV,
-                Battery Remain: {self.battery_remain}%,
-                Battery Total: {self.battery_total}%
-            '''
-
-    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 __hash__(self):
-        return hash((self.device_name, self.device_type, self.device_id))    
-    
-    
+        logger.debug(f"EDF Handler initialized")
+        

qlsdk/rsc/interface/device.py

@@ -61,4 +61,12 @@ class  IDevice(ABC):
         raise NotImplementedError("Not Supported")
     def disconnect(self) -> None:
         raise NotImplementedError("Not Supported")
-        
+    
+    def set_stim_param(self, param):
+        pass
+        
+    def trigger(self, desc):
+        pass
+    
+    def enable_storage(self, enable: bool = True):
+        pass

qlsdk/rsc/parser/base.py

@@ -64,7 +64,7 @@ class TcpMessageParser(IParser):
                 start_pos = self.buffer.tell()
                 head = self.buffer.read(2)
                 if head != self.header:
-                    logger.debug(f"数据包头部不匹配: {head.hex()}, 期望: {self.header.hex()},继续查找...")
+                    logger.trace(f"数据包头部不匹配: {head.hex()}, 期望: {self.header.hex()},继续查找...")
                     self.buffer.seek(start_pos + 1)  # 移动到下一个字节
                     continue
                 

{qlsdk2-0.6.0a6.dist-info → qlsdk2-0.6.0a8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qlsdk2
-Version: 0.6.0a6
+Version: 0.6.0a8
 Summary: SDK for quanlan device
 Home-page: https://github.com/hehuajun/qlsdk
 Author: hehuajun

{qlsdk2-0.6.0a6.dist-info → qlsdk2-0.6.0a8.dist-info}/RECORD

@@ -28,9 +28,9 @@ 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/ars_edf.py,sha256=H5dhdoQyJps5WM23vZoY1EKj0PYx0OY9AZeui72TjaY,8930
 qlsdk/persist/edf.py,sha256=ETngb86CfkIUJYWmw86QR445MvTFC7Edk_CH9nyNgtY,7857
-qlsdk/persist/rsc_edf.py,sha256=SKvVXmQIJB5AA_3qvp0uh3PI-VaUk9cP8NXwsrpY4no,13977
+qlsdk/persist/rsc_edf.py,sha256=djR_qXScb_XOOXaoMsvnK_qO2NCPzqEeKxKJCm4xnpk,13989
 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
@@ -39,19 +39,19 @@ qlsdk/rsc/eegion.py,sha256=lxrktO-3Z_MYdFIwc4NxvgLM5AL5kU3UItjH6tsKmHY,11670
 qlsdk/rsc/entity.py,sha256=-fRWFkVWp9d8Y1uh6GiacXC5scdeEKNiNFf3aziGdCE,17751
 qlsdk/rsc/paradigm.py,sha256=dYkm0BCpx7tkL-1OE3Io48JgKT0j-lP-n3uC1AcFiWs,17561
 qlsdk/rsc/proxy.py,sha256=9CPdGNGWremwBUh4GvlXAykYB-x_BEPPLqsNvwuwIDE,2736
-qlsdk/rsc/command/__init__.py,sha256=bnnPxn5mChrKCpJbnX718YuFEBDZ8KESYfMIf_8K7J0,12225
+qlsdk/rsc/command/__init__.py,sha256=iPrPor7NwBIrkQDxz061gVbnlLYK9KE7VXy-NKJy1XQ,12277
 qlsdk/rsc/command/message.py,sha256=nTdG-Vp4MBnltyrgedAWiKD6kzOaPrg58Z_hq6yjhys,12220
 qlsdk/rsc/device/__init__.py,sha256=BzY9lRfssGPUlJ1ys-v3CWNgGihg7mPa2T4X0tl0Vg4,214
-qlsdk/rsc/device/arskindling.py,sha256=owci6MEGjyWqohEXzPdKj_ESeVIZKgO53StVj6Tmi18,15002
-qlsdk/rsc/device/base.py,sha256=cE4nGsOmw44gU4e1PiJmbv2KuQ0dFIoIIkXXjA4_44A,20239
-qlsdk/rsc/device/c16_rs.py,sha256=BHQRHOnsTMAKgqSXaAS2RjPIklZQAl2CVfe6i_iX-i4,5928
-qlsdk/rsc/device/c256_rs.py,sha256=EOzNqf4zZwmnzzLyb0KlOXmHhFjPJ3TUVGUDkGgI5Wc,1281
+qlsdk/rsc/device/arskindling.py,sha256=tVih2D3Hhhal3WP0yqjKpzkwFPi6KLenshFStoP-vsw,4123
+qlsdk/rsc/device/base.py,sha256=fCGzjAbagTTGRBfHhbiYOqN3TLOViEd8il8Qp6RiVJs,21106
+qlsdk/rsc/device/c16_rs.py,sha256=qXt8m5vwcKQsN8JBllWnAsda5_Y6qkEhfHQQX101TMQ,5826
+qlsdk/rsc/device/c256_rs.py,sha256=7vAEzf_ggNcwrXKmcZMylnKzLFD5ZqtAIfkkI3lQ1iI,1682
 qlsdk/rsc/device/c64_rs.py,sha256=x8wHdwATKDU34j9vXNEXsNSJg23RAWmAKL8pgIGamG8,1091
-qlsdk/rsc/device/c64s1.py,sha256=L7nKmsoMCGj6GMjHYfYkKgkBtrGfP516kQHQ5I1FAUE,13986
+qlsdk/rsc/device/c64s1.py,sha256=WwiKSjxYpUJVkHDMDzPgp7-klbaiZ2f8EOe3wV6d2WU,1098
 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=__ap7aJFaaktzMaZ253MMeZy9vgvJmX0Hha1dISGkOk,2064
+qlsdk/rsc/interface/device.py,sha256=LmTnoumG-nLG_H_Fq21XSdTUe_XUvWRWw-8ZNX5_cBU,2238
 qlsdk/rsc/interface/handler.py,sha256=ADDe_a2RAxGMuooLyivH0JBPTGBcFP2JaTVX41R1A4w,198
 qlsdk/rsc/interface/parser.py,sha256=Z4PND5LXcJ_8CQ-OIq3KlOEVOceU1hKUuZkoFSIGGLM,334
 qlsdk/rsc/manager/__init__.py,sha256=4ljT3mR8YPBDQur46B5xPqK5tjLKlsWfgCJVuA0gs-8,40
@@ -61,7 +61,7 @@ qlsdk/rsc/network/__init__.py,sha256=PfYiqXS2pZV__uegQ1TjaeYhY1pefZ_shwE_X5HNVbs
 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=VoVYoy2B583EohRRLPX3GcRiuQxT7RG7-y24WgICP2k,5702
+qlsdk/rsc/parser/base.py,sha256=tH4r_1PVkYfF2alpxKdXiFHmhTDPW_NKbq6DUqU6LVg,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
@@ -70,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.6.0a6.dist-info/METADATA,sha256=xrhOFC2qVtEuKyGCkA_rOjFRGbFGrI0XB-hU1vLrHKo,1882
-qlsdk2-0.6.0a6.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-qlsdk2-0.6.0a6.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
-qlsdk2-0.6.0a6.dist-info/RECORD,,
+qlsdk2-0.6.0a8.dist-info/METADATA,sha256=RweCHF8Y0Gv3rDVK58bgKl7dgQAmZreBAUcelU_rLbM,1882
+qlsdk2-0.6.0a8.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+qlsdk2-0.6.0a8.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
+qlsdk2-0.6.0a8.dist-info/RECORD,,