qlsdk2 0.1.6__tar.gz → 0.1.7__tar.gz

{qlsdk2-0.1.6 → qlsdk2-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: qlsdk2
-Version: 0.1.6
+Version: 0.1.7
 Summary: SDK for quanlan device
 Home-page: https://github.com/hehuajun/qlsdk
 Author: hehuajun

{qlsdk2-0.1.6 → qlsdk2-0.1.7}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="qlsdk2",
-    version="0.1.6",
+    version="0.1.7",
     author="hehuajun",
     author_email="hehuajun@eegion.com",
     description="SDK for quanlan device",

{qlsdk2-0.1.6 → qlsdk2-0.1.7}/src/qlsdk/ar4m/ar4sdk.py

@@ -146,7 +146,7 @@ def _get_time():
     
 # ar4设备对象
 class AR4(object):
-    def __init__(self, box_mac, slot, hub_name):
+    def __init__(self, box_mac:str, slot:int, hub_name:str):
         self._handle = None
         self._box_type = None
         self._box_mac = box_mac
@@ -169,7 +169,7 @@ class AR4(object):
         self._acq_info = {}
         # 回调函数
         self._data_callback = FuncAr4DataNotify(self._wrap_data_accept())        
-        self._trigger_callback = FuncAr4TriggerNotify(self._trigger_accept)
+        self._trigger_callback = FuncAr4TriggerNotify(self._wrap_trigger_accept())
         
         # 消息订阅
         self._consumers: dict[str, Queue] = {}
@@ -332,6 +332,14 @@ class AR4(object):
             for consumer in self._consumers.values():
                 consumer.put(packet)
             # logger.debug(f"EEG数据: {packet}")
+    
+    def _wrap_trigger_accept(self):
+        
+        @FuncAr4DataNotify
+        def trigger_accept(handle, time_ms, trigger_type, trigger_value):
+            self._trigger_accept(time_ms, trigger_type, trigger_value)
+            
+        return trigger_accept
         
     def _trigger_accept(self, time_ms, trigger_type, trigger_value):
         logger.info(f"_trigger_accept 被调用")
@@ -375,9 +383,12 @@ class AR4Packet(Packet):
         self.acc_count = data.acc_count
         # 读eeg数据
         if self.eeg_ch_count and self.eeg_count:
-            self.eeg = [[] for _ in range(self.eeg_ch_count)]
-            for i in range(self.eeg_ch_count):
-                self.eeg[i] = [data.eeg[j + (i * self.eeg_count)] for j in range(self.eeg_count)]
+            # self.eeg = [[] for _ in range(self.eeg_ch_count)]
+            # for i in range(self.eeg_ch_count):
+                # self.eeg[i] = [data.eeg[j + (i * self.eeg_count)] for j in range(self.eeg_count)]
+            # tmp = data.eeg[:self.eeg_ch_count * self.eeg_count]
+            # logger.info(tmp)
+            self.eeg = [data.eeg[i:self.eeg_count*self.eeg_ch_count:self.eeg_ch_count] for i in range(self.eeg_ch_count)]
         # 读acc数据
         if self.acc_ch_count and self.acc_count:
             self.acc = [[] for _ in range(self.acc_ch_count)]

{qlsdk2-0.1.6 → qlsdk2-0.1.7}/src/qlsdk2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: qlsdk2
-Version: 0.1.6
+Version: 0.1.7
 Summary: SDK for quanlan device
 Home-page: https://github.com/hehuajun/qlsdk
 Author: hehuajun