qlsdk2 0.6.0a10__py3-none-any.whl → 0.6.0a11__py3-none-any.whl

qlsdk/rsc/device/arskindling.py

@@ -1,4 +1,5 @@
 from multiprocessing import Queue
+from typing import Literal
 from loguru import logger
 from qlsdk.persist import ARSKindlingEDFHandler
 from qlsdk.rsc.interface import IDevice
@@ -180,6 +181,20 @@ class ARSKindling(QLBaseDevice):
             
         return list(set(arr))    
     
+    def _produce_impedance(self, body: bytes):
+        # 分发阻抗数据包给订阅者
+        if len(self._impedance_consumer) > 0:
+            packet = ImpedancePacket.transfer(body)
+            real_data = self.__impedance_transfer(packet)
+            for topic, q in self._impedance_consumer.items():
+                try:
+                    # 队列满了就丢弃最早的数据
+                    if q.full(): 
+                        q.get()
+                    q.put(real_data, timeout=1)
+                except Exception as e:
+                    logger.error(f"impedance data put to queue exception: {str(e)}")
+                    
     def _produce_signal(self, body: bytes):        
         
         # 处理信号数据
@@ -218,7 +233,24 @@ class ARSKindling(QLBaseDevice):
                 if q.full(): 
                     q.get()
                     
-                q.put(real_data)        
+                q.put(real_data)      
+     
+    # 信号数据转换
+    def __impedance_transfer(self, packet: ImpedancePacket):
+        channels = {}
+        impedance = {}
+        #按分区拆分数据格式
+        for k in self._channel_spilt.keys():      
+            logger.trace(f'分区{k}的阻抗数据')   
+            c, d, p = self.__packet_filter(packet, self._channel_spilt[k], type='impedance')
+            if c is not None:
+                channels[k] = c
+                impedance[k] = d
+        packet.channels = channels
+        packet.impedance = impedance
+            
+        return packet
+      
     # 信号数据转换
     def __signal_transfer(self, packet: RscPacket):
         channels = {}
@@ -241,11 +273,11 @@ class ARSKindling(QLBaseDevice):
             
         return packet
     
-    def __packet_filter(self, packet: RscPacket, channel_filter=None):
+    def __packet_filter(self, packet, channel_filter=None, type:Literal['signal','impedance']='signal'):
         # 参数检查
         if packet is None or channel_filter is None:
             logger.warning("空数据，忽略")
-            return None
+            return None, None, None
         
         channel_pos = get_sorted_indices_basic(packet.channels, channel_filter)
         
@@ -257,6 +289,13 @@ class ARSKindling(QLBaseDevice):
         
         # 保留本分区的通道和数据
         channels = [packet.channels[p] for p in channel_pos]
+        
+        #阻抗数据
+        if type == 'impedance':
+            impedance = [packet.impedance[p] for p in channel_pos]
+            return [self._channel_mapping.get(channel_id, []) for channel_id in channels], impedance, None
+        
+        # 信号数据
         eeg = [packet.eeg[p] for p in channel_pos]
         eeg_p = None
         if packet.eeg_p is not None:

qlsdk/rsc/device/base.py

@@ -137,6 +137,9 @@ class QLBaseDevice(IDevice):
         if len(self._impedance_consumer) > 0:
             for topic, q in self._impedance_consumer.items():
                 try:
+                    # 队列满了就丢弃最早的数据
+                    if q.full(): 
+                        q.get()
                     q.put(packet, timeout=1)
                 except Exception as e:
                     logger.error(f"impedance data put to queue exception: {str(e)}")

{qlsdk2-0.6.0a10.dist-info → qlsdk2-0.6.0a11.dist-info}/METADATA

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

{qlsdk2-0.6.0a10.dist-info → qlsdk2-0.6.0a11.dist-info}/RECORD

@@ -42,8 +42,8 @@ qlsdk/rsc/proxy.py,sha256=9CPdGNGWremwBUh4GvlXAykYB-x_BEPPLqsNvwuwIDE,2736
 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=C67dDTFmytTI2tAAaWxwdXfQ-S1IHS2lIOH0B4UQLQA,9854
-qlsdk/rsc/device/base.py,sha256=GZx09zp-T61VwRIH6zEj3LMh-YNupxu5O8tMEBHRzOQ,21533
+qlsdk/rsc/device/arskindling.py,sha256=IVYgCdePI1rnalhZmTWp95eyS05L_xbSo6EhvBTuIvA,11465
+qlsdk/rsc/device/base.py,sha256=isdu4NKQpixWtnsh0t4U7Uecw9QQITmaGyZpKO04aL0,21661
 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
@@ -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.0a10.dist-info/METADATA,sha256=qhpDHdNop673s66JoRwTli4Gyaago7OzeNzVQT4CZ1I,1883
-qlsdk2-0.6.0a10.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-qlsdk2-0.6.0a10.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
-qlsdk2-0.6.0a10.dist-info/RECORD,,
+qlsdk2-0.6.0a11.dist-info/METADATA,sha256=0LHCnkOCM5qaDZAoLglt-mIBltLnZBiaRrta8L9JbHE,1883
+qlsdk2-0.6.0a11.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+qlsdk2-0.6.0a11.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
+qlsdk2-0.6.0a11.dist-info/RECORD,,