From 885c6d239fd94960cb7039d7ae705789429488ed Mon Sep 17 00:00:00 2001 From: Jens Peter Secher Date: Mon, 13 Jun 2022 13:10:48 +0200 Subject: [PATCH 1/2] BUS and HOLD take up internal triggers 15 and 16 --- qcodes_contrib_drivers/drivers/QDevil/QDAC2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py b/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py index 97fe7a15a..18cdfd612 100644 --- a/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py +++ b/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py @@ -7,7 +7,7 @@ from typing import Any, NewType, Sequence, List, Dict, Tuple, Optional from packaging.version import parse -# Version 0.13.0 +# Version 0.14.0 # # Guiding principles for this driver for QDevil QDAC-II # ----------------------------------------------------- @@ -1858,7 +1858,7 @@ def n_triggers() -> int: Returns: int: Number of internal triggers """ - return 16 + return 14 @staticmethod def n_external_inputs() -> int: @@ -2165,7 +2165,7 @@ def _set_up_external_triggers(self) -> None: self.add_submodule('external_triggers', triggers) def _set_up_internal_triggers(self) -> None: - # A set of the available 16 internal triggers + # A set of the available internal triggers self._internal_triggers = set(range(1, self.n_triggers() + 1)) def _set_up_manual_triggers(self) -> None: From 891a305dbd861dff1447f7b56d3590a87f5b2a78 Mon Sep 17 00:00:00 2001 From: Jens Peter Secher Date: Mon, 13 Jun 2022 15:29:31 +0200 Subject: [PATCH 2/2] Fix name of external triggers --- qcodes_contrib_drivers/drivers/QDevil/QDAC2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py b/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py index 18cdfd612..096247c11 100644 --- a/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py +++ b/qcodes_contrib_drivers/drivers/QDevil/QDAC2.py @@ -2158,7 +2158,7 @@ def _set_up_external_triggers(self) -> None: snapshotable=False) for i in range(1, 5 + 1): name = f'ext{i}' - trigger = QDac2ExternalTrigger(self, str(QDac2ExternalTrigger), i) + trigger = QDac2ExternalTrigger(self, name, i) self.add_submodule(name, trigger) triggers.append(trigger) triggers.lock()