nsqdriver 0.4.3__cp38-cp38-macosx_11_0_x86_64.whl → 0.5.7__cp38-cp38-macosx_11_0_x86_64.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,19 +218,13 @@ 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)
         if name in {'Coefficient'}:
             data, f_list, numberOfPoints, phases = get_coef(value, 4e9)
             self.set('DemodulationParam', data, channel)
-        elif name in {'CaptureMode', 'SystemSync', 'ResetTrig', 'TrigPeriod', 'TrigFrom'}:
-            pass
         else:
             return self.set(name, value, channel)
 
@@ -264,23 +258,18 @@ class Driver(BaseDriver):
                 value = {}
             self.init_device(system_parameter=value)
             return
-        elif name in {'CaptureMode', 'SystemSync', 'ResetTrig', 'TrigPeriod', 'TrigFrom'}:
-            return
 
         value = RPCValueParser.dump(value)
-        if name in {'Waveform', 'GenWave', 'MultiGenWave', 'GenWaveIQ', 'DemodulationParam', 'Coefficient',
-                    'Instruction'}:
-            func = self.fast_rpc.rpc_set
-            name = 'GenWave' if name == 'Waveform' and value[0] == RPCValueParser.dump_tag_waveform else name
-        else:
-            func = self.handle.rpc_set
+        func = self.fast_rpc.rpc_set
+        name = 'GenWave' if name == 'Waveform' and value[0] == RPCValueParser.dump_tag_waveform else name
 
         if self.has_start_capture and name == 'StartCapture':
             return
         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):
@@ -320,11 +309,13 @@ class Driver(BaseDriver):
                 if key.endswith('version'):
                     version = version[key][1:].split('-')[0]
                     version = tuple(int(v) for v in version.split('.'))
+                    break
                 else:
                     version = (0, 0, 0)
         self.backend_version = version
         if version >= (1, 2, 7):
-            return self.set('InitSystem')
+            self.set('InitSystem')
+            return True
         else:
             return self.__exec_command('初始化')
 
@@ -352,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):
+        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 = (
@@ -544,11 +562,11 @@ class DeviceCmdHandle:
         res = []
         errors = []
         for board, future in zip(boards, futures):
-            if board.has_ip and board.has_dma:
-                _id = (board.dma_id & 0xFF) << 24
+            if board.has_cmd_link and board.has_stream_link:
+                _id = (board.ds_id & 0xFF) << 24
                 _res = struct.unpack('IIIII', future.result())[-1] & 0xFFFFFF
                 if _res:
-                    errors.append(f'指令{cmd_data[4:8].tobytes()}向{board.board_ip}转发失败\n')
+                    errors.append(f'指令{cmd_data[4:8].tobytes()}向{board.cs_target}转发失败\n')
                 res.append(_id + _res)
         return b''.join((head, cmd_data[4:12], struct.pack('=I' + 'I' * len(res), 16 + len(res) * 4, *res))), errors
 
@@ -556,8 +574,8 @@ class DeviceCmdHandle:
     def packing_fake_result(boards: Iterable["MCIBoard"], cmd_data: memoryview, head: bytes) -> bytes:
         res = []
         for board in boards:
-            if board.has_ip and board.has_dma:
-                _id = (board.dma_id & 0xFF) << 24
+            if board.has_cmd_link and board.has_stream_link:
+                _id = (board.ds_id & 0xFF) << 24
                 res.append(_id + 0)
         return b''.join((head, cmd_data[4:12], struct.pack('=I' + 'I' * len(res), 16 + len(res) * 4, *res)))
 
@@ -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, 4, 3)
+version_pack = (0, 5, 7)
 
 __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.4.3.dist-info → nsqdriver-0.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsqdriver
-Version: 0.4.3
+Version: 0.5.7
 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.7.dist-info/RECORD

@@ -0,0 +1,18 @@
+nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
+nsqdriver/NS_MCI.py,sha256=LWaPn2XGjlT20gupsg8aDAvHVxmtmLehCmI63pt4m74,20791
+nsqdriver/NS_QSYNC.py,sha256=Qq0y2eISRo2faRQk3U57RHeAbssvYy7ex5rsCfxNfLU,24743
+nsqdriver/__init__.py,sha256=rprb8TO2c6Nxr7wTVBj8rSzWNJo60MReiFTM4zafVkM,371
+nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
+nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver/compiler/assembler.cpython-38-darwin.so,sha256=Y5Ek8jUCjg9eQfn_an9-SDJbn7ElRYlORoNJSRlCogM,560104
+nsqdriver/compiler/ns_wave.cpython-38-darwin.so,sha256=M9EVnPjvWbxr9Kioxe5alSg2NbPtytAwG8ClmVEKbTo,389864
+nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
+nsqdriver/compiler/py_wave_asm.cpython-38-darwin.so,sha256=olZOrFBqqnyPFFfVtQh4Kc6vRIvcvQK9WsLK56dvfDA,533760
+nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
+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.5.7.dist-info/METADATA,sha256=5i6Xs_CCMOSABTy9tFyh9rRlgOXbHYPL0SWdFbGjBhI,4359
+nsqdriver-0.5.7.dist-info/WHEEL,sha256=-xNEBBqBjuLNGcSddobZMrgGCgJVOgsTLShPZDHgbqs,109
+nsqdriver-0.5.7.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
+nsqdriver-0.5.7.dist-info/RECORD,,

{nsqdriver-0.4.3.dist-info → nsqdriver-0.5.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: false
 Tag: cp38-cp38-macosx_11_0_x86_64
 

nsqdriver-0.4.3.dist-info/RECORD

@@ -1,17 +0,0 @@
-nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
-nsqdriver/NS_MCI.py,sha256=QhZHdyE-isQ1YWScB1vKRiuFv2NFvMVhRLzrLdPlUvo,21239
-nsqdriver/NS_QSYNC.py,sha256=nbF3cmicEpJhwYrRfULWYOK9lnqdOd_Jqy-QnK75ZPk,23351
-nsqdriver/__init__.py,sha256=ayjUJe2lD4X2dU8uvEkXZkt7KbUggrfv_CW_UA5OnN4,371
-nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
-nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver/compiler/ns_wave.cpython-38-darwin.so,sha256=OdXLBvhMqI8PIyJOiVZ-lsKApOrDAV-61irjSdIZgxs,389864
-nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
-nsqdriver/compiler/py_wave_asm.cpython-38-darwin.so,sha256=6WxBlVrg6hzNH17Q4CoUYdYof9_1T0j2_fcQfvD0BDQ,533768
-nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
-nsqdriver/wrapper/AWG_ADC.py,sha256=8K5xLEa_3CKnStWcoJeTj8ufEQfrx6o4l4XGNuOP3Ug,19211
-nsqdriver/wrapper/ND_NSMCI.py,sha256=gTyrDObhbggl35V_q-kpDoPsfttIEnDFc6f0-pk_P0k,6288
-nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver-0.4.3.dist-info/METADATA,sha256=vxtTkxr6sJGag1ckhH0J4_nEkRtfCWiRBiNRRbh-oNw,4359
-nsqdriver-0.4.3.dist-info/WHEEL,sha256=ZFv5yXgXaiE7_wiIOhB5T8vjMFeGthiQRfavaP_QKbQ,109
-nsqdriver-0.4.3.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.4.3.dist-info/RECORD,,