nsqdriver 0.12.11__cp310-cp310-win_amd64.whl → 0.12.13__cp310-cp310-win_amd64.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=zA5YcM65v66EqwBnplDvA6HM0I-y8damDOerE2CKyZE,8137
+nsqdriver/NS_DDS_v3.py,sha256=FZEe6ivLhlmZrNhNyDiDi7vx_CkFBULUtx_V_m-SsWY,24371
+nsqdriver/NS_DDS_v4.py,sha256=y6zIjrNuT-s-qJZCBbeVJdh10r27nPAU3f8sYAKWsms,35219
+nsqdriver/NS_MCI.py,sha256=JgdJ-wAarEa42VWmFmwuipRsArFgSwSX6ctR8kI74Fk,22632
+nsqdriver/NS_QSYNC.py,sha256=bPD0cAUehRXpTDwMNZutB5AWhZM7iwKBD5t5jmJiBF4,27900
+nsqdriver/__init__.py,sha256=1yMiurwF9Pc4p4fe0JlseGKsXXEiK-bSSYmwucZgCrA,387
+nsqdriver/common.py,sha256=5BRActb9TgNdVwWtfuZ_gki47H1WbABzYr5XbxLKlh4,519
+nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver/compiler/assembler.cp310-win_amd64.pyd,sha256=jmwMMxuFZ24KkLMqC3BWBgRiD4g2n7hjtNPwZUPVL94,413184
+nsqdriver/compiler/ns_wave.cp310-win_amd64.pyd,sha256=Egfwzz8htAjcZjIKCW66kcle8DA7a0qLw28fa4U8ToM,238080
+nsqdriver/compiler/ns_wave.pyi,sha256=axQaxrMaKRPx8k9sDVlRj3SjR03AmXUDzkVW4D_2RJw,3975
+nsqdriver/compiler/py_wave_asm.cp310-win_amd64.pyd,sha256=Lki0IfBVOsxcMksq947mePgMZbVy-W7i-vFwT4GhlkU,330240
+nsqdriver/compiler/py_wave_asm.pyi,sha256=PqEZuNt83CCu_FJUczUjStowOz2TBgvfIytGanFPHuQ,685
+nsqdriver/nswave/__init__.py,sha256=rAU1XD58JBF7iAYB5LVD-ZlEmQq9wyJrsRVHF-OOrzI,302
+nsqdriver/nswave/_asm.pyi,sha256=f8IjCLPIocBZXTC8F5GFTlI6ZDa5-hhShJPjL166K4o,2846
+nsqdriver/nswave/_checkers.cp310-win_amd64.pyd,sha256=m3haDJuYXYG6NV4NdEhYNdCSjOoKiefeMKZ2XxCpnWQ,221696
+nsqdriver/nswave/_checkers.pyi,sha256=931KCK3B87dE0qjtWcEt6C-_KSIdH0RRiIYer8p6Tgg,1459
+nsqdriver/nswave/_errors.cp310-win_amd64.pyd,sha256=0RrCLwQe7rb0nYEYErlrkpdpE2o5y-Brulwdrm3degc,78848
+nsqdriver/nswave/_errors.pyi,sha256=A4LLc1zu6blJgmaAW_Wdx19jvFe1fkIggkTgYaQ8BIM,664
+nsqdriver/nswave/_functions.cp310-win_amd64.pyd,sha256=tq1HNkD3JGZjrHeqzrYGnErkRoeyMn71Pd_dl_4Tv-w,221184
+nsqdriver/nswave/_functions.pyi,sha256=wOzfZITAzupxAONxGELNF_U-XMy1CTdr8iU8UeszTQk,1992
+nsqdriver/nswave/_ir.cp310-win_amd64.pyd,sha256=ZQpp-EkE9ASKcKdvsz-vDSGnkMp8QcwUNDsgBOYOdgU,471552
+nsqdriver/nswave/_ir.pyi,sha256=nPh7se2s1D80zMLF_bSrA4WpKI7uk-hrLRPs5JHadxc,7413
+nsqdriver/nswave/_ir_pass.cp310-win_amd64.pyd,sha256=ciYKfgmPSzVRVRTk-2zevDbTap3gcEvwnA5QaPcycDA,57856
+nsqdriver/nswave/_ir_pass.pyi,sha256=UmQVLgcfX1rw9HuMorRCensJtxB4b7zh7uyIIlTF_A0,289
+nsqdriver/nswave/_optimizations.cp310-win_amd64.pyd,sha256=31-Nh84LP1bPXhHAOuqm-aTIo_-59iDtEBr4yA4hEJQ,68096
+nsqdriver/nswave/_optimizations.pyi,sha256=6WxLlO1aJEMMGB4qL3iSr0l43b6pSH-7qRSHXzCQQa8,508
+nsqdriver/nswave/_rules.cp310-win_amd64.pyd,sha256=_S2Qg6tH4wSGUIjOu8COzRrMPd3UPjHJMuFWyWB5ATI,220160
+nsqdriver/nswave/_rules.pyi,sha256=bMynUPRkrIfTNXPt0K7Rqy5cp4B-4EIdolznVBJaaAM,1926
+nsqdriver/nswave/_simulator.cp310-win_amd64.pyd,sha256=tV_PTkR9FooDJZOZKiTbfPEO4VjcoQmdEJMibRz0Duc,145920
+nsqdriver/nswave/_translate.cp310-win_amd64.pyd,sha256=6v84Uc_dCWP51pOTUNaWiK__6U3ED-3wWKTgHyqEdO4,125952
+nsqdriver/nswave/_translate.pyi,sha256=f0N24eSL7hKj2R04W-EFeEo9A8UYfzHOta7LQrDn-UA,387
+nsqdriver/nswave/kernel.cp310-win_amd64.pyd,sha256=c8hrkadszRmabH0Qiw7VQw91kVh3WwJ0wpahWDi0jOM,329728
+nsqdriver/nswave/kernel.pyi,sha256=GBjjcfGBFiZ7_PCSgOWJcfVqckYg_r3j7PsMpUeaozE,2009
+nsqdriver/wrapper/AWG_ADC.py,sha256=wLtkbJe39hDcnbWZ-8jyGZ78RQtn7iAZ7P7H0n-2IWU,19733
+nsqdriver/wrapper/ND_NSMCI.py,sha256=e0j7BUdfrhfYb1GqBPlO4vSoZPXTKyictXy1nPvoMFE,6533
+nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver-0.12.13.dist-info/METADATA,sha256=nLlJY8vA5aQp1iC6RHqvaBYy5mMuHUN_Lni7mawLXN4,4576
+nsqdriver-0.12.13.dist-info/WHEEL,sha256=XrWFIm3RPVyzmsCUcU54ir4mkwxws11wgvW-voMpEY8,101
+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: cp310-cp310-win_amd64
 

nsqdriver-0.12.11.dist-info/RECORD

@@ -1,39 +0,0 @@
-nsqdriver/NS_CST.py,sha256=zA5YcM65v66EqwBnplDvA6HM0I-y8damDOerE2CKyZE,8137
-nsqdriver/NS_DDS_v3.py,sha256=rX7EPJzoSuRObi0WyP9etgCBMEL1PCgOxcLy0AcK3Yg,15841
-nsqdriver/NS_MCI.py,sha256=1zCpqkHr4tQdgb5iaMTKcjrhPKuWNSFUKR7V_8patG8,21659
-nsqdriver/NS_QSYNC.py,sha256=bPD0cAUehRXpTDwMNZutB5AWhZM7iwKBD5t5jmJiBF4,27900
-nsqdriver/__init__.py,sha256=1S2HPHybJwuTB8hcvKQl66muGN1jI3FX0UC1x0mJPLY,383
-nsqdriver/common.py,sha256=5BRActb9TgNdVwWtfuZ_gki47H1WbABzYr5XbxLKlh4,519
-nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver/compiler/assembler.cp310-win_amd64.pyd,sha256=XWrLltvsKg0qZ4Wv5kWEVoaJoejWr08BBY8Ycsk8EW4,378368
-nsqdriver/compiler/ns_wave.cp310-win_amd64.pyd,sha256=YCSAfwW0kwmlwElkLvLJEnzxr9-h64eVuu7ZlT8DeAY,238080
-nsqdriver/compiler/ns_wave.pyi,sha256=axQaxrMaKRPx8k9sDVlRj3SjR03AmXUDzkVW4D_2RJw,3975
-nsqdriver/compiler/py_wave_asm.cp310-win_amd64.pyd,sha256=pzfmrPj8Tg2hsEGfohpZoJKx9hOHdfOkAOUK2PQvFTA,330752
-nsqdriver/compiler/py_wave_asm.pyi,sha256=PqEZuNt83CCu_FJUczUjStowOz2TBgvfIytGanFPHuQ,685
-nsqdriver/nswave/__init__.py,sha256=rAU1XD58JBF7iAYB5LVD-ZlEmQq9wyJrsRVHF-OOrzI,302
-nsqdriver/nswave/_asm.pyi,sha256=f8IjCLPIocBZXTC8F5GFTlI6ZDa5-hhShJPjL166K4o,2846
-nsqdriver/nswave/_checkers.cp310-win_amd64.pyd,sha256=T9yZtOTdXOfe94ZU_uW26dwctouwsLaLyrjn1--BdhI,176640
-nsqdriver/nswave/_checkers.pyi,sha256=931KCK3B87dE0qjtWcEt6C-_KSIdH0RRiIYer8p6Tgg,1459
-nsqdriver/nswave/_errors.cp310-win_amd64.pyd,sha256=qGlDmLco5JftBbkpX94j9J67CY9yeMoYs6uctFUITXc,78848
-nsqdriver/nswave/_errors.pyi,sha256=A4LLc1zu6blJgmaAW_Wdx19jvFe1fkIggkTgYaQ8BIM,664
-nsqdriver/nswave/_functions.cp310-win_amd64.pyd,sha256=r-WEmK6yGoKystQ33DqzQstAXeAplJcwMiUx1iBf-ps,103936
-nsqdriver/nswave/_functions.pyi,sha256=wOzfZITAzupxAONxGELNF_U-XMy1CTdr8iU8UeszTQk,1992
-nsqdriver/nswave/_ir.cp310-win_amd64.pyd,sha256=pJkqTOoioC9XMAGqCrIoxi5DSdxRk9r1kFcZUQI-1hc,316416
-nsqdriver/nswave/_ir.pyi,sha256=nPh7se2s1D80zMLF_bSrA4WpKI7uk-hrLRPs5JHadxc,7413
-nsqdriver/nswave/_ir_pass.cp310-win_amd64.pyd,sha256=v8VnYXoS5iTXZOw7-GMLC2FokuREQlEk4apzptJTWIA,47616
-nsqdriver/nswave/_ir_pass.pyi,sha256=UmQVLgcfX1rw9HuMorRCensJtxB4b7zh7uyIIlTF_A0,289
-nsqdriver/nswave/_optimizations.cp310-win_amd64.pyd,sha256=ZFPo6fDVhg89_JXRRk0zfGM6b8nKfYUx6QnK7vDDjaE,56832
-nsqdriver/nswave/_optimizations.pyi,sha256=6WxLlO1aJEMMGB4qL3iSr0l43b6pSH-7qRSHXzCQQa8,508
-nsqdriver/nswave/_rules.cp310-win_amd64.pyd,sha256=xIMJ23N5yJpdQSNwHkFQIPSndwmcuxGe-nvA53u-S5A,187392
-nsqdriver/nswave/_rules.pyi,sha256=bMynUPRkrIfTNXPt0K7Rqy5cp4B-4EIdolznVBJaaAM,1926
-nsqdriver/nswave/_translate.cp310-win_amd64.pyd,sha256=sSHwxSJBy9Ni6bPskCFN8rw9m5aUVa22gK6zxx3Zka8,109568
-nsqdriver/nswave/_translate.pyi,sha256=f0N24eSL7hKj2R04W-EFeEo9A8UYfzHOta7LQrDn-UA,387
-nsqdriver/nswave/kernel.cp310-win_amd64.pyd,sha256=g7bZCDk9-s-C6-wCImBMxHrlfo13-jKaPcHpkhuAmK8,264192
-nsqdriver/nswave/kernel.pyi,sha256=GBjjcfGBFiZ7_PCSgOWJcfVqckYg_r3j7PsMpUeaozE,2009
-nsqdriver/wrapper/AWG_ADC.py,sha256=wLtkbJe39hDcnbWZ-8jyGZ78RQtn7iAZ7P7H0n-2IWU,19733
-nsqdriver/wrapper/ND_NSMCI.py,sha256=e0j7BUdfrhfYb1GqBPlO4vSoZPXTKyictXy1nPvoMFE,6533
-nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver-0.12.11.dist-info/METADATA,sha256=w9fXif6nPaP8IcAol-hJ6pE1Gew7t8tHoIC520tmrWs,4385
-nsqdriver-0.12.11.dist-info/WHEEL,sha256=p5V5KdZN0-YNRJX7ztCk3aorLO3tprTWjNpqgrscgg8,101
-nsqdriver-0.12.11.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.12.11.dist-info/RECORD,,