Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QDevil QDAC2: BUS and HOLD take up internal triggers 15 and 16 #137

Merged
merged 2 commits into from
Jun 21, 2022
Merged

QDevil QDAC2: BUS and HOLD take up internal triggers 15 and 16 #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
885c6d2
BUS and HOLD take up internal triggers 15 and 16
jpsecher Jun 13, 2022
891a305
Fix name of external triggers
jpsecher Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions qcodes_contrib_drivers/drivers/QDevil/QDAC2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# -----------------------------------------------------
Expand Down Expand Up @@ -1858,7 +1858,7 @@ def n_triggers() -> int:
Returns:
int: Number of internal triggers
"""
return 16
return 14

@staticmethod
def n_external_inputs() -> int:
Expand Down Expand Up @@ -2158,14 +2158,14 @@ 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()
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:
Expand Down