nsqdriver 0.7.7__cp38-cp38-win_amd64.whl → 0.8.1__cp38-cp38-win_amd64.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=zA5YcM65v66EqwBnplDvA6HM0I-y8damDOerE2CKyZE,8137
+nsqdriver/NS_MCI.py,sha256=-Ekpg_r39asvwNvBsijq0GbVTf37M_PRkV1mRhjPGLQ,21470
+nsqdriver/NS_QSYNC.py,sha256=bPD0cAUehRXpTDwMNZutB5AWhZM7iwKBD5t5jmJiBF4,27900
+nsqdriver/__init__.py,sha256=8XN6xk9lTZ1x2w4G6HR2-8aps7ULVlkIZmg09f7FfGI,381
+nsqdriver/common.py,sha256=5BRActb9TgNdVwWtfuZ_gki47H1WbABzYr5XbxLKlh4,519
+nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver/compiler/assembler.cp38-win_amd64.pyd,sha256=5WQH1JNbqDVbnj7_hmraghOf4R6RNrLaes6Wf42FGYI,382464
+nsqdriver/compiler/ns_wave.cp38-win_amd64.pyd,sha256=LImdrWcwIe-Af9oxUE-3CpEqarH46GJVgJMUNFC3_Gs,240128
+nsqdriver/compiler/ns_wave.pyi,sha256=axQaxrMaKRPx8k9sDVlRj3SjR03AmXUDzkVW4D_2RJw,3975
+nsqdriver/compiler/py_wave_asm.cp38-win_amd64.pyd,sha256=OOFExlTn1wW6hK2FdvEqAlSLkPflLLaaMILXdy-DHvA,335360
+nsqdriver/compiler/py_wave_asm.pyi,sha256=PqEZuNt83CCu_FJUczUjStowOz2TBgvfIytGanFPHuQ,685
+nsqdriver/nswave/__init__.py,sha256=W0BNjx9sLGZijdSMN1i-Ds2i-W4M8LAQLtoj0l3GLLE,134
+nsqdriver/nswave/_asm.pyi,sha256=PiCgsERDugyOrFIN3vO-lYzNQbKJiMqpJPr3lCHaQEU,2818
+nsqdriver/nswave/_checkers.cp38-win_amd64.pyd,sha256=JW4wdg1H5sGx6GQUIv5pIvIVCtL7glDj-j5M4_Ji_X4,112640
+nsqdriver/nswave/_errors.cp38-win_amd64.pyd,sha256=gieWIGgBpn-wWWF_lYknwPNx3SzWqL8MyLbf2RnXVxw,77312
+nsqdriver/nswave/_functions.cp38-win_amd64.pyd,sha256=nBb9__hmcuLDV5arGzCL3gv0LvRjhah5rwi-q3yADEg,88064
+nsqdriver/nswave/_functions.pyi,sha256=q0k-EWfz9gL6VOxERL5yQeE93NTVBCR4T-WgOpFF_9c,1591
+nsqdriver/nswave/_ir.cp38-win_amd64.pyd,sha256=_rPhy-DK8BOnRKgKI9WpsMDMG2bDf27gR_bfXSDbu58,203264
+nsqdriver/nswave/_ir_pass.cp38-win_amd64.pyd,sha256=LJbtCGOeubd-UFMnoh9aSlkc7EMOVviVEBd3lK7nWVg,52224
+nsqdriver/nswave/_optimizations.cp38-win_amd64.pyd,sha256=GlHkfqF7NF7N__ZEhEIi0G_fEFbNEydubEFTHLRE344,44544
+nsqdriver/nswave/_rules.cp38-win_amd64.pyd,sha256=TIZQ3t6mQkXZ2THsBV5lxvL8wJpwQkT3f9lQ0b0diqs,133632
+nsqdriver/nswave/_translate.cp38-win_amd64.pyd,sha256=erwg0t0Xz2-tCZoXtM332J8krb_dr8BkDkVire7Bkgw,61952
+nsqdriver/nswave/kernel.cp38-win_amd64.pyd,sha256=IhXKKnT7JXq8Exj5CIBBmZutZFwbpjcJXHa1vfuCwv0,192512
+nsqdriver/nswave/kernel.pyi,sha256=4V2Kb6zL599KSGEYqK_LZL9WOQ6dCLHNdnz5IYfdtik,1600
+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.8.1.dist-info/METADATA,sha256=1vKoMYp7N69sS58soT6pd_nHeF26UjaD8Fjgco1Zf6w,4383
+nsqdriver-0.8.1.dist-info/WHEEL,sha256=xZkrH3DRfk80PSGjGSmc2f46wEMhd6tJ-MuzZrUN7CQ,99
+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: cp38-cp38-win_amd64
 

nsqdriver-0.7.7.dist-info/RECORD

@@ -1,25 +0,0 @@
-nsqdriver/NS_CST.py,sha256=zA5YcM65v66EqwBnplDvA6HM0I-y8damDOerE2CKyZE,8137
-nsqdriver/NS_MCI.py,sha256=qwcGJNA1z7erqexYuSBFQen1d7k8Sx964qhI4hWsZBA,21468
-nsqdriver/NS_QSYNC.py,sha256=bdvl5tDKrqqWuHnCR7h88SyeZ4UA4ZNjH_6e4ZEGguE,27881
-nsqdriver/__init__.py,sha256=7mAKJ8v7KbK_DAjslxdZUA6rXswSPUIb2_xPagg-l8k,381
-nsqdriver/common.py,sha256=5BRActb9TgNdVwWtfuZ_gki47H1WbABzYr5XbxLKlh4,519
-nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver/compiler/assembler.cp38-win_amd64.pyd,sha256=esoKPiKynCfowqXMWdZ0eoFodG-FADVrPA8MyvKK_ws,382464
-nsqdriver/compiler/ns_wave.cp38-win_amd64.pyd,sha256=QZMvQXDqWBKRhM3fOde4p5rY97geSPXt8Oq4N5YBBHI,240128
-nsqdriver/compiler/ns_wave.pyi,sha256=axQaxrMaKRPx8k9sDVlRj3SjR03AmXUDzkVW4D_2RJw,3975
-nsqdriver/compiler/py_wave_asm.cp38-win_amd64.pyd,sha256=XNDMTeVFqkBfIymGpokbnO2wbV9u3yna2jlh4fzZTxw,335360
-nsqdriver/compiler/py_wave_asm.pyi,sha256=PqEZuNt83CCu_FJUczUjStowOz2TBgvfIytGanFPHuQ,685
-nsqdriver/nswave/__init__.py,sha256=ChVDz0uYVnrNmmcKqPjPYd4FWHsB0m2tdAw82ZbkoQA,94
-nsqdriver/nswave/_asm.cp38-win_amd64.pyd,sha256=mAVE0uZFfRiStQAM6cSF-8-g6m2Tx2s3sRFAxSJMq3I,239616
-nsqdriver/nswave/_asm.pyi,sha256=PiCgsERDugyOrFIN3vO-lYzNQbKJiMqpJPr3lCHaQEU,2818
-nsqdriver/nswave/_functions.cp38-win_amd64.pyd,sha256=-0gsUB2VOub7K1bVBEuR8dXHygmd33gZSyWC247B7Qo,87552
-nsqdriver/nswave/_functions.pyi,sha256=q0k-EWfz9gL6VOxERL5yQeE93NTVBCR4T-WgOpFF_9c,1591
-nsqdriver/nswave/kernel.cp38-win_amd64.pyd,sha256=xI_dzwi-2kAIVPt1CthZUAHyl89pnL3ydRsctx7fuvs,180736
-nsqdriver/nswave/kernel.pyi,sha256=4V2Kb6zL599KSGEYqK_LZL9WOQ6dCLHNdnz5IYfdtik,1600
-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.7.7.dist-info/METADATA,sha256=WDNOShSLuPpQeONKOIvNwxTjf-IpoxX_adOSuPzVW14,4383
-nsqdriver-0.7.7.dist-info/WHEEL,sha256=XlWm58-wLF8kCjJ0V-baAp4duFlhZEUPGoNhRz4D0G4,99
-nsqdriver-0.7.7.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.7.7.dist-info/RECORD,,