qlsdk2 0.4.0a1__py3-none-any.whl → 0.4.0a2__py3-none-any.whl

qlsdk/rsc/device_manager.py

@@ -1,16 +1,18 @@
 import socket
+from typing import Optional
 from loguru import logger   
 from qlsdk.rsc.discover import UdpBroadcaster
 from threading import Thread
 from qlsdk.core import *
 from qlsdk.rsc.entity import QLDevice
 from qlsdk.rsc.proxy import DeviceProxy
+import time
         
         
 class DeviceContainer(object):
-    def __init__(self, proxy_enabled=False):
+    def __init__(self, proxy_enabled=False, tcp_port = 19216):
         self._devices = {}
-        self._tcp_port = 19216
+        self._tcp_port = tcp_port
         self._proxy_enabled = proxy_enabled
         
         # 设备搜索广播器
@@ -21,6 +23,25 @@ class DeviceContainer(object):
         self._listening_thread = Thread(target=self._listening)
         self._listening_thread.daemon = True
         self._listening_thread.start()
+        
+    @property
+    def devices(self)-> QLDevice:
+        return self._devices
+    
+    '''
+        等待设备连接
+    '''
+    def connect(self, device_id: str, timeout:int=30) -> Optional[QLDevice]:        
+        logger.info(f"Searching for device: {device_id}")
+        self.add_search(device_id)
+        for _ in range(timeout):
+            device = self.get_device(device_id)
+            if device:
+                logger.success(f"Device {device_id} connected")
+                return device
+            time.sleep(1)
+        logger.error(f"Device {device_id} not found")
+        return None
             
     def _listening(self):
         tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -84,7 +105,7 @@ class DeviceContainer(object):
         logger.debug(f"add_device {device.device_name} then has broadcaster {self._broadcaster}")
         
     def get_device(self, device_id=None)->QLDevice:
-        logger.debug(f"已连接设备数量:{len(self._devices)}")
+        logger.trace(f"已连接设备数量:{len(self._devices)}")
         if len(self._devices) == 0:
             return None
         

qlsdk/rsc/discover.py

@@ -6,6 +6,7 @@ from loguru import logger
 from qlsdk.core.message import UDPMessage
 
 class UdpBroadcaster:
+    # 广播端口需要和ar4sdk做区分， 使用54366时不能和x8同时使用
     def __init__(self, port=54366):
         self.broadcast_port = port
         self.devices_to_broadcast = []  # 待广播的设备序列号列表

qlsdk/rsc/entity.py

@@ -128,7 +128,6 @@ class QLDevice(BaseDevice):
     @property
     def signal_consumers(self):
         return self.__signal_consumer
-        return self.__signal_consumer
     
     @property
     def impedance_consumers(self):

qlsdk/rsc/paradigm.py

@@ -186,16 +186,18 @@ class PulseStimulation(StimulationChannel):
         channel_id: int,  通道编号，从0开始
         current: float,  电流值，单位为mA
         duration: float,  刺激时间，单位为秒
+        frequency: float,  频率，单位为Hz
+        pulse_width: int,  脉冲宽度，单位为ms
+        pulse_width_ratio: float,  脉冲宽度比，范围(0, 1)
         ramp_up: float,  上升时间，单位为秒
         ramp_down: float,  下降时间，单位为秒
-        frequency: float,  频率，单位为Hz
-        phase_position: int,  相位位置，单位为度
+        delay_time: float,  延迟启动时间，单位为秒（暂未启用）
     '''
     def __init__(self, channel_id: int, current: float, duration: float, frequency: float,  pulse_width: int, 
                  pulse_width_ratio: float = 1, ramp_up: float = 0, ramp_down: float = 0, delay_time = 0):
         super().__init__(channel_id, WaveForm.PULSE.value, current, duration, ramp_up, ramp_down)
         self.frequency = frequency
-        self.duration_delay = delay_time
+        self.delay_time = delay_time
         self.pulse_width = pulse_width 
         self.pulse_width_ratio = pulse_width_ratio
         self.pulse_interval = 0

{qlsdk2-0.4.0a1.dist-info → qlsdk2-0.4.0a2.dist-info}/METADATA

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

{qlsdk2-0.4.0a1.dist-info → qlsdk2-0.4.0a2.dist-info}/RECORD

@@ -19,11 +19,11 @@ qlsdk/persist/__init__.py,sha256=OR8mnPTsktxw67G-z0VsPWJXInkKircMTHQdibmmz3M,63
 qlsdk/persist/edf.py,sha256=usgFjZJVcfAUwSy6cJtRdgjdqMgOS4viLCDGcwAGMZE,7106
 qlsdk/persist/rsc_edf.py,sha256=DM871w2-2vXNSEIzNnMLzW_ftCZSM8NhPSmu56h5jz4,8692
 qlsdk/rsc/__init__.py,sha256=bR678DilIIK7tFP65tscPUI7Bp4VN0ndVQWt6bnQKGg,197
-qlsdk/rsc/device_manager.py,sha256=ZUuhwamKky_Z9jI9_ww5S8ZcGZpSTkjWwP1kRZEOK2U,3597
-qlsdk/rsc/discover.py,sha256=cFDOADWD6Y0oE4x37f8j14a18Udwi6F0uSTbiC_1N1E,3039
+qlsdk/rsc/device_manager.py,sha256=KeCJX97OCjTNa5J2S-1swxaRXf1DcznH9F5e4pVvNuo,4289
+qlsdk/rsc/discover.py,sha256=ONXN6YWY-OMU0sBoLqqKUyb-8drtAp1g_MvnpzaFvHQ,3124
 qlsdk/rsc/eegion.py,sha256=lxrktO-3Z_MYdFIwc4NxvgLM5AL5kU3UItjH6tsKmHY,11670
-qlsdk/rsc/entity.py,sha256=qmLvJ6gCR9r7y60m91L20FJYOaAHwH6k6aXecqHurjU,21062
-qlsdk/rsc/paradigm.py,sha256=Iy_eU_yZLHiUZlLNPvqke5GDVJFnMEQ_PQ6cRxTm2BM,12606
+qlsdk/rsc/entity.py,sha256=WN05GviA_FjLkQUM5W9t2UVnDcHNR06dqMUzKxyXFuU,21023
+qlsdk/rsc/paradigm.py,sha256=zK_YFI4320lRa7GBXJfIQklhzJQSP823TeaXcMJngj4,12746
 qlsdk/rsc/proxy.py,sha256=9CPdGNGWremwBUh4GvlXAykYB-x_BEPPLqsNvwuwIDE,2736
 qlsdk/rsc/command/__init__.py,sha256=D5pBE2leqFG-IPU2pDAGuLsqHmc0wRPrBOXR0-K8d6k,8117
 qlsdk/rsc/command/message.py,sha256=bcuUDJj0CMekcZMNhKrzIpkHtDC-QBCs3dJG6Bx_PHc,8723
@@ -34,7 +34,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=XlQn3Af_HA7bGrxhv3RZKWMob_SnmissXiso7OH1UgI,4750
 qlsdk/x8m/__init__.py,sha256=cLeUqEEj65qXw4Qa4REyxoLh6T24anSqPaKe9_lR340,634
-qlsdk2-0.4.0a1.dist-info/METADATA,sha256=-yHCdrfe8EJRciRLY0Pl2bjjrFYtPkHuOyiYLPb6ey8,7066
-qlsdk2-0.4.0a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-qlsdk2-0.4.0a1.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
-qlsdk2-0.4.0a1.dist-info/RECORD,,
+qlsdk2-0.4.0a2.dist-info/METADATA,sha256=B3h3rXNFoF04Meat9Cq1aokL0QghKnyWF7-0xR5ykyY,7066
+qlsdk2-0.4.0a2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+qlsdk2-0.4.0a2.dist-info/top_level.txt,sha256=2CHzn0SY-NIBVyBl07Suh-Eo8oBAQfyNPtqQ_aDatBg,6
+qlsdk2-0.4.0a2.dist-info/RECORD,,