nsqdriver 0.4.3__cp311-cp311-win_amd64.whl → 0.5.4__cp311-cp311-win_amd64.whl

nsqdriver/NS_MCI.py

@@ -229,8 +229,6 @@ class Driver(BaseDriver):
         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 +262,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 +313,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 +347,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

@@ -544,11 +544,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 +556,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)))
 

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, 4)
 
 __version__ = '.'.join(str(_) for _ in version_pack)
 __all__ = ['MCIDriver', 'QSYNCDriver', 'CSTDriver', 'InsChannel']

{nsqdriver-0.4.3.dist-info → nsqdriver-0.5.4.dist-info}/METADATA

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

@@ -0,0 +1,18 @@
+nsqdriver/NS_CST.py,sha256=zA5YcM65v66EqwBnplDvA6HM0I-y8damDOerE2CKyZE,8137
+nsqdriver/NS_MCI.py,sha256=BQXlvm5OUQBat-_-yxoa7L77CogzL8D1wY9WZQSqmAc,21549
+nsqdriver/NS_QSYNC.py,sha256=Q0qcwbC5WGf4jc-EHsKdZvTaMNBPhk_VyB3PHkfI5kA,24049
+nsqdriver/__init__.py,sha256=UATVlbS8L0eK6XqBd8OU0uWPl-cKRoMOQj44FDtAqwU,381
+nsqdriver/common.py,sha256=5BRActb9TgNdVwWtfuZ_gki47H1WbABzYr5XbxLKlh4,519
+nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver/compiler/assembler.cp311-win_amd64.pyd,sha256=VPXvFS9tazgLsXSKsNcjs3pZqq7VcQtVCoFkgQiWC5E,347648
+nsqdriver/compiler/ns_wave.cp311-win_amd64.pyd,sha256=zklxV-JcsZLFe2h2Xzpw6m2GIODiHzlQtJeHqBxBelk,237056
+nsqdriver/compiler/ns_wave.pyi,sha256=axQaxrMaKRPx8k9sDVlRj3SjR03AmXUDzkVW4D_2RJw,3975
+nsqdriver/compiler/py_wave_asm.cp311-win_amd64.pyd,sha256=KLSbAGtlKvFMrT-1CZ4foozKXcHCvaalu9w_FATHy1k,330240
+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.4.dist-info/METADATA,sha256=BpiF2ro8zVDVthBlgvUgtFuS4l_psN9DEj0W3mPqK-M,4463
+nsqdriver-0.5.4.dist-info/WHEEL,sha256=nSybvzWlmdJnHiUQSY-d7V1ycwEVUTqXiTvr2eshg44,102
+nsqdriver-0.5.4.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
+nsqdriver-0.5.4.dist-info/RECORD,,

{nsqdriver-0.4.3.dist-info → nsqdriver-0.5.4.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: cp311-cp311-win_amd64
 

nsqdriver-0.4.3.dist-info/RECORD

@@ -1,17 +0,0 @@
-nsqdriver/NS_CST.py,sha256=zA5YcM65v66EqwBnplDvA6HM0I-y8damDOerE2CKyZE,8137
-nsqdriver/NS_MCI.py,sha256=1Uxc6fsanYkZz9h6aLwpGsA6Stw-189ySkW9OBrz3wM,21810
-nsqdriver/NS_QSYNC.py,sha256=ugITl8OUqoqJw5ZUyF1VNA_1yT9GfWnLAj0AzGQLPF0,24022
-nsqdriver/__init__.py,sha256=9WDh1BpI-Mov7n0G6HFUUlXtvT2HFKKDSLt7-SRpLXI,381
-nsqdriver/common.py,sha256=5BRActb9TgNdVwWtfuZ_gki47H1WbABzYr5XbxLKlh4,519
-nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver/compiler/ns_wave.cp311-win_amd64.pyd,sha256=Zq6utS_0-guEvypSjMc0fou7mOxyyjvaBA4Q8V5Q0ls,238080
-nsqdriver/compiler/ns_wave.pyi,sha256=axQaxrMaKRPx8k9sDVlRj3SjR03AmXUDzkVW4D_2RJw,3975
-nsqdriver/compiler/py_wave_asm.cp311-win_amd64.pyd,sha256=8ZCXWJZFWK4573Ibu3gldUKkG22xNIsD1G1WpVoKQH8,328704
-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.4.3.dist-info/METADATA,sha256=oKh5OxgA9zdhI5CGVnGDdUD-q1BSRwUZUqCxSgyhrK8,4463
-nsqdriver-0.4.3.dist-info/WHEEL,sha256=badvNS-y9fEq0X-qzdZYvql_JFjI7Xfw-wR8FsjoK0I,102
-nsqdriver-0.4.3.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.4.3.dist-info/RECORD,,