qlsdk2 0.6.0a3__py3-none-any.whl → 0.6.0a4__py3-none-any.whl

qlsdk/core/entity/__init__.py

@@ -72,24 +72,34 @@ class RscPacket(Packet):
 class ImpedancePacket(Packet):
     def __init__(self):
         super().__init__()
-        self.data_len = None
         self.impedance = None
         
-    def transfer(self, body:bytes) -> 'ImpedancePacket':
-        self.time_stamp = int.from_bytes(body[0:8], 'little')
-        self.result = body[8]
-        self.pkg_id = int.from_bytes(body[9: 13], 'little')
-        self.channels = to_channels(body[13: 45])
-        
-        logger.trace(f"impedance: {self}")
+    @staticmethod
+    def transfer(body:bytes) -> 'ImpedancePacket':
+        packet = ImpedancePacket()
+        packet.time_stamp = int.from_bytes(body[0:8], 'little')
+        # packet.result = body[8]
+        packet.pkg_id = int.from_bytes(body[9: 13], 'little')
+        packet.channels = to_channels(body[13: 45])
+        # packet.sample_rate = int.from_bytes(body[45: 49], 'little')
+        # packet.sample_len = int.from_bytes(body[49: 53], 'little')
+        # packet.resolution = int(int(body[53]) / 8)
+        # packet.filter = int(int(body[54]) / 8)
+        # packet.wave_type = int(int(body[55]) / 8)
+        # packet.wave_freq = int.from_bytes(body[56: 60], 'little')
+        # packet.data_len = int.from_bytes(body[60: 64], 'little')
+        b_impedance = body[64:]
+        packet.impedance = [int.from_bytes(b_impedance[j * 4 : j * 4 + 4], 'little', signed=False) for j in range(len(packet.channels))]
+
+        logger.trace(f"impedance: {packet}")
         
+        return packet
+
     def __str__(self):
         return f"""
             time_stamp: {self.time_stamp}
             pkg_id: {self.pkg_id}
-            result: {self.result}
             channels: {self.channels}
-            data len: {self.data_len}
             impedance: {self.impedance}
         """
         
@@ -162,4 +172,40 @@ class C256RSPacket(Packet):
             offset += 4 + channel_size * packet.resolution 
             
         logger.trace(packet)
-        return packet
+        return packet
+    
+  
+class C256ImpedancePacket(Packet):
+    def __init__(self):
+        super().__init__()
+        self.impedance = None
+        
+    @staticmethod
+    def transfer(body:bytes) -> 'ImpedancePacket':
+        packet = ImpedancePacket()
+        packet.time_stamp = int.from_bytes(body[0:8], 'little')
+        # packet.result = body[8]
+        packet.pkg_id = int.from_bytes(body[9: 13], 'little')
+        packet.channels = to_channels(body[13: 45])
+        # packet.sample_rate = int.from_bytes(body[45: 49], 'little')
+        # packet.sample_len = int.from_bytes(body[49: 53], 'little')
+        # packet.resolution = int(int(body[53]) / 8)
+        # packet.filter = int(int(body[54]) / 8)
+        # packet.wave_type = int(int(body[55]) / 8)
+        # packet.wave_freq = int.from_bytes(body[56: 60], 'little')
+        # packet.data_len = int.from_bytes(body[60: 64], 'little')
+        b_impedance = body[64:]
+        packet.impedance = [int.from_bytes(b_impedance[j : j + 4], 'little', signed=False) for j in range(len(packet.channels))]
+
+        logger.trace(f"impedance: {packet}")
+
+    def __str__(self):
+        return f"""
+            time_stamp: {self.time_stamp}
+            pkg_id: {self.pkg_id}
+            result: {self.result}
+            channels: {self.channels}
+            data len: {self.data_len}
+            impedance: {self.impedance}
+        """
+            

qlsdk/rsc/command/__init__.py

@@ -297,8 +297,7 @@ class ImpedanceDataCommand(DeviceCommand):
     cmd_desc = "阻抗数据"
     
     def parse_body(self, body: bytes):
-        # logger.info(f"Received impedance data: {body.hex()}")
-        self.device.produce(body, type='impedance')
+        self.device.produce(body, type="impedance")
 
 # 信号数据
 class SignalDataCommand(DeviceCommand):

qlsdk/rsc/device/base.py

@@ -144,7 +144,7 @@ class QLBaseDevice(IDevice):
             self._produce_impedance(body)       
         
     def _produce_impedance(self, body: bytes):
-        packet = ImpedancePacket().transfer(body)
+        packet = ImpedancePacket.transfer(body)
         # 分发阻抗数据包给订阅者
         if len(self._impedance_consumer) > 0:
             for topic, q in self._impedance_consumer.items():
@@ -354,7 +354,7 @@ class QLBaseDevice(IDevice):
         self.stim_paradigm = param
     
     # 设置采集参数
-    def set_acq_param(self, channels, sample_rate = 500, sample_range = 188):
+    def set_acq_param(self, channels, sample_rate:Literal[188, 375, 563, 750, 1125, 2250, 4500] = 500, sample_range:Literal[250, 500, 1000, 2000, 4000, 8000, 16000, 32000] = 188):
         self._acq_param["channels"] = channels 
         self._acq_param["sample_rate"] = sample_rate
         self._acq_param["sample_range"] = sample_range
@@ -446,7 +446,7 @@ class QLBaseDevice(IDevice):
             
         # 数据队列
         if q is None:
-            q = Queue(maxsize=1000)
+            q = Queue(maxsize=1024 * 1024)
         
         # 订阅生理电信号数据
         if type == "signal":

qlsdk/rsc/device/c256_rs.py

@@ -199,15 +199,6 @@ class C256RS(QLBaseDevice):
     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
-    
     def _signal_wrapper(self, body: bytes):
         return C256RSPacket().transfer(body)
         

qlsdk/rsc/device/c64_rs.py

@@ -285,35 +285,7 @@ class C64RS(QLBaseDevice):
         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)

{qlsdk2-0.6.0a3.dist-info → qlsdk2-0.6.0a4.dist-info}/METADATA

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

{qlsdk2-0.6.0a3.dist-info → qlsdk2-0.6.0a4.dist-info}/RECORD

@@ -8,7 +8,7 @@ qlsdk/core/local.py,sha256=vbison4XZtS4SNYLJ9CqBhetEcukdviTWmvtdA1efkQ,811
 qlsdk/core/utils.py,sha256=yfCiLpufO96I68MLs6Drc6IECRjcQ-If8sXn7RaRHrk,4241
 qlsdk/core/crc/__init__.py,sha256=kaYSr6KN5g4U49xlxAvT2lnEeGtwX4Dz1ArwKDvUIIY,143
 qlsdk/core/crc/crctools.py,sha256=sDeE6CMccQX2cRAyMQK0SZUk1fa50XMuwqXau5UX5C8,4242
-qlsdk/core/entity/__init__.py,sha256=b0EFz0ND7eXNXKQvxjsoaH-rylws4iEuiKBRZwvPKyU,6620
+qlsdk/core/entity/__init__.py,sha256=TFkm1kZ7SsBZnvsdIAnim-HHSeUC69Nd7rrUUrmk4gw,8615
 qlsdk/core/filter/__init__.py,sha256=YIWIzDUKN30mq2JTr53ZGblggZfC_rLUp2FSRrsQFgU,36
 qlsdk/core/filter/norch.py,sha256=5RdIBX5eqs5w5nmVAnCB3ESSuAT_vVBZ2g-dg6HMZdY,1858
 qlsdk/core/message/__init__.py,sha256=sHuavOyHf4bhH6VdDpTA1EsCh7Q-XsPHcFiItpVz3Rs,51
@@ -39,14 +39,14 @@ qlsdk/rsc/eegion.py,sha256=lxrktO-3Z_MYdFIwc4NxvgLM5AL5kU3UItjH6tsKmHY,11670
 qlsdk/rsc/entity.py,sha256=-fRWFkVWp9d8Y1uh6GiacXC5scdeEKNiNFf3aziGdCE,17751
 qlsdk/rsc/paradigm.py,sha256=DGfwY36sMdPIMRjbGo661GvUTEwsRRi3jrmG405mSTk,12840
 qlsdk/rsc/proxy.py,sha256=9CPdGNGWremwBUh4GvlXAykYB-x_BEPPLqsNvwuwIDE,2736
-qlsdk/rsc/command/__init__.py,sha256=27MhUuyxUfvatezdjOCYgt9rooHH5HZATRsZLrDli9U,12298
+qlsdk/rsc/command/__init__.py,sha256=TncLrFyanIvaE106EKd2kqHJloQTZee--XaPnADL-Sc,12233
 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=_brT05Ef-gLUdEcD32D9M08AvWqBB3ontCnlSFLmZmQ,19963
+qlsdk/rsc/device/base.py,sha256=De0SjD84i0_apwPxdnnpGXaVdUGUGAy7YE1k5zNqdfs,20070
 qlsdk/rsc/device/c16_rs.py,sha256=BHQRHOnsTMAKgqSXaAS2RjPIklZQAl2CVfe6i_iX-i4,5928
-qlsdk/rsc/device/c256_rs.py,sha256=0hRS_sQaRI0AmJFFVpfewrq9zipFBRP7d1UPo60dAvo,13615
-qlsdk/rsc/device/c64_rs.py,sha256=cZIioIRGgd4Ub0ieho4_XujBNo8AQgJEjXcqgcEkyFQ,13644
+qlsdk/rsc/device/c256_rs.py,sha256=hsv2MBDFkK2rfsNTkDdG3TBAfVMAaSnTgnsi_NiQB4o,13222
+qlsdk/rsc/device/c64_rs.py,sha256=AAwYcioJ741b22fifhSHTC3C-ESbRtXTe0b8A8OvNjg,12607
 qlsdk/rsc/device/c64s1.py,sha256=L7nKmsoMCGj6GMjHYfYkKgkBtrGfP516kQHQ5I1FAUE,13986
 qlsdk/rsc/device/device_factory.py,sha256=6cPhm3pPGrVXA1s1HePFLjZqmhNI1vOAucFI0VRD_Y0,1317
 qlsdk/rsc/interface/__init__.py,sha256=xeRzIlQSB7ZSf4r5kLfH5cDQLzCyWeJAReG8Xq5nOE0,70
@@ -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.0a3.dist-info/METADATA,sha256=dGKUPBYlPSKsgpSTADHDBNfMSQrCsvqx8xpdpgi3_Ds,1882
-qlsdk2-0.6.0a3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-qlsdk2-0.6.0a3.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
-qlsdk2-0.6.0a3.dist-info/RECORD,,
+qlsdk2-0.6.0a4.dist-info/METADATA,sha256=BBbbb11OYzAxMMoXHycDv36RDWPBTSQIjSJ0Aw51wL8,1882
+qlsdk2-0.6.0a4.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+qlsdk2-0.6.0a4.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
+qlsdk2-0.6.0a4.dist-info/RECORD,,