qlsdk2 0.1.2__tar.gz → 0.1.4__tar.gz

{qlsdk2-0.1.2 → qlsdk2-0.1.4}/PKG-INFO

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

{qlsdk2-0.1.2 → qlsdk2-0.1.4}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="qlsdk2",
-    version="0.1.2",
+    version="0.1.4",
     author="hehuajun",
     author_email="hehuajun@eegion.com",
     description="SDK for quanlan device",
@@ -24,7 +24,8 @@ setuptools.setup(
     install_requires=open("requirements.txt").read().splitlines(),
     include_package_data=True,
     package_data={
-        "src/qlsdk/ar4m/libs": ["lib/*.dll"],
+        "src/qlsdk/ar4m/": ["libs/*.dll"],
+        "qlsdk/ar4m": ["libs/*.dll"],
         "":["*.txt", "*.md"]
     },
     # entry_points={

qlsdk2-0.1.2/src/qlsdk/ar4m/ar4m.py → qlsdk2-0.1.4/src/qlsdk/ar4m/__init__.py

@@ -1,4 +1,9 @@
-from ar4sdk import AR4SDK, AR4
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+
+from .ar4m import AR4M
+from .ar4sdk import AR4SDK, AR4, Packet, AR4Packet
+
+
 from time import sleep, time
 from threading import Lock, Timer
 from loguru import logger

{qlsdk2-0.1.2 → qlsdk2-0.1.4}/src/qlsdk/ar4m/ar4sdk.py

@@ -8,10 +8,13 @@ from ctypes import (
 )
 from loguru import logger
 from time import sleep, time
+import os 
 
+real_path = os.path.realpath(__file__)
+dll_path = f'{real_path}/libs/libAr4SDK.dll'
 # 加载 DLL
 if platform.system() == 'Windows':
-    _dll = ctypes.CDLL('./libs/libAr4SDK.dll')
+    _dll = ctypes.CDLL(dll_path)
 else:
     raise NotImplementedError(f"不支持非Windows平台：{platform.system()}")
 

{qlsdk2-0.1.2 → qlsdk2-0.1.4}/src/qlsdk2.egg-info/PKG-INFO

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

{qlsdk2-0.1.2 → qlsdk2-0.1.4}/src/qlsdk2.egg-info/SOURCES.txt

@@ -8,7 +8,7 @@ src/qlsdk2.egg-info/dependency_links.txt
 src/qlsdk2.egg-info/requires.txt
 src/qlsdk2.egg-info/top_level.txt
 src/qlsdk/ar4m/__init__.py
-src/qlsdk/ar4m/ar4m.py
 src/qlsdk/ar4m/ar4sdk.py
-src/qlsdk/ar4m/example.py
+src/qlsdk/ar4m/libs/libAr4SDK.dll
+src/qlsdk/ar4m/libs/libwinpthread-1.dll
 test/test_ar4m.py

qlsdk2-0.1.2/src/qlsdk/ar4m/__init__.py

@@ -1,4 +0,0 @@
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)
-
-from .ar4m import AR4M
-from .ar4sdk import AR4SDK, AR4, Packet, AR4Packet

qlsdk2-0.1.2/src/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("程序结束。")