qlsdk2 0.1.5__tar.gz → 0.1.7__tar.gz

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

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

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

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

{qlsdk2-0.1.5 → qlsdk2-0.1.7}/src/qlsdk/ar4m/__init__.py

@@ -33,15 +33,17 @@ class AR4M(object):
     def _search_ar4(self):
         try:                        
             devices = AR4SDK.enum_devices()
-            logger.debug(f"_search_ar4 devices size: {len(devices)}")
+            # logger.debug(f"_search_ar4 devices size: {len(devices)}")
             for dev in devices:
-                logger.debug(f"slot: {dev.slot}, mac: {dev.mac}-{hex(dev.mac)}, hub_name: {dev.hub_name.str}")
+                # logger.debug(f"slot: {dev.slot}, mac: {dev.mac}-{hex(dev.mac)}, hub_name: {dev.hub_name.str}")
                 if dev.mac in list(self._devices.keys()):
                     ar4 = self._devices[dev.mac]
                     ar4.update_info()
-                ar4 = AR4(hex(dev.mac), dev.slot, dev.hub_name.str)
-                if ar4.init():
-                    self._devices[dev.mac] = ar4
+                else:
+                    ar4 = AR4(hex(dev.mac), dev.slot, dev.hub_name.str.decode("utf-8"))
+                    if ar4.init():
+                        self._devices[dev.mac] = ar4
+                        logger.info(f"add device mac: {ar4.box_mac} slot: {ar4.slot} hub_name: {ar4.hub_name}")
         except Exception as e:
             logger.error(f"_search_ar4 异常: {str(e)}")
         finally:

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

@@ -108,13 +108,19 @@ class AR4SDK:
         """枚举可用设备"""
         devices = []
         ptr = _dll.ar4_sdk_enum_device()
+        if not ptr:
+            logger.info("没有找到ar4设备")
+            return devices
         
-        while ptr and ptr.contents.mac != 0:
-            devices.append(ptr.contents)
-            ptr = ptr[1]
-            if isinstance(ptr, Ar4Device):
-                logger.debug(f"enum_devices break with {ptr}")
+        index = 0
+        while True:
+            device = ptr[index]
+            if not device or device.mac == 0:
                 break
+            # logger.debug(f"get device: {device.slot}, mac: {hex(device.mac)}, hub_name: {device.hub_name.str}")
+            devices.append(device)
+            index += 1
+            
         return devices
     
     @classmethod
@@ -140,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
@@ -159,9 +165,11 @@ class AR4(object):
         self._connected = False
         self._conn_time = None
         self._last_time = None
+        
+        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] = {}
@@ -169,7 +177,14 @@ class AR4(object):
     @property
     def box_mac(self):
         return self._box_mac
+    @property
+    def slot(self):
+        return self._slot
+    @property
+    def hub_name(self):
+        return self._hub_name
     def init(self):
+        # logger.info(f"init ar4 {self.box_mac}")
         if not self._handle:
             self._connected = self.connect()
             if self._connected:
@@ -226,6 +241,8 @@ class AR4(object):
         logger.info(f"ar4 {self._box_mac} 启动数据采集...")
         """启动数据采集"""
         
+        self._acq_info["start_time"] = _get_time()
+        
         if self._handle:
             # 设置信号数据回调
             try:
@@ -234,10 +251,10 @@ class AR4(object):
                 logger.error(f"ar4 {self._box_mac} 停止采集异常: {str(e)}")
                 
             # 设置trigger数据回调
-            try:
-                _dll.ar4_sdk_register_trigger_notify(self._handle, self._trigger_callback)
-            except Exception as e:
-                logger.error(f"ar4 {self._box_mac} 停止采集异常: {str(e)}")
+            # try:
+            #     _dll.ar4_sdk_register_trigger_notify(self._handle, self._trigger_callback)
+            # except Exception as e:
+            #     logger.error(f"ar4 {self._box_mac} 停止采集异常: {str(e)}")
             # 启动采集
             try:
                 logger.debug(f"ar4 {self._box_mac} 启动采集: {self._handle}")
@@ -254,6 +271,10 @@ class AR4(object):
     def stop_acquisition(self):
         """停止采集"""
         if self._handle:
+            try:                
+                self.get_acq_start_time() 
+            except Exception as e:
+                logger.error(f"ar4 {self._box_mac} 获取开始采集时间异常: {str(e)}")
             try:
                 return _dll.ar4_sdk_stop_acq(self._handle) == 0
             except Exception as e:
@@ -276,6 +297,9 @@ class AR4(object):
     def get_acq_start_time(self):
         try:
             ret = _dll.ar4_sdk_get_acq_start_time(self._handle)
+            # 更新采样开始时间
+            if ret:
+                self._acq_info["start_time"] = ret
             logger.debug(f"ar4 {self._box_mac} 获取采样开始时间: {ret}")
         except Exception as e:
             logger.error(f"ar4 {self._box_mac} 获取采样开始时间异常: {str(e)}")
@@ -308,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 被调用")
@@ -351,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.5 → qlsdk2-0.1.7}/src/qlsdk2.egg-info/PKG-INFO

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