qlsdk2 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

qlsdk/ar4m/__init__.py

@@ -1,6 +1,5 @@
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)
 
-from .ar4m import AR4M
 from .ar4sdk import AR4SDK, AR4, Packet, AR4Packet
 
 
@@ -34,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:

qlsdk/ar4m/ar4sdk.py

@@ -11,7 +11,8 @@ from time import sleep, time
 import os 
 
 real_path = os.path.realpath(__file__)
-dll_path = f'{real_path}/libs/libAr4SDK.dll'
+dll_path = f'{os.path.dirname(real_path)}/libs/libAr4SDK.dll'
+
 # 加载 DLL
 if platform.system() == 'Windows':
     _dll = ctypes.CDLL(dll_path)
@@ -107,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
@@ -158,6 +165,8 @@ 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)
@@ -168,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:
@@ -225,6 +241,8 @@ class AR4(object):
         logger.info(f"ar4 {self._box_mac} 启动数据采集...")
         """启动数据采集"""
         
+        self._acq_info["start_time"] = _get_time()
+        
         if self._handle:
             # 设置信号数据回调
             try:
@@ -233,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}")
@@ -253,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:
@@ -275,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)}")

{qlsdk2-0.1.4.dist-info → qlsdk2-0.1.6.dist-info}/METADATA

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

qlsdk2-0.1.6.dist-info/RECORD

@@ -0,0 +1,9 @@
+qlsdk/__init__.py,sha256=pHMMwFiz7AGYlWvxo-81Obd7gIkojhLAEUGe0yuiAJI,372
+qlsdk/ar4m/__init__.py,sha256=HCFv58t9vYoH2nNN9EiswwdRngiDmh_7h-uwhW-id1I,1784
+qlsdk/ar4m/ar4sdk.py,sha256=bIgjVm5NA3dLYcfNJ9t2oJm-R_yBxrT3a2SDlntr7zA,14838
+qlsdk/ar4m/libs/libAr4SDK.dll,sha256=kZp9_DRwPdAJ5OgTFQSqS8tEETxUs7YmmETuBP2g60U,15402132
+qlsdk/ar4m/libs/libwinpthread-1.dll,sha256=W77ySaDQDi0yxpnQu-ifcU6-uHKzmQpcvsyx2J9j5eg,52224
+qlsdk2-0.1.6.dist-info/METADATA,sha256=DKHe7l7vZIYUHzglcBzEDae7oM14GoULBVcRvpGT3WA,7001
+qlsdk2-0.1.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+qlsdk2-0.1.6.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
+qlsdk2-0.1.6.dist-info/RECORD,,

qlsdk/ar4m/ar4m.py

@@ -1,44 +0,0 @@
-from ar4sdk import AR4SDK, AR4
-from time import sleep, time
-from threading import Lock, Timer
-from loguru import logger
-
-class AR4M(object):
-    def __init__(self):
-        self._lock = Lock()
-        self._search_timer = None 
-        self._search_running = False
-        self._devices: dict[str, AR4] = {}
-    
-    @property
-    def devices(self):
-        return self._devices
-    def search(self):
-        if not self._search_running:
-            self._search_running = True
-            self._search()
-        
-    def _search(self):
-        if self._search_running:
-
-            self._search_timer = Timer(2, self._search_ar4)
-            self._search_timer.daemon = True
-            self._search_timer.start()
-        
-        
-    def _search_ar4(self):
-        try:                        
-            devices = AR4SDK.enum_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}")
-                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
-        except Exception as e:
-            logger.error(f"_search_ar4 异常: {str(e)}")
-        finally:
-            self._search()

qlsdk/ar4m/example.py

@@ -1,51 +0,0 @@
-from time import sleep
-from loguru import logger
-import os
-from threading import Thread
-    
-from ar4m import AR4M
-
-#------------------------------------------------------------------
-# 日志文件配置
-#------------------------------------------------------------------
-LOG_DIR = os.path.expanduser("./logs")
-LOG_FILE = os.path.join(LOG_DIR, "app_{time}.log")
-if not os.path.exists(LOG_DIR):
-    os.mkdir(LOG_DIR)
-
-logger.add(LOG_FILE, rotation = "50MB")     
-
-def consumer(q):
-    t = Thread(target=deal_data, args=(q,))
-    t.daemon = True
-    t.start()
-        
-def deal_data(q):
-    while True:
-        data = q.get()
-        if data is None:
-            break
-        logger.info(data)
-
-# 主函数
-if __name__ == "__main__":
-    try:
-        ar4m = AR4M()
-        ar4m.search()
-        sleep(6)
-        for dev in list( ar4m.devices.values()):
-            ret = dev.start_acquisition()
-            topic, queue = dev.subscribe()
-            logger.info(f"启动{dev.box_mac}的数据采集{'成功' if ret else '失败'}")
-            
-        sleep(60)
-        
-        for dev in list( ar4m.devices.values()):
-            ret = dev.stop_acquisition()
-            dev.get_acq_start_time() 
-            logger.info(f"关闭{dev.box_mac}的数据采集{'成功' if ret else '失败'}")
-        sleep(1)
-    except Exception as e:
-        logger.error(f"程序运行异常: {str(e)}")
-    finally:        
-        logger.info("程序结束。")

qlsdk2-0.1.4.dist-info/RECORD

@@ -1,11 +0,0 @@
-qlsdk/__init__.py,sha256=pHMMwFiz7AGYlWvxo-81Obd7gIkojhLAEUGe0yuiAJI,372
-qlsdk/ar4m/__init__.py,sha256=cKGc8qW2e8JDnaDbxxS7GQhtOQF2PlekNf4WA2LmWXY,1640
-qlsdk/ar4m/ar4m.py,sha256=AOYvvo04dD0W4EMrKDCx63pUzwL1f_CVcM_N4rebhQc,1524
-qlsdk/ar4m/ar4sdk.py,sha256=A0-YRC_TAjw7b15mNa9UFwtsp8xMIxCv9WQKgGtb6ZY,14017
-qlsdk/ar4m/example.py,sha256=cm0HeRb53roKw5HYZ4uqnDZ6suaSUdqOW_hCTcGY8lo,1501
-qlsdk/ar4m/libs/libAr4SDK.dll,sha256=kZp9_DRwPdAJ5OgTFQSqS8tEETxUs7YmmETuBP2g60U,15402132
-qlsdk/ar4m/libs/libwinpthread-1.dll,sha256=W77ySaDQDi0yxpnQu-ifcU6-uHKzmQpcvsyx2J9j5eg,52224
-qlsdk2-0.1.4.dist-info/METADATA,sha256=U7-5HjSjE57ptTxzDNQdC_IF-4ZztkP9s_jfvv2D6uQ,7001
-qlsdk2-0.1.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-qlsdk2-0.1.4.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
-qlsdk2-0.1.4.dist-info/RECORD,,