Add AnalogOut with ramp example, rename DigitalOut connection

rpanderson · rpanderson · commit 4c19de9110fd · 2020-06-22T17:44:19.000+10:00
diff --git a/labscript_profile/default_profile/userlib/labscriptlib/example_apparatus/connection_table.py b/labscript_profile/default_profile/userlib/labscriptlib/example_apparatus/connection_table.py
@@ -1,4 +1,4 @@
-from labscript import start, stop, add_time_marker, DigitalOut
+from labscript import start, stop, add_time_marker, AnalogOut, DigitalOut
 from labscript_devices.DummyPseudoclock.labscript_devices import DummyPseudoclock
 from labscript_devices.DummyIntermediateDevice import DummyIntermediateDevice
 
@@ -9,8 +9,13 @@
 # to trigger children devices
 DummyIntermediateDevice(name='intermediate_device', parent_device=pseudoclock.clockline)
 
+# Create an AnalogOut child of the DummyIntermediateDevice
+AnalogOut(name='analog_out', parent_device=intermediate_device, connection='ao0')
+
 # Create a DigitalOut child of the DummyIntermediateDevice
-DigitalOut(name='digital_out', parent_device=intermediate_device, connection='do0')
+DigitalOut(
+    name='digital_out', parent_device=intermediate_device, connection='port0/line0'
+)
 
 # Begin issuing labscript primitives
 # start() elicits the commencement of the shot
diff --git a/labscript_profile/default_profile/userlib/labscriptlib/example_apparatus/example_experiment.py b/labscript_profile/default_profile/userlib/labscriptlib/example_apparatus/example_experiment.py
@@ -1,4 +1,4 @@
-from labscript import start, stop, add_time_marker, DigitalOut
+from labscript import start, stop, add_time_marker, AnalogOut, DigitalOut
 from labscript_devices.DummyPseudoclock.labscript_devices import DummyPseudoclock
 from labscript_devices.DummyIntermediateDevice import DummyIntermediateDevice
 
@@ -9,8 +9,13 @@
 # to trigger children devices
 DummyIntermediateDevice(name='intermediate_device', parent_device=pseudoclock.clockline)
 
+# Create an AnalogOut child of the DummyIntermediateDevice
+AnalogOut(name='analog_out', parent_device=intermediate_device, connection='ao0')
+
 # Create a DigitalOut child of the DummyIntermediateDevice
-DigitalOut(name='digital_out', parent_device=intermediate_device, connection='do0')
+DigitalOut(
+    name='digital_out', parent_device=intermediate_device, connection='port0/line0'
+)
 
 # Begin issuing labscript primitives
 # A timing variable t is used for convenience
@@ -29,6 +34,9 @@
 # Wait for 0.5 seconds
 t += 0.5
 
+# Ramp analog_out from 0.0 V to 1.0 V over 0.25 s with a 1 kS/s sample rate
+t += analog_out.ramp(t=t, initial=0.0, final=1.0, duration=0.25, samplerate=1e3)
+
 # Change the state of digital_out, and denote this using a time marker
 add_time_marker(t, "Toggle digital_out (low)", verbose=True)
 digital_out.go_low(t)
