nsqdriver 0.12.11__cp39-cp39-macosx_10_9_universal2.whl → 0.12.13__cp39-cp39-macosx_10_9_universal2.whl

nsqdriver/NS_MCI.py

@@ -9,8 +9,10 @@ import xmlrpc.client
 from xmlrpc.client import Transport
 from multiprocessing import shared_memory
 from functools import wraps
+from enum import Enum
 
 import numpy as np
+
 try:
     import waveforms
     HAS_WAVEFORMS = True
@@ -78,6 +80,12 @@ def solve_rpc_exception(func):
     return wrapper
 
 
+class DataMode(str, Enum):
+    DIRECT = 'direct'
+    NORMAL = 'normal'
+    RDMA = 'rdma'
+
+
 class Driver(BaseDriver):
     CHs = list(range(1, 25))
     segment = ('ns', '111|112|113|114|115')
@@ -153,6 +161,7 @@ class Driver(BaseDriver):
         self.handle = None
         self.model = 'NS_MCI'  # 默认为设备名字
         self.srate = 6e9
+        self.data_mode = DataMode.NORMAL
         self.device_online = True
         self.has_start_capture = False
         self.backend_version = (0, 0, 0)
@@ -203,7 +212,9 @@ class Driver(BaseDriver):
         values.update(system_parameter)
         for name, value in values.items():
             if value is not None:
-                self.fast_rpc.rpc_set(name, value, 0, False)
+                res = self.fast_rpc.rpc_set(name, value, 0, False)
+                if isinstance(res, str):
+                    print("*********后台提示*********\n", res)
         print_debug('Driver: 后端参数配置成功')
 
         # 系统开启前必须进行过一次初始化
@@ -285,20 +296,25 @@ class Driver(BaseDriver):
             return
         print_debug(f'Driver: get操作被调用{name}')
         self.has_start_capture = False
+        if name in {'Trace', 'TraceIQ'} and self.backend_version >= (2, 8, 0):
+            data_mode = self.get('DataMode', channel)
+            data_mode = DataMode(data_mode) if data_mode else DataMode.NORMAL
+            if data_mode == DataMode.DIRECT:
+                return self._get_trace_data(channel)
 
         func = self.fast_rpc.rpc_get
         tmp = func(name, channel, value)
         tmp = RPCValueParser.load(tmp)
         return tmp
 
-    def update_firmware(self, file_path, target='all'):
+    def update_firmware(self, file_path, target='all', _id=0):
         if not self.device_online:
             return
         import os
         if not os.path.exists(file_path):
             raise ValueError(f'文件路径: {file_path} 不存在')
         with open(file_path, 'rb') as fp:
-            result = self.handle.update_rfs_firmware(fp.read(), target)
+            result = self.handle.update_rfs_firmware(fp.read(), target, _id)
         if result:
             print(f'设备{self.addr} 固件更新成功，3s后设备自动重启')
         else:
@@ -331,6 +347,15 @@ class Driver(BaseDriver):
             print(f'设备{self.addr}-指令{button_name}执行失败')
         return flag
 
+    def _get_trace_data(self, channel):
+        res = self.get('ShmPath', channel)
+        if not res:
+            return
+        _path, chnl, chnl_num, shots, points = res
+        shm = shared_memory.SharedMemory(name=_path, create=False)
+        data = np.frombuffer(shm.buf, dtype=np.int16).reshape((chnl_num, shots, points))
+        return data[chnl], data
+
     def _connect(self, addr=None, port=5001, timeout=None):
         """
         获取到指定ip的tcp连接
@@ -527,12 +552,10 @@ class RPCValueParser:
             value = [RPCValueParser.load(_v) for _v in value]
         return value
 
-
 class InfoSharedList:
     memory_name = 'NS_DEVICE_MEMORY'
     memory_size = 1024 ** 2
     head_size = 32  # memory中前head_size的长度为头部预留信息
-
     def __init__(self):
         try:
             self._memory = shared_memory.SharedMemory(name=self.memory_name, create=True, size=self.memory_size)

nsqdriver/__init__.py

@@ -1,10 +1,10 @@
 from .NS_MCI import Driver as MCIDriver
 from .NS_QSYNC import Driver as QSYNCDriver
 from .NS_CST import Driver as CSTDriver
-from .compiler.ns_wave import InsChannel
-from .compiler.py_wave_asm import nsw_config, AssemblyError
+# from .compiler.ns_wave import InsChannel
+# from .compiler.py_wave_asm import nsw_config, AssemblyError
 
-version_pack = (0, 12, 11)
+version_pack = (0, 12, 13)
 
 __version__ = '.'.join(str(_) for _ in version_pack)
 __all__ = ['MCIDriver', 'QSYNCDriver', 'CSTDriver', 'InsChannel']

{nsqdriver-0.12.11.dist-info → nsqdriver-0.12.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: nsqdriver
-Version: 0.12.11
+Version: 0.12.13
 Summary: Q series measurement and control equipment driver interface
 Home-page: https://g2hoyqcmh4.feishu.cn/wiki/Jgt1wxlKniveYQkqCgbcJHsMnoe
 Classifier: Intended Audience :: Developers
@@ -19,6 +19,14 @@ Requires-Dist: numpy>=1.18
 Requires-Dist: astor>=0.8.1
 Provides-Extra: waveforms
 Requires-Dist: waveforms; extra == "waveforms"
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ```
   _   _   ____     ___    ____           _                       

nsqdriver-0.12.13.dist-info/RECORD

@@ -0,0 +1,41 @@
+nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
+nsqdriver/NS_DDS_v3.py,sha256=VoTHf9fEknw0gU35c-trraf_7fqasKyyRZxGMsmExfU,23780
+nsqdriver/NS_DDS_v4.py,sha256=vKmbJ9txOrWzUqK2Vxc--0GmLU44RFyPkLJHlHcJYjA,34442
+nsqdriver/NS_MCI.py,sha256=Z2iCSEsnuodqtcWvCey7i0-l6vgn6dKeHzDzjmZ7858,22038
+nsqdriver/NS_QSYNC.py,sha256=ZSOznM5PMlOm89rWAMiqVyZLWn3y0lTQp3d1z6LnkV0,27121
+nsqdriver/__init__.py,sha256=tzuI1afQnf9jTuqTiBcxOABhbd_FdgTDKef4_UtorXA,377
+nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
+nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver/compiler/assembler.cpython-39-darwin.so,sha256=1rktWWE25x88MsdsYdcXiO3MUUO2yoRwuueWXx4K5N0,1086480
+nsqdriver/compiler/ns_wave.cpython-39-darwin.so,sha256=AnWSFKrcXg6CqNvPU8osaembXixkQSb0N9NHSYupaek,640864
+nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
+nsqdriver/compiler/py_wave_asm.cpython-39-darwin.so,sha256=4rwwd85aW2S6sVpKJ6nLxY_7Kp71tAwQQ_wiNUz1OIk,838312
+nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
+nsqdriver/nswave/__init__.py,sha256=1-DljzsjzvnHRnD0tlpVTWSZjHtlCnP-yRirOJuG8Co,293
+nsqdriver/nswave/_asm.pyi,sha256=kayOim0cSLXwSCAAXkMu0-IsLusY95dTFORTNrHzFo8,2749
+nsqdriver/nswave/_checkers.cpython-39-darwin.so,sha256=zFLl_bgPBXgh0_YljhRm3DAV5Vo-z0XGi3E00zo3SA4,596656
+nsqdriver/nswave/_checkers.pyi,sha256=h_lMi6vWZ4SYe_5GDyOuYNbzL1nVDGvy4E-nAb9tzsk,1412
+nsqdriver/nswave/_errors.cpython-39-darwin.so,sha256=1zPdZkn543MAILiOHB4ACiJGTJu-6l46D-_3qih7wLY,239120
+nsqdriver/nswave/_errors.pyi,sha256=pYt3VZxWgXWVNGvbQ3g6IwxItCmPcW_EfN3l1YfLk2o,640
+nsqdriver/nswave/_functions.cpython-39-darwin.so,sha256=VAHG3E7w0LlEQpNk2M83wNlQlbYMAXL6uN7vVYqcTsU,620792
+nsqdriver/nswave/_functions.pyi,sha256=lHSxiqHwZVvdjs-53KiFlTGAGCHsvOU3DKDGRVM7ur8,1958
+nsqdriver/nswave/_ir.cpython-39-darwin.so,sha256=IZOQzxZZhzacn0rdFQVJpGJU3PmcKHDxQ3bjp-rcbIA,1180544
+nsqdriver/nswave/_ir.pyi,sha256=tC4iVf0dUOevZhwbCm77pDk87PbaIbhpNGHFamNdx5k,7130
+nsqdriver/nswave/_ir_pass.cpython-39-darwin.so,sha256=WX6Hx-VyP9aO06ztLk3XvU5kfzkSZG8bam4dlJgfhhc,183856
+nsqdriver/nswave/_ir_pass.pyi,sha256=wYOesXdZnTlZ0Ph06VVP65uc6n-k8gywEkHaaSSyPmQ,282
+nsqdriver/nswave/_optimizations.cpython-39-darwin.so,sha256=GmQWnEn1QHzBoHRbKoo8o2q9H_5KmiqRhrW_Fa5jUrE,217704
+nsqdriver/nswave/_optimizations.pyi,sha256=y6ytCU8SSlD4mzXe-V2GjFrvpafumK388pgxHuxDBnI,492
+nsqdriver/nswave/_rules.cpython-39-darwin.so,sha256=xzbfxUKuNjTNWvYbMj7PrhljWlB1GlK3qw3gZNIiNeQ,564400
+nsqdriver/nswave/_rules.pyi,sha256=AxXSBY0xM3PMrZqIvqSDJB53eScU_XatNWiul57ZytU,1870
+nsqdriver/nswave/_simulator.cpython-39-darwin.so,sha256=hMCa43ixqX0W-mNJAIyCsgK95j3gbKQ3tA3q0UTUnCQ,398712
+nsqdriver/nswave/_translate.cpython-39-darwin.so,sha256=GpQya4Xy9172KHpi7nNbb98ECUKYMNkhIgY10Zf7GEk,362456
+nsqdriver/nswave/_translate.pyi,sha256=JAFEJpAw5k2yx3uKNcKPCNV--fxTneDbfm4xA8fW_kw,375
+nsqdriver/nswave/kernel.cpython-39-darwin.so,sha256=WOHRaZGO7ZOpn--bN9R7WJKz3huCqyvsL4zXG3AacY0,841504
+nsqdriver/nswave/kernel.pyi,sha256=Fs-_v2XT0UpRSSoogwIbejXna6uAfceYv41PyL2m-NM,1952
+nsqdriver/wrapper/AWG_ADC.py,sha256=ktQkORc8VZUFkNg6huC7DKIkvZyHYXRolQ2SAA89JnM,19199
+nsqdriver/wrapper/ND_NSMCI.py,sha256=gTyrDObhbggl35V_q-kpDoPsfttIEnDFc6f0-pk_P0k,6288
+nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver-0.12.13.dist-info/METADATA,sha256=UAt8LyjPuVQezaJtTv4Pd3kCVcp7nVWk92suJrUI9P0,4459
+nsqdriver-0.12.13.dist-info/WHEEL,sha256=sh_SJ9E_BMvgwuaopLsbPPZ42GXp2C01bIkvWUkhjjg,112
+nsqdriver-0.12.13.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
+nsqdriver-0.12.13.dist-info/RECORD,,

{nsqdriver-0.12.11.dist-info → nsqdriver-0.12.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.4.0)
+Generator: setuptools (78.0.2)
 Root-Is-Purelib: false
 Tag: cp39-cp39-macosx_10_9_universal2
 

nsqdriver-0.12.11.dist-info/RECORD

@@ -1,39 +0,0 @@
-nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
-nsqdriver/NS_DDS_v3.py,sha256=eKUdmDXhaXjZk7yvdOsbvipUjWIQ3cohVTtC1jJdyDI,15437
-nsqdriver/NS_MCI.py,sha256=zbAA70_g_02mF76LqcIzVeqRRNrVscTL60iHpFsgmZ4,21088
-nsqdriver/NS_QSYNC.py,sha256=ZSOznM5PMlOm89rWAMiqVyZLWn3y0lTQp3d1z6LnkV0,27121
-nsqdriver/__init__.py,sha256=19HDjGlgkd2RElhpltVzn7E2dFvRNesFLPVINv4UP2Q,373
-nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
-nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver/compiler/assembler.cpython-39-darwin.so,sha256=72HD5lQN2ue2M_ciykJKOE1Oe8cXeah_nZ6yh_e-bCY,1017008
-nsqdriver/compiler/ns_wave.cpython-39-darwin.so,sha256=gbskG3Fws8z-ykxzlRGSFManGjNFSnr4l7uQ7HwrN2A,640864
-nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
-nsqdriver/compiler/py_wave_asm.cpython-39-darwin.so,sha256=5HIqeCLfwN95Vl8p8D70A0yPIxwNo5Jpwr0JrXq89BQ,838312
-nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
-nsqdriver/nswave/__init__.py,sha256=1-DljzsjzvnHRnD0tlpVTWSZjHtlCnP-yRirOJuG8Co,293
-nsqdriver/nswave/_asm.pyi,sha256=kayOim0cSLXwSCAAXkMu0-IsLusY95dTFORTNrHzFo8,2749
-nsqdriver/nswave/_checkers.cpython-39-darwin.so,sha256=3cYHs8p0wSh0ekn0Abcr5teEZhQq6Xm25hXnZP6p9co,472912
-nsqdriver/nswave/_checkers.pyi,sha256=h_lMi6vWZ4SYe_5GDyOuYNbzL1nVDGvy4E-nAb9tzsk,1412
-nsqdriver/nswave/_errors.cpython-39-darwin.so,sha256=EAiQtHFmYIRpcigB3nvDfs5b_m81BrsFmFRM7Cfv5yw,239168
-nsqdriver/nswave/_errors.pyi,sha256=pYt3VZxWgXWVNGvbQ3g6IwxItCmPcW_EfN3l1YfLk2o,640
-nsqdriver/nswave/_functions.cpython-39-darwin.so,sha256=QJWKAt5I60EK2D5NPYcWbHPr9_atuIO4r42DkYHXcgs,286376
-nsqdriver/nswave/_functions.pyi,sha256=lHSxiqHwZVvdjs-53KiFlTGAGCHsvOU3DKDGRVM7ur8,1958
-nsqdriver/nswave/_ir.cpython-39-darwin.so,sha256=7Z1TgNxRqo45fhvhMlc8lSZGpDeSGE5IfP8sky_FS-k,782128
-nsqdriver/nswave/_ir.pyi,sha256=tC4iVf0dUOevZhwbCm77pDk87PbaIbhpNGHFamNdx5k,7130
-nsqdriver/nswave/_ir_pass.cpython-39-darwin.so,sha256=XvoPV9zfl8qJcyWCTVg5wmTTD09wekVao5-vLBCRJxk,181088
-nsqdriver/nswave/_ir_pass.pyi,sha256=wYOesXdZnTlZ0Ph06VVP65uc6n-k8gywEkHaaSSyPmQ,282
-nsqdriver/nswave/_optimizations.cpython-39-darwin.so,sha256=BWuvtIgiyaF7d1W0plgLWjpcUphyWEu_942c5Dkw7a8,183512
-nsqdriver/nswave/_optimizations.pyi,sha256=y6ytCU8SSlD4mzXe-V2GjFrvpafumK388pgxHuxDBnI,492
-nsqdriver/nswave/_rules.cpython-39-darwin.so,sha256=q9-lYyH2hkZf6VQ9XtWuftQFDbk1ZVL8iusxdWIr1pw,479024
-nsqdriver/nswave/_rules.pyi,sha256=AxXSBY0xM3PMrZqIvqSDJB53eScU_XatNWiul57ZytU,1870
-nsqdriver/nswave/_translate.cpython-39-darwin.so,sha256=siTTqhgOjqO_Ojn-EtUgH0Esn0foUyVNaCpU6k0j1a0,309592
-nsqdriver/nswave/_translate.pyi,sha256=JAFEJpAw5k2yx3uKNcKPCNV--fxTneDbfm4xA8fW_kw,375
-nsqdriver/nswave/kernel.cpython-39-darwin.so,sha256=wPXP5TBJjx8cLg5z6vtKqbVvBRYC_ELNrx_7Xjv1-gk,686880
-nsqdriver/nswave/kernel.pyi,sha256=Fs-_v2XT0UpRSSoogwIbejXna6uAfceYv41PyL2m-NM,1952
-nsqdriver/wrapper/AWG_ADC.py,sha256=ktQkORc8VZUFkNg6huC7DKIkvZyHYXRolQ2SAA89JnM,19199
-nsqdriver/wrapper/ND_NSMCI.py,sha256=gTyrDObhbggl35V_q-kpDoPsfttIEnDFc6f0-pk_P0k,6288
-nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver-0.12.11.dist-info/METADATA,sha256=5hsgga0-SYpUUY14UYHb9qNreofnFYqPhXrrnzjVgr8,4276
-nsqdriver-0.12.11.dist-info/WHEEL,sha256=dBEOfjXJzIYbX30eL3n1E7LDd9jFYd7hTlPrGjY7BV4,112
-nsqdriver-0.12.11.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.12.11.dist-info/RECORD,,