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

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/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,76 @@ 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 set_impedance_channels(self):
+        raise NotImplementedError("Not Supported")
+        
     
-    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
+        raise NotImplementedError("Not Supported")
+    def disconnect(self) -> None:
+        raise NotImplementedError("Not Supported")
     
-    def gen_set_acquirement_param(self) -> bytes:
+    def set_stim_param(self, param):
         pass
         
+    def trigger(self, desc):
+        pass
     
+    def enable_storage(self, enable: bool = True):
+        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
+    def set_impedance_channel(self):
+        raise NotImplementedError("Not Supported")
+    
+    def start_impedance(self):
+        raise NotImplementedError("Not Supported")
+    
+    def stop_impedance(self):
+        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)