nsqdriver 0.5.1__cp39-cp39-win_amd64.whl → 0.5.6__cp39-cp39-win_amd64.whl

nsqdriver/NS_MCI.py

@@ -203,13 +203,13 @@ class Driver(BaseDriver):
         values.update(system_parameter)
         for name, value in values.items():
             if value is not None:
-                self.handle.rpc_set(name, value, 0, False)
+                self.fast_rpc.rpc_set(name, value, 0, False)
         print_debug('Driver: 后端参数配置成功')
 
         # 系统开启前必须进行过一次初始化
         result &= self.__init_system()
         print_debug('Driver: 后端RF配置成功')
-        result &= self.handle.rpc_set('Reset')
+        result &= self.fast_rpc.rpc_set('Reset')
         print_debug('Driver: 后端缓存配置成功')
         return result
 
@@ -218,11 +218,7 @@ class Driver(BaseDriver):
         """
         关闭设备
         """
-        if getattr(self, 'handle', None) is not None:
-            self.handle.close()
-            self.handle = None
-        if getattr(self, 'fast_rpc', None) is not None:
-            self.fast_rpc = None
+        ...
 
     def write(self, name: str, value, **kw):
         channel = kw.get('ch', 1)
@@ -272,7 +268,8 @@ class Driver(BaseDriver):
         self.has_start_capture = name == 'StartCapture'
 
         if not func(name, value, channel):
-            raise xmlrpc.client.Fault(400, f'指令{name}执行失败, 请重新open板卡')
+            ...
+            # raise xmlrpc.client.Fault(400, f'指令{name}执行失败, 请重新open板卡')
 
     @solve_rpc_exception
     def get(self, name, channel=1, value=0):
@@ -346,13 +343,15 @@ class Driver(BaseDriver):
         return sock
 
     def _show_system_status(self):
-        import json
         keys = ['device_type', 'backend_version', 'ad_num', 'da_num', 'cpu_temp', 'memory_use']
         status: dict = self.handle.get_all_status(False)
         _string = [f'*********设备{self.addr}开启成功*********']
         for key in keys:
             _string.append(f'{key}: {status.get(key, "nan")}')
         print('\n'.join(_string))
+        if self.backend_version >= (2, 0, 1):
+            print('available chnl: ')
+            print(self.get('ChnlInfo'))
 
 
 class RPCFaultPack:

nsqdriver/NS_QSYNC.py

@@ -235,6 +235,12 @@ class Driver(BaseDriver):
             self.change_ref(value)
         elif name == 'UpdateFirmware':
             self.update_firmware(value)
+        elif name == 'SetMask':
+            if not isinstance(value, list):
+                print(f'SetMask set value {value} is not a list')
+                return
+            data = self.__fmt_qsync_mask(value)
+            self._send_command(data)
 
         else:
             self.param[name] = value
@@ -441,6 +447,18 @@ class Driver(BaseDriver):
 
         return struct.pack('=' + 'I' * len(cmd_pack), *cmd_pack)
 
+    @lru_cache(maxsize=32)
+    def __fmt_qsync_mask(self, mask: Tuple):
+        cmd_pack = (
+            0x5F5F5F5F,
+            0x51000001,
+            0x00000000,
+            80,
+            *mask
+        )
+
+        return struct.pack('=' + 'I' * len(cmd_pack), *cmd_pack)
+
     @lru_cache(maxsize=32)
     def __fmt_qsync_start(self, src, period, shots, width, delay):
         cmd_pack = (
@@ -669,3 +687,35 @@ 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')
+
+    count = 1024
+    period = 400e-6
+    delay = 0
+    source = 0
+
+    # ins.set('ResetTrig')
+
+    for ch in [1, 2, 3, 4, 5, 6, 7]:
+        ins.set('Shot', count, channel=ch)
+        ins.set('TrigPeriod', period, channel=ch)
+        ins.set('TrigDelay', delay, channel=ch)
+        ins.set('TrigFrom', source, channel=ch)
+
+    for ch in [8]:
+        ins.set('Shot', count, channel=ch)
+        ins.set('TrigWidth', 1600e-9, channel=ch)
+        ins.set('TrigPeriod', period, channel=ch)
+        ins.set('SubTriggerCount', 4, channel=ch)
+        ins.set('TrigDelayList', [1600e-9 * i for i in range(4)])
+        ins.set('TrigFrom', source, channel=ch)
+
+    for i in range(1):
+        # ins.set('GenerateTrig')
+        ins.set('GeneratePrtTrig')
+        import time
+
+        time.sleep(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, 5, 1)
+version_pack = (0, 5, 6)
 
 __version__ = '.'.join(str(_) for _ in version_pack)
 __all__ = ['MCIDriver', 'QSYNCDriver', 'CSTDriver', 'InsChannel']

nsqdriver/wrapper/AWG_ADC.py

@@ -16,7 +16,7 @@ SEGMENT_ENABLE = False
 class DAChannelData:
     seg_waves: "Sized|Iterable[np.ndarray]" = tuple()
     delays: "Sized|Iterable[float]" = tuple()
-    data: np.ndarray = np.array([0])
+    data = np.array([0])
     updated: bool = False
 
     @property

{nsqdriver-0.5.1.dist-info → nsqdriver-0.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsqdriver
-Version: 0.5.1
+Version: 0.5.6
 Summary: Naishu Q series quantum measurement and control equipment driver interface
 Home-page: https://g2hoyqcmh4.feishu.cn/wiki/wikcnzvyMd82DLZUe2NsI6HxsFc
 Author: Naishu Technology

nsqdriver-0.5.6.dist-info/RECORD

@@ -0,0 +1,18 @@
+nsqdriver/NS_CST.py,sha256=zA5YcM65v66EqwBnplDvA6HM0I-y8damDOerE2CKyZE,8137
+nsqdriver/NS_MCI.py,sha256=CAOzRpRfpVMmGrY5_oko9yGXEe1PoUAVChIFXJTDcJo,21355
+nsqdriver/NS_QSYNC.py,sha256=KKvOLUeztMTEcCYCX_wV_NDJzp8CQVDk_LJsZ79_NH4,25469
+nsqdriver/__init__.py,sha256=ZDWwh0m325wYmwmCxQGJ5JYz3KrgD7BQ2X1BM7V66Vk,381
+nsqdriver/common.py,sha256=5BRActb9TgNdVwWtfuZ_gki47H1WbABzYr5XbxLKlh4,519
+nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver/compiler/assembler.cp39-win_amd64.pyd,sha256=Qq9DcUs1Mq1RoLNOc-09JTbnhetL1YtLtExFm3D1iVU,349696
+nsqdriver/compiler/ns_wave.cp39-win_amd64.pyd,sha256=IKfB03IUyDAZK8AepCuWATbHuOp8SvcKaUZKIQBk1IU,237568
+nsqdriver/compiler/ns_wave.pyi,sha256=axQaxrMaKRPx8k9sDVlRj3SjR03AmXUDzkVW4D_2RJw,3975
+nsqdriver/compiler/py_wave_asm.cp39-win_amd64.pyd,sha256=B1QAgaWvgWpn1Y2KZDSc_R0w0MfR2ItZSn4MO7_t6Aw,332800
+nsqdriver/compiler/py_wave_asm.pyi,sha256=PqEZuNt83CCu_FJUczUjStowOz2TBgvfIytGanFPHuQ,685
+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.5.6.dist-info/METADATA,sha256=rsMrjqPohK6YubeU6XO-pa7rQeMJ_CnNk0Yyz6inOhI,4463
+nsqdriver-0.5.6.dist-info/WHEEL,sha256=Z6c-bE0pUM47a70GvqO_SvH_XXU0lm62gEAKtoNJ08A,100
+nsqdriver-0.5.6.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
+nsqdriver-0.5.6.dist-info/RECORD,,

{nsqdriver-0.5.1.dist-info → nsqdriver-0.5.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: false
 Tag: cp39-cp39-win_amd64
 

nsqdriver-0.5.1.dist-info/RECORD

@@ -1,18 +0,0 @@
-nsqdriver/NS_CST.py,sha256=zA5YcM65v66EqwBnplDvA6HM0I-y8damDOerE2CKyZE,8137
-nsqdriver/NS_MCI.py,sha256=nXa74bV56H1SlJiv6Vv-L_hIIdnZRslx_2nOmMFofyg,21424
-nsqdriver/NS_QSYNC.py,sha256=Q0qcwbC5WGf4jc-EHsKdZvTaMNBPhk_VyB3PHkfI5kA,24049
-nsqdriver/__init__.py,sha256=btytZh6kbaWRboaZraWv-6Sgo3I9MghVXYBTIm9OSzc,381
-nsqdriver/common.py,sha256=5BRActb9TgNdVwWtfuZ_gki47H1WbABzYr5XbxLKlh4,519
-nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver/compiler/assembler.cp39-win_amd64.pyd,sha256=pvUsR2_6fByCrTmC1oXlzmhcBWOwbH2n3D9t0Ix73Jk,347136
-nsqdriver/compiler/ns_wave.cp39-win_amd64.pyd,sha256=o1yqZux1nhHdMnIfdv154zp_o8pXis8E83aXxzACKX4,237056
-nsqdriver/compiler/ns_wave.pyi,sha256=axQaxrMaKRPx8k9sDVlRj3SjR03AmXUDzkVW4D_2RJw,3975
-nsqdriver/compiler/py_wave_asm.cp39-win_amd64.pyd,sha256=deotWPG6te5ZM6d_PKQxMzO_O4RN-9b3Na0N1cZrFjk,332288
-nsqdriver/compiler/py_wave_asm.pyi,sha256=PqEZuNt83CCu_FJUczUjStowOz2TBgvfIytGanFPHuQ,685
-nsqdriver/wrapper/AWG_ADC.py,sha256=I4nPtbQTHxqAqFuXTHb_oDLW-ycRxSUpBUyD67eq_dA,19745
-nsqdriver/wrapper/ND_NSMCI.py,sha256=e0j7BUdfrhfYb1GqBPlO4vSoZPXTKyictXy1nPvoMFE,6533
-nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver-0.5.1.dist-info/METADATA,sha256=dRf8lUO244AeKOiYgs4Xs94RkpO3RB7nJAdbszFqMQM,4463
-nsqdriver-0.5.1.dist-info/WHEEL,sha256=GZFS91_ufm4WrNPBaFVPB9MvOXR6bMZQhPcZRRTN5YM,100
-nsqdriver-0.5.1.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.5.1.dist-info/RECORD,,