Skip to content

Commit 4c19de9

Browse files
committed
Add AnalogOut with ramp example, rename DigitalOut connection
1 parent 9b64a0d commit 4c19de9

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

labscript_profile/default_profile/userlib/labscriptlib/example_apparatus/connection_table.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from labscript import start, stop, add_time_marker, DigitalOut
1+
from labscript import start, stop, add_time_marker, AnalogOut, DigitalOut
22
from labscript_devices.DummyPseudoclock.labscript_devices import DummyPseudoclock
33
from labscript_devices.DummyIntermediateDevice import DummyIntermediateDevice
44

@@ -9,8 +9,13 @@
99
# to trigger children devices
1010
DummyIntermediateDevice(name='intermediate_device', parent_device=pseudoclock.clockline)
1111

12+
# Create an AnalogOut child of the DummyIntermediateDevice
13+
AnalogOut(name='analog_out', parent_device=intermediate_device, connection='ao0')
14+
1215
# Create a DigitalOut child of the DummyIntermediateDevice
13-
DigitalOut(name='digital_out', parent_device=intermediate_device, connection='do0')
16+
DigitalOut(
17+
name='digital_out', parent_device=intermediate_device, connection='port0/line0'
18+
)
1419

1520
# Begin issuing labscript primitives
1621
# start() elicits the commencement of the shot

labscript_profile/default_profile/userlib/labscriptlib/example_apparatus/example_experiment.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from labscript import start, stop, add_time_marker, DigitalOut
1+
from labscript import start, stop, add_time_marker, AnalogOut, DigitalOut
22
from labscript_devices.DummyPseudoclock.labscript_devices import DummyPseudoclock
33
from labscript_devices.DummyIntermediateDevice import DummyIntermediateDevice
44

@@ -9,8 +9,13 @@
99
# to trigger children devices
1010
DummyIntermediateDevice(name='intermediate_device', parent_device=pseudoclock.clockline)
1111

12+
# Create an AnalogOut child of the DummyIntermediateDevice
13+
AnalogOut(name='analog_out', parent_device=intermediate_device, connection='ao0')
14+
1215
# Create a DigitalOut child of the DummyIntermediateDevice
13-
DigitalOut(name='digital_out', parent_device=intermediate_device, connection='do0')
16+
DigitalOut(
17+
name='digital_out', parent_device=intermediate_device, connection='port0/line0'
18+
)
1419

1520
# Begin issuing labscript primitives
1621
# A timing variable t is used for convenience
@@ -29,6 +34,9 @@
2934
# Wait for 0.5 seconds
3035
t += 0.5
3136

37+
# Ramp analog_out from 0.0 V to 1.0 V over 0.25 s with a 1 kS/s sample rate
38+
t += analog_out.ramp(t=t, initial=0.0, final=1.0, duration=0.25, samplerate=1e3)
39+
3240
# Change the state of digital_out, and denote this using a time marker
3341
add_time_marker(t, "Toggle digital_out (low)", verbose=True)
3442
digital_out.go_low(t)

0 commit comments

Comments
 (0)