Skip to content

Commit 478e217

Browse files
Merge branch 'pr/1100' into develop
2 parents 3f205db + ba98107 commit 478e217

File tree

6 files changed

+639
-92
lines changed

6 files changed

+639
-92
lines changed

docs/source/02_user_guide/01_supported_hardware/galvo.rst

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,53 @@ Multiple types of galvanometers have been used, including Cambridge Technologies
3838
3939
|
4040
41+
------------
42+
43+
ASI
44+
---
45+
46+
Multiple types of galvanometers have been used, including Cambridge
47+
Technologies/Novanta, Thorlabs, and ScannerMAX. Each of these devices
48+
are externally controlled via analog signals delivered from the ASI
49+
Tiger Controller.
50+
51+
The ASI Tiger Controller has a few limitations for the analog signals. First, the
52+
minimum voltage must be zero volts. Second, the period value needs to be a whole number.
53+
Third, there are three analog waveforms offered, sawtooth,
54+
triangle, and sine waves.
55+
56+
The sawtooth waveform is a periodic analog waveform. There are three duty cycle values
57+
accepted, 0, 50, and 100. If the duty cycle is 0, the waveform is a falling sawtooth
58+
waveform. If the duty cycle is 50, then it is a triangle wave. If the duty cycle is 100,
59+
the waveform is a rising sawtooth waveform.
60+
61+
62+
.. collapse:: Configuration File
63+
64+
.. code-block:: yaml
65+
66+
microscopes:
67+
microscope_name:
68+
galvo:
69+
-
70+
hardware:
71+
type: ASI
72+
axis: A
73+
min: 0
74+
max: 1.0
75+
waveform: sine
76+
phase: 0
77+
-
78+
hardware:
79+
type: ASI
80+
axis: B
81+
min: 0
82+
max: 1.0
83+
waveform: sine
84+
phase: 1.57079632679
85+
86+
|
87+
4188
-----------------
4289

4390
Synthetic Galvo

src/navigate/config/configuration_database.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@
468468
"frame_config": {"ref": "hardware"},
469469
}
470470

471-
galvo_device_types = {"Analog Device": ("NI", "ni"), "Virtual Device": ("Synthetic", "synthetic")}
471+
galvo_device_types = {"Analog Device": ("NI", "ni"), "ASI Device": ("ASI", "asi"), "Virtual Device": ("Synthetic", "synthetic")}
472472

473473
waveform_types = {
474474
"Sine": "sine",
@@ -485,6 +485,7 @@
485485
None,
486486
"*Analog Device only. Example: PXI6259/ao1",
487487
],
488+
"hardware/axis": ["Axis", "Input", "string", None, "Example: A"],
488489
"hardware/min": [
489490
"Minimum Voltage",
490491
"Spinbox",

src/navigate/model/device_startup_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ def start_daq(configuration: Dict[str, Any], device_type: str = "NI") -> DAQBase
536536
from navigate.model.devices.daq.ni import NIDAQ
537537

538538
return NIDAQ(configuration)
539-
539+
540540
elif device_type.lower().startswith("synthetic"):
541541
from navigate.model.devices.daq.synthetic import SyntheticDAQ
542542

0 commit comments

Comments
 (0)