qlsdk2 0.6.0a11__tar.gz → 0.6.0a13__tar.gz

{qlsdk2-0.6.0a11 → qlsdk2-0.6.0a13}/PKG-INFO

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

{qlsdk2-0.6.0a11 → qlsdk2-0.6.0a13}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8' ) as fh:
 
 setuptools.setup(
     name="qlsdk2",
-    version="0.6.0a11",
+    version="0.6.0a13",
     author="hehuajun",
     author_email="hehuajun@eegion.com",
     description="SDK for quanlan device",

{qlsdk2-0.6.0a11 → qlsdk2-0.6.0a13}/src/qlsdk/core/entity/__init__.py

@@ -56,19 +56,13 @@ class RscPacket(Packet):
         return packet
         
     def __str__(self):
-        return f"""
-            time_stamp: {self.time_stamp}
-            pkg_id: {self.pkg_id}
-            origin_sample_rate: {self.origin_sample_rate}
-            sample_rate: {self.sample_rate}
-            sample_num: {self.sample_num}
-            resolution: {self.resolution}
-            filter: {self.filter}
-            channels: {self.channels}
-            data len: {self.data_len}
-            trigger: {self.trigger}
-            eeg: {self.eeg}
-        """
+        return f"""[
+            "time_stamp": {self.time_stamp}
+            "pkg_id": {self.pkg_id}
+            "channels": {self.channels}
+            "trigger": {self.trigger}
+            "eeg": {self.eeg}
+        ]"""
         
 class ImpedancePacket(Packet):
     def __init__(self):
@@ -97,12 +91,12 @@ class ImpedancePacket(Packet):
         return packet
 
     def __str__(self):
-        return f"""
-            time_stamp: {self.time_stamp}
-            pkg_id: {self.pkg_id}
-            channels: {self.channels}
-            impedance: {self.impedance}
-        """
+        return f"""[
+            "time_stamp": {self.time_stamp}
+            "pkg_id": {self.pkg_id}
+            "channels": {self.channels}
+            "impedance": {self.impedance}
+        ]"""
         
     
 class C256RSPacket(Packet):

{qlsdk2-0.6.0a11 → qlsdk2-0.6.0a13}/src/qlsdk/rsc/command/__init__.py

@@ -48,8 +48,9 @@ class DeviceCommand(abc.ABC):
         """构建消息体"""
         return b''
     def pack_header(self, body_len: int) -> bytes:
-        device_id = int(self.device.device_id) if self.device and self.device.device_id else 0
+        # 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
+        device_id = bytes.fromhex(self.device.device_id)[::-1] if self.device.device_id else bytes.fromhex('00000000')
         
         #兼容设计
         b_device_type = None
@@ -61,7 +62,7 @@ class DeviceCommand(abc.ABC):
                 DeviceCommand.HEADER_PREFIX
                 + int(2).to_bytes(1, 'little')     # pkgType  
                 + device_type.to_bytes(1, 'little')
-                + device_id.to_bytes(4, 'little')
+                + device_id
                 + (DeviceCommand.HEADER_LEN + body_len + 2).to_bytes(4, 'little')  # +1 for checksum
                 + self.cmd_code.to_bytes(2, 'little')
             )
@@ -204,6 +205,15 @@ class StopAcquisitionCommand(DeviceCommand):
 class SetImpedanceParamCommand(DeviceCommand):
     cmd_code = 0x411
     cmd_desc = "设置阻抗测量参数"
+    def pack_body(self): 
+
+        return self.device.gen_set_impedance_param()
+    def parse_body(self, body):
+        result = body[8]
+        if result == 0x00:
+            logger.info("阻抗测量参数设置成功")
+        else:
+            logger.warning(f"阻抗测量参数设置失败: {int(result)}")
         
 # 启动阻抗测量
 class StartImpedanceCommand(DeviceCommand):
@@ -211,13 +221,16 @@ class StartImpedanceCommand(DeviceCommand):
     cmd_desc = "启动阻抗测量"
     def pack_body(self):
         body = bytes.fromhex('0000')
-        body += to_bytes(self.device.acq_channels)
+        body += to_bytes(self.device.get_impedance_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) 
+        result = body[8]
+        if result == 0x00:
+            logger.info("阻抗测量启动成功")
+        else:
+            logger.warning(f"阻抗测量启动失败: {int(result)}")
         
 
 # 停止阻抗测量

{qlsdk2-0.6.0a11 → qlsdk2-0.6.0a13}/src/qlsdk/rsc/device/arskindling.py

@@ -170,6 +170,22 @@ class ARSKindling(QLBaseDevice):
         self._sample_rate = sample_rate
         self._sample_range = sample_range     
     
+    # 设置阻抗通道
+    # {'A': [1,2,3], 'B':[1,2,3]}
+    def set_impedance_channels(self, channels):
+        
+        arr = []
+        
+        # 根据映射关系做通道转换
+        for k in channels.keys():
+            if isinstance(channels[k], list):
+                temp = [k + str(i) for i in channels[k]]
+                arr += [self.channel_mapping.get(c, 1) for c in temp]
+            else:
+                arr += [k + str(channels[k])]
+                
+        self._impedance_channels = arr
+        
     @property
     def acq_channels(self):
         if self._acq_channels is None:
@@ -184,7 +200,7 @@ class ARSKindling(QLBaseDevice):
     def _produce_impedance(self, body: bytes):
         # 分发阻抗数据包给订阅者
         if len(self._impedance_consumer) > 0:
-            packet = ImpedancePacket.transfer(body)
+            packet = self._impedance_wrapper(body)
             real_data = self.__impedance_transfer(packet)
             for topic, q in self._impedance_consumer.items():
                 try:
@@ -222,7 +238,8 @@ class ARSKindling(QLBaseDevice):
             # 写入文件的缓存队列
             if self._signal_cache is None:
                 self._signal_cache = Queue(1000000)  # 缓冲队列
-            self._signal_cache.put(real_data)
+            tmp = real_data
+            self._signal_cache.put(tmp)
                                     
         if len(self.signal_consumers) > 0 :
             # 订阅只返回物理值

{qlsdk2-0.6.0a11 → qlsdk2-0.6.0a13}/src/qlsdk/rsc/device/base.py

@@ -8,11 +8,27 @@ import numpy as np
 from qlsdk.core.entity import RscPacket, ImpedancePacket
 from qlsdk.core.utils import to_bytes
 from qlsdk.rsc.interface import IDevice, IParser
-from qlsdk.rsc.command import StartImpedanceCommand, StopImpedanceCommand, StartStimulationCommand, StopStimulationCommand, SetAcquisitionParamCommand, StartAcquisitionCommand, StopAcquisitionCommand
+from qlsdk.rsc.command import SetImpedanceParamCommand, StartImpedanceCommand, StopImpedanceCommand, StartStimulationCommand, StopStimulationCommand, SetAcquisitionParamCommand, StartAcquisitionCommand, StopAcquisitionCommand
 from qlsdk.rsc.paradigm import StimulationParadigm
 from qlsdk.rsc.parser.base import TcpMessageParser
 
+    
+def intersection_positions(A, B):
+    setB = set(B)
+    seen = set()
+    return [idx for idx, elem in enumerate(A) 
+            if elem in setB and elem not in seen and not seen.add(elem)]    
+    
 class QLBaseDevice(IDevice):
+    
+    __TRIGGER_MAPPING = {
+        0x3E8: "Start of stimulation",
+        0x3E9: "End of stimulation",
+        0x3EA: "Ascending end of stimulation",
+        0x3EB: "Descending start of stimulation ",
+        0x3EC: "刺激参数有误",
+        0x3ED: "End of stimulation (by force)",
+    }    
     def __init__(self, socket):
         self.socket = socket
         
@@ -62,35 +78,9 @@ class QLBaseDevice(IDevice):
             "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_param = None
+        
+        self._impedance_channels = []
         
         self.stim_paradigm: StimulationParadigm = None
         # 信号采集状态
@@ -116,6 +106,7 @@ class QLBaseDevice(IDevice):
         self._signal_cache: Queue = None
         self._recording = False
         
+        
     def parser(self) -> IParser:
         return self._parser
     
@@ -132,9 +123,9 @@ class QLBaseDevice(IDevice):
             self._produce_impedance(body)       
         
     def _produce_impedance(self, body: bytes):
-        packet = ImpedancePacket.transfer(body)
         # 分发阻抗数据包给订阅者
         if len(self._impedance_consumer) > 0:
+            packet = self._impedance_wrapper(body)
             for topic, q in self._impedance_consumer.items():
                 try:
                     # 队列满了就丢弃最早的数据
@@ -164,7 +155,8 @@ class QLBaseDevice(IDevice):
             # 写入文件的缓存队列
             if self._signal_cache is None:
                 self._signal_cache = Queue(256 * 1024 * 1024)  # 256MB缓存
-            self._signal_cache.put(data)
+            tmp = data
+            self._signal_cache.put(tmp)
                                     
         if len(self.signal_consumers) > 0 :
             logger.trace(f"dg eeg: {data.eeg}")
@@ -178,7 +170,17 @@ class QLBaseDevice(IDevice):
                 if q.full(): 
                     q.get()
                     
-                q.put(data)        
+                q.put(data)    
+                
+    def _impedance_wrapper(self, body: bytes):        
+        packet = ImpedancePacket().transfer(body)    
+        if self._impedance_channels is not None and len(self._impedance_channels) > 0:
+            # 只保留设置的阻抗通道
+            channel_pos = intersection_positions(packet.channels, self._impedance_channels)
+            packet.impedance = [packet.impedance[i] for i in channel_pos]
+            packet.channels = [packet.channels[i] for i in channel_pos]
+            
+        return packet
                 
     # 信号数据转换
     def _signal_wrapper(self, body: bytes):
@@ -252,6 +254,12 @@ class QLBaseDevice(IDevice):
     def device_type(self) -> int:
         return self._device_type
     
+    def set_impedance_channels(self, channels):
+        self._impedance_channels = channels
+        
+    def get_impedance_channels(self): 
+        return self._impedance_channels    
+    
     def start_message_parser(self) -> None:
         self._parser = TcpMessageParser(self)
         self._parser.start()
@@ -387,9 +395,17 @@ class QLBaseDevice(IDevice):
         
     def start_impedance(self):
         logger.info(f"[设备-{self.device_no}]启动阻抗测量")  
-        msg = StartImpedanceCommand.build(self).pack()
-        logger.trace(f"start_impedance message is {msg.hex()}")
-        self.socket.sendall(msg)
+        # 设置数据采集参数
+        # set_param_msg = SetImpedanceParamCommand.build(self).pack()
+        device_id = bytes.fromhex(self.device_id)[::-1].hex() if self.device_id else '00000000'
+        set_param_msg = bytes.fromhex(f'5aa50239{device_id}3f0000001104ffffffffffffffff000000000000000000000000000000000000000000000000e8030000fa00000010000164000000745c5aa50239390045243a00000012040000000000000000000000000000000000000000000000000000000000000000000001000000000000004c2a')
+        logger.debug(f"set_param_msg message is {set_param_msg.hex()}")
+        self.socket.sendall(set_param_msg)
+        sleep(0.5)
+    
+        impedance_start_msg = StartImpedanceCommand.build(self).pack()
+        logger.debug(f"start_impedance message is {impedance_start_msg.hex()}")
+        self.socket.sendall(impedance_start_msg)
     
     def stop_impedance(self):
         logger.info(f"[设备{self.device_no}]停止阻抗测量")  
@@ -493,6 +509,7 @@ class QLBaseDevice(IDevice):
         else:
             logger.info("已关闭文件记录，不会记录trigger信息")
         
+    # 设置信号采集参数
     def gen_set_acquirement_param(self) -> bytes:
         
         body = to_bytes(self.acq_channels) 
@@ -503,7 +520,19 @@ class QLBaseDevice(IDevice):
         body += bytes.fromhex('00')     
         
         return body
-    
+    # 设置阻抗测量参数
+    def gen_set_impedance_param(self) -> bytes:
+        
+        # 仅通道生效 32字节，其他不生效-272字节，实际73字节
+        body = to_bytes(self._impedance_channels) 
+        # 100 bytes
+        # body += bytes.fromhex('00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000')     
+        # # 100 bytes
+        # body += bytes.fromhex('00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000')     
+        # 73 bytes
+        body += bytes.fromhex('00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000')     
+        
+        return bytes.fromhex('ffffffffffffffff000000000000000000000000000000000000000000000000e8030000fa00000010000164000000745c5aa50239390045243a0000001204000000000000000000000000000000000000000000000000000000000000000000000100000000000000')
     def disconnect(self):
         logger.info(f"[断开设备-{self.device_no}]的连接...")  
         self._listening = False
@@ -522,7 +551,7 @@ class QLBaseDevice(IDevice):
         self.storage_enable = enable
         
     def trigger_info(self, code: int) -> str:
-        return __TRIGGER_MAPPING.get(code, hex(code))    
+        return QLBaseDevice.__TRIGGER_MAPPING.get(code, hex(code))    
     
     def __str__(self):
         return f''' 
@@ -543,13 +572,4 @@ class QLBaseDevice(IDevice):
         return self.device_type == other.device_type and self.device_no == other.device_no
 
     def __hash__(self):
-        return hash((self.device_type, self.device_no))    
-    
-__TRIGGER_MAPPING = {
-    0x3E8: "Start of stimulation",
-    0x3E9: "End of stimulation",
-    0x3EA: "Ascending end of stimulation",
-    0x3EB: "Descending start of stimulation ",
-    0x3EC: "刺激参数有误",
-    0x3ED: "End of stimulation (by force)",
-}    
+        return hash((self.device_type, self.device_no))    

{qlsdk2-0.6.0a11 → qlsdk2-0.6.0a13}/src/qlsdk/rsc/interface/device.py

@@ -24,6 +24,10 @@ class  IDevice(ABC):
     @property
     def device_no(self) -> str:
         pass
+       
+    def set_impedance_channels(self):
+        raise NotImplementedError("Not Supported")
+        
     
     def read_msg(self, size: int) -> bytes:
         raise NotImplementedError("Not Supported")
@@ -71,6 +75,9 @@ class  IDevice(ABC):
     def enable_storage(self, enable: bool = True):
         pass
     
+    def set_impedance_channel(self):
+        raise NotImplementedError("Not Supported")
+    
     def start_impedance(self):
         raise NotImplementedError("Not Supported")
     

{qlsdk2-0.6.0a11 → qlsdk2-0.6.0a13}/src/qlsdk2.egg-info/PKG-INFO

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