nsqdriver 0.7.7__cp310-cp310-macosx_10_9_universal2.whl → 0.8.1__cp310-cp310-macosx_10_9_universal2.whl

nsqdriver/NS_MCI.py

@@ -152,7 +152,7 @@ class Driver(BaseDriver):
         self.fast_rpc = None
         self.handle = None
         self.model = 'NS_MCI'  # 默认为设备名字
-        self.srate = 6.4e9
+        self.srate = 6e9
         self.device_online = True
         self.has_start_capture = False
         self.backend_version = (0, 0, 0)
@@ -338,7 +338,7 @@ class Driver(BaseDriver):
         timeout = self.timeout if timeout is None else timeout
         addr = self.addr if addr is None else addr
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        sock.settimeout(timeout)
+        sock.settimeout(timeout+1)
         sock.connect((addr, port))
         return sock
 
@@ -419,7 +419,7 @@ class FastRPC:
     def connect(self):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.connect((self.addr, 10800))
-        sock.settimeout(self.timeout)
+        sock.settimeout(self.timeout+1)
         return sock
 
     def rpc_set(self, *param):

nsqdriver/NS_QSYNC.py

@@ -32,7 +32,6 @@ except ImportError as e:
                      get_cmd='', set_cmd='', ):
             self.name = name
 
-
 if TYPE_CHECKING:
     from backend.board_parser import MCIBoard
     from concurrent.futures import Future
@@ -64,11 +63,13 @@ def retry(times):
     def decorator(func):
         @wraps(func)
         def wrapper(*args, **kwargs):
-            _times = times-1
+            _times = times - 1
             while not func(*args, **kwargs) and _times > 0:
                 _times -= 1
             return _times != 0
+
         return wrapper
+
     return decorator
 
 
@@ -151,11 +152,11 @@ class Driver(BaseDriver):
 
         self.param = {'Shot': 1024, 'TrigPeriod': 200e-6, 'MixMode': 2}
         self.subprtparam = [
-            [[  0x5F5F5F5F,
-                0x41000001,
-                0x00000000,   
-                4*(17*100+17*4+5),  # 指令长度 ，uint32个数*4
-                0,]],
+            [[0x5F5F5F5F,
+              0x41000001,
+              0x00000000,
+              4 * (17 * 100 + 17 * 4 + 5),  # 指令长度 ，uint32个数*4
+              0, ]],
             [[0, 0, 800, 0] for _ in range(17)],
             [[0 for _ in range(100)] for _ in range(17)],
         ]
@@ -245,11 +246,11 @@ class Driver(BaseDriver):
             self.gen_trig_num += 1
         elif name == 'ResetTrig':
             self.subprtparam = [
-                [[  0x5F5F5F5F,
-                    0x41000001,
-                    0x00000000,   
-                    4*(17*100+17*4+5),  # 指令长度 ，uint32个数*4
-                    0,]],
+                [[0x5F5F5F5F,
+                  0x41000001,
+                  0x00000000,
+                  4 * (17 * 100 + 17 * 4 + 5),  # 指令长度 ，uint32个数*4
+                  0, ]],
                 [[0, 0, 800, 0] for _ in range(17)],
                 [[0 for _ in range(100)] for _ in range(17)],
             ]
@@ -281,18 +282,18 @@ class Driver(BaseDriver):
             ch: _description_
         """
         if name == "Shot":
-            self.subprtparam[1][ch-1][1] = round(value) & 0xFFFFFFFF
+            self.subprtparam[1][ch - 1][1] = round(value) & 0xFFFFFFFF
         elif name == "TrigPeriod":
-            self.subprtparam[1][ch-1][0] = round(value * 1e9) & 0xFFFFFFFF
+            self.subprtparam[1][ch - 1][0] = round(value * 1e9) & 0xFFFFFFFF
         elif name == "TrigWidth":
-            self.subprtparam[1][ch-1][2] = round(value * 1e9) & 0xFFFFFFFF
+            self.subprtparam[1][ch - 1][2] = round(value * 1e9) & 0xFFFFFFFF
         # elif name == "TrigDelay":
         #     self.subprtparam[1][ch-1][3] = round(value * 1e9) & 0xFFFFFFFF
         elif name == "SubDelayCount":
-            self.subprtparam[1][ch-1][3] = round(value) & 0xFFFFFFFF
+            self.subprtparam[1][ch - 1][3] = round(value) & 0xFFFFFFFF
         elif name == "TrigDelayList":
-            self.subprtparam[2][ch-1] = [round(i * 1e9) & 0xFFFFFFFF for i in value]
-            self.subprtparam[2][ch-1].extend([0]*(100-len(self.subprtparam[2][ch-1]))) # 长度为100
+            self.subprtparam[2][ch - 1] = [round(i * 1e9) & 0xFFFFFFFF for i in value]
+            self.subprtparam[2][ch - 1].extend([0] * (100 - len(self.subprtparam[2][ch - 1])))  # 长度为100
 
     def get(self, name, channel=1, value=0):
         """!
@@ -418,7 +419,7 @@ class Driver(BaseDriver):
         timeout = self.timeout if timeout is None else timeout
         addr = self.addr if addr is None else addr
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        sock.settimeout(timeout)
+        sock.settimeout(timeout+1)
         sock.connect((addr, port))
         return sock
 
@@ -746,7 +747,6 @@ class InfoSharedList:
 # threading.Thread(target=do_scanning, daemon=True, name='qsync_scanning_device').start()
 SHARED_DEVICE_MEM = InfoSharedList()
 
-
 if __name__ == '__main__':
     ins = Driver('127.0.0.1')
 

nsqdriver/__init__.py

@@ -4,7 +4,7 @@ from .NS_CST import Driver as CSTDriver
 from .compiler.ns_wave import InsChannel
 from .compiler.py_wave_asm import nsw_config, AssemblyError
 
-version_pack = (0, 7, 7)
+version_pack = (0, 8, 1)
 
 __version__ = '.'.join(str(_) for _ in version_pack)
 __all__ = ['MCIDriver', 'QSYNCDriver', 'CSTDriver', 'InsChannel']

nsqdriver/nswave/__init__.py

@@ -1,3 +1,4 @@
 from .kernel import *
 from ._functions import *
 from ._asm import NSQCommand as NSQCommand
+from ._ir_pass import ir_pass as ir_pass

{nsqdriver-0.7.7.dist-info → nsqdriver-0.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsqdriver
-Version: 0.7.7
+Version: 0.8.1
 Summary: Q series measurement and control equipment driver interface
 Home-page: https://g2hoyqcmh4.feishu.cn/wiki/Jgt1wxlKniveYQkqCgbcJHsMnoe
 Classifier: Intended Audience :: Developers

nsqdriver-0.8.1.dist-info/RECORD

@@ -0,0 +1,31 @@
+nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
+nsqdriver/NS_MCI.py,sha256=E2i5f48cXS8L6qae6GfWx3Y-kGILqPn_9AdNNm6QTFQ,20903
+nsqdriver/NS_QSYNC.py,sha256=ZSOznM5PMlOm89rWAMiqVyZLWn3y0lTQp3d1z6LnkV0,27121
+nsqdriver/__init__.py,sha256=GsG71ctW2ubjTgMVxxIQMLBskqOfN1VAUxBc0sLn_Zo,371
+nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
+nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver/compiler/assembler.cpython-310-darwin.so,sha256=d5yB41Yu_6ZQdl6lMZGDroFSvD4OnJZNDKgkMTeHz4o,1017040
+nsqdriver/compiler/ns_wave.cpython-310-darwin.so,sha256=9QAEsTbWXR6vwHB2D-9i33-YzG9ZecjAnAk9izk8pNc,640928
+nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
+nsqdriver/compiler/py_wave_asm.cpython-310-darwin.so,sha256=ugqWT9jEVjlGCq-aEYjQB3SEYOWrtb5NoPApogoynGo,838456
+nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
+nsqdriver/nswave/__init__.py,sha256=aA9M2L3v2yRiPvkR83w60gCNdSd41F3_FhorTOOdoAY,131
+nsqdriver/nswave/_asm.pyi,sha256=3jDUjyfmn7iBgmQCviSzhvGEXoWkyQlEGfgmGJAyaH8,2722
+nsqdriver/nswave/_checkers.cpython-310-darwin.so,sha256=1SvRUVIvfuol3UzicZyKWJui-CF0bFxec4AlM3_1h9Q,319936
+nsqdriver/nswave/_errors.cpython-310-darwin.so,sha256=ud-l7azrg6q14s13qk1Uqwnx9vRpPFluopKNyUayd4w,239008
+nsqdriver/nswave/_functions.cpython-310-darwin.so,sha256=PaMIkrM1Q8i_RdYx6IAGR542ISE_iTdh50V6Az1X794,235288
+nsqdriver/nswave/_functions.pyi,sha256=GpLk_DBPy_rgO6pQ2iFtz24sdpJ4HmDDlrSTZsHEMi4,1565
+nsqdriver/nswave/_ir.cpython-310-darwin.so,sha256=c0MHVmKiyiOgNqvg7EEwWcYlPDfW1_HlhmuvvJp46lE,519728
+nsqdriver/nswave/_ir_pass.cpython-310-darwin.so,sha256=CN8WOq5qQ9JHSEjNuG5N9c8883bfXye8oZAgDKRMSw4,181680
+nsqdriver/nswave/_optimizations.cpython-310-darwin.so,sha256=zk7STbOhDNEVZUn0eqwm9Or4PhQIMG_hMpan0vXAnIw,147544
+nsqdriver/nswave/_rules.cpython-310-darwin.so,sha256=qGM1x0A6ecpZSe-op4jI99QvlJlqmpHITuy7UvIOzrw,354960
+nsqdriver/nswave/_translate.cpython-310-darwin.so,sha256=ZSzISEtAQIra8-w6pThViCLaAiU_n3QLrQ6TiCSd19k,183768
+nsqdriver/nswave/kernel.cpython-310-darwin.so,sha256=IVpqi3wYmcradK_QvvYwfpnxLp5NEMCDkfBOiSR0hoU,514256
+nsqdriver/nswave/kernel.pyi,sha256=83P6dTTARLmXC3B_fJn_ZqtyOWZ3-scfP7uN45xJAlY,1555
+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.8.1.dist-info/METADATA,sha256=tM5YJJXgsIa6tvHxB5Mzrfeph8S9ADEOqh34OYMO2Ro,4274
+nsqdriver-0.8.1.dist-info/WHEEL,sha256=n6-NLeDlNwa-0bLe3qEb9deNf-kUUjcaMI9-GLxY4QE,114
+nsqdriver-0.8.1.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
+nsqdriver-0.8.1.dist-info/RECORD,,

{nsqdriver-0.7.7.dist-info → nsqdriver-0.8.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (74.1.1)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_10_9_universal2
 

nsqdriver-0.7.7.dist-info/RECORD

@@ -1,25 +0,0 @@
-nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
-nsqdriver/NS_MCI.py,sha256=zsN8AZitZupiUUYSAJT9CSmw9XmtsFNDYqSMIE_pIdo,20901
-nsqdriver/NS_QSYNC.py,sha256=amEwcWDOEhrDmjQVxOeAyfdnHkAANl_nXwCMTnnAarU,27102
-nsqdriver/__init__.py,sha256=ptoptuozyVq9UeFv1ZJIK_TgO7S0vQX29rexNPKf36A,371
-nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
-nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver/compiler/assembler.cpython-310-darwin.so,sha256=OiLrQ93yiqhxDGHSNSLnAsTWnaQdlj8UnjkqeMXILY0,1017040
-nsqdriver/compiler/ns_wave.cpython-310-darwin.so,sha256=Tmh5VMVQrEyD3baMyY_tEBaHOEjcyvgPo3T9IoLPF0Y,640928
-nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
-nsqdriver/compiler/py_wave_asm.cpython-310-darwin.so,sha256=gXEpf0HO4fvg4803rk5hmIvC9RxeUTh3JoUJu4RWKTU,838456
-nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
-nsqdriver/nswave/__init__.py,sha256=1d-mz2cMq2XsrOi851efPZig1BkilLMQ38ALkRnEpiA,91
-nsqdriver/nswave/_asm.cpython-310-darwin.so,sha256=q8N2uwkKhPFpNCSCHla2PZiifjs-So2_pW5n-V90Ejg,641056
-nsqdriver/nswave/_asm.pyi,sha256=3jDUjyfmn7iBgmQCviSzhvGEXoWkyQlEGfgmGJAyaH8,2722
-nsqdriver/nswave/_functions.cpython-310-darwin.so,sha256=V8huNc8tCRxoixnn7T6oQ9mdYBExo2h53K78fPPwvsM,235256
-nsqdriver/nswave/_functions.pyi,sha256=GpLk_DBPy_rgO6pQ2iFtz24sdpJ4HmDDlrSTZsHEMi4,1565
-nsqdriver/nswave/kernel.cpython-310-darwin.so,sha256=qyw_AIsi-BZrIFAviJWs5YTf6WJdCBgrnqjVQffTUE8,480320
-nsqdriver/nswave/kernel.pyi,sha256=83P6dTTARLmXC3B_fJn_ZqtyOWZ3-scfP7uN45xJAlY,1555
-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.7.7.dist-info/METADATA,sha256=5uPwuO_JnCFU2cfxVdr29w9rvV-kISdzwR1eBfYg9jc,4274
-nsqdriver-0.7.7.dist-info/WHEEL,sha256=AcFn71xhpz2WuCYpA8aiSB-jBYKhcf86loOunmmCxko,114
-nsqdriver-0.7.7.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.7.7.dist-info/RECORD,,