qlsdk2 0.4.0a1__tar.gz → 0.4.0a2__tar.gz

{qlsdk2-0.4.0a1 → qlsdk2-0.4.0a2}/PKG-INFO

@@ -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 → qlsdk2-0.4.0a2}/setup.py

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

{qlsdk2-0.4.0a1 → qlsdk2-0.4.0a2}/src/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
         

{qlsdk2-0.4.0a1 → qlsdk2-0.4.0a2}/src/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 = []  # 待广播的设备序列号列表

{qlsdk2-0.4.0a1 → qlsdk2-0.4.0a2}/src/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):

{qlsdk2-0.4.0a1 → qlsdk2-0.4.0a2}/src/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 → qlsdk2-0.4.0a2}/src/qlsdk2.egg-info/PKG-INFO

@@ -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