Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 515aa968194f
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ffe1355b1aac
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Jun 29, 2015

  1. 2
    Copy the full SHA
    a73776b View commit details
  2. 1
    Copy the full SHA
    ffe1355 View commit details
5 changes: 3 additions & 2 deletions artiq/frontend/lda_controller.py
Original file line number Diff line number Diff line change
@@ -18,8 +18,9 @@ def get_argparser():
help="USB serial number of the device. "
"The serial number is written on a sticker under "
"the device, you should write for example "
"-d \"SN:03461\". You must prepend enough 0 for it "
"to be 5 digits.")
"-d \"SN:03461\". You must prepend enough 0 for "
"it to be 5 digits. If omitted, the first "
"available device will be used.")
parser.add_argument("--simulation", action="store_true",
help="Put the driver in simulation mode.")
verbosity_args(parser)
5 changes: 5 additions & 0 deletions artiq/frontend/novatech409b_controller.py
Original file line number Diff line number Diff line change
@@ -31,6 +31,11 @@ def main():
args = get_argparser().parse_args()
init_logger(args)

if not args.simulation and args.device is None:
raise ValueError("You need to specify either --simulation or "
"-d/--device argument. Use --help for more "
"information.")

dev = Novatech409B(args.device if not args.simulation else None)
try:
simple_server_loop(
6 changes: 6 additions & 0 deletions artiq/frontend/pdq2_controller.py
Original file line number Diff line number Diff line change
@@ -27,6 +27,12 @@ def main():
args = get_argparser().parse_args()
init_logger(args)
port = None

if not args.simulation and args.device is None:
raise ValueError("You need to specify either --simulation or "
"-d/--device argument. Use --help for more "
"information.")

if args.simulation:
port = open(args.dump, "wb")
dev = Pdq2(url=args.device, dev=port)
5 changes: 5 additions & 0 deletions artiq/frontend/pxi6733_controller.py
Original file line number Diff line number Diff line change
@@ -25,6 +25,11 @@ def main():
args = get_argparser().parse_args()
init_logger(args)

if not args.simulation and args.channels is None:
raise ValueError("You need to specify either --simulation or "
"-C/--channels argument. Use --help for more "
"information.")

if args.simulation:
daq = DAQmxSim()
else:
5 changes: 5 additions & 0 deletions artiq/frontend/thorlabs_tcube_controller.py
Original file line number Diff line number Diff line change
@@ -26,6 +26,11 @@ def main():
args = get_argparser().parse_args()
init_logger(args)

if not args.simulation and args.device is None:
raise ValueError("You need to specify either --simulation or "
"-d/--device argument. Use --help for more "
"information.")

if args.simulation:
if args.product == "TDC001":
dev = TdcSim()