Laser and Shutter Components

Author: Daniel-Buckelew

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

@@ -69,8 +69,6 @@ modulation.
                     min: 0.0
                     max: 5.0
 
-|
-
 -------------------
 
 
@@ -114,4 +112,49 @@ Synthetic Lasers
                     min: 0.0
                     max: 5.0
 
-|
+-------------------
+
+ASI Laser
+
+We currently support laser control via voltage signals. ASI Tiger Controller-based lasers 
+are now supported for both digital and analog modulation through the ASILaser class.
+Future versions may expand a non-serial-based laser control using the ASI system.
+--------------------------------
+
+.. collapse:: Configuration File
+
+    .. code-block:: yaml
+
+      microscopes:
+        microscope_name:
+            lasers:
+               -
+                wavelength: 488
+                onoff:
+                  hardware:
+                    type: ASI
+                    axis: [2-8]
+                    min: 0.0
+                    max: 5.0
+                power:
+                  hardware:
+                    type: ASI
+                    axis: A
+                    min: 0.0
+                    max: 5.0
+               -
+                wavelength: 561
+                onoff:
+                  hardware:
+                    type: ASI
+                    axis: [2-8]
+                    min: 0.0
+                    max: 5.0
+                power:
+                  hardware:
+                    type: ASI
+                    axis: B
+                    min: 0.0
+                    max: 5.0
+
+-------------------

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

@@ -68,4 +68,24 @@ shutter.
                 min: 0.0
                 max: 5.0
 
-|
+------------------
+
+ASI Shutter
+
+We can control these shutters using a digital output from a ASI Tiger Controller.
+-----------------
+
+.. collapse:: Configuration File
+
+    .. code-block:: yaml
+
+      microscopes:
+        microscope_name:
+            shutter:
+              hardware:
+                type: ASI
+                axis: [1-8]
+                min: 0.0
+                max: 5.0
+
+|

src/navigate/config/configuration_database.py

@@ -160,8 +160,8 @@
 shutter_hardware_widgets = {
     "type": ["Device Type", "Combobox", "string", shutter_device_types, None],
     "channel": ["NI Channel", "Input", "string", None, "Example: PXI6259/port0/line0"],
-    "port": ["COM Port", "Input", "string", None, "e.g., COM3"],
-    "axis": ["Shutter Axis", "Input", "string", None, "e.g., A, B, C"],
+    "com_port": ["COM Port", "Input", "string", None, "e.g., COM3"],
+    "axis": ["Shutter Axis", "Input", "string", None, "e.g., 2, 3, 4"],
     "min": ["Minimum Voltage", "Spinbox", "float", None, "Example: 0"],
     "max": ["Maximum Voltage", "Spinbox", "float", None, "Example: 5"],
     "frame_config": {"ref": "hardware"},
@@ -572,12 +572,13 @@
     "n_modes": ["Number of Modes", "Input", "int", None, "Example: 32", 32],
 }
 
-laser_device_types = {"Analog Device": ("NI", "ni"), "Virtual Device": ("Synthetic", "synthetic")}
+laser_device_types = {"Analog Device": ("NI", "ni"), "ASI Laser": ("ASI", "asi"), "Virtual Device": ("Synthetic", "synthetic")}
 
 laser_hardware_widgets = {
     "wavelength": ["Wavelength", "Input", "int", None, "Example: 488", 488],
     "onoff": ["On/Off Setting", "Label", None, None, None],
     "onoff/hardware/type": ["Type", "Combobox", "string", laser_device_types, None],
+    "onoff/hardware/axis": ["Digital Axis", "Input", "string", None, "Example: 2"],
     "onoff/hardware/channel": [
         "DAQ Channel",
         "Input",
@@ -601,6 +602,7 @@
     ],
     "power": ["Power Setting", "Label", None, None, None],
     "power/hardware/type": ["Type", "Combobox", "string", laser_device_types, None],
+    "power/hardware/axis": ["Analog Axis", "Input", "string", None, "Example: B"],
     "power/hardware/channel": [
         "DAQ Channel",
         "Input",