diff --git a/source/_static/images/Ephys-Link-connect-probe.png b/source/_static/images/tutorial/ephys_link/ephys_link_connect_probe.png
similarity index 100%
rename from source/_static/images/Ephys-Link-connect-probe.png
rename to source/_static/images/tutorial/ephys_link/ephys_link_connect_probe.png
diff --git a/source/_static/images/Ephys-Link-connection.png b/source/_static/images/tutorial/ephys_link/ephys_link_connection.png
similarity index 100%
rename from source/_static/images/Ephys-Link-connection.png
rename to source/_static/images/tutorial/ephys_link/ephys_link_connection.png
diff --git a/source/_static/images/tutorial/ephys_link/ephys_link_launch.png b/source/_static/images/tutorial/ephys_link/ephys_link_launch.png
new file mode 100644
index 0000000..7392716
Binary files /dev/null and b/source/_static/images/tutorial/ephys_link/ephys_link_launch.png differ
diff --git a/source/_static/images/tutorial/sensapex_manipulators.png b/source/_static/images/tutorial/ephys_link/sensapex_manipulators.png
similarity index 100%
rename from source/_static/images/tutorial/sensapex_manipulators.png
rename to source/_static/images/tutorial/ephys_link/sensapex_manipulators.png
diff --git a/source/ephys_link/installation_and_use.md b/source/ephys_link/installation_and_use.md
index 131d42b..1880e73 100644
--- a/source/ephys_link/installation_and_use.md
+++ b/source/ephys_link/installation_and_use.md
@@ -126,22 +126,4 @@ More options can be viewed by running `ephys_link.exe -h`.
New Scale manipulators have two methods of connection. The first method is through the Pathfinder MPM Control software (`-t new_scale_pathfinder`) and the second is via a direct hardware
connection (`-t new_scale`). The first method is only available if Pathfinder is running on the same computer
-as Ephys Link. New Scale manipulators should be connected to the Pathfinder software first and the Pathfinder HTTP server should be running.
-
-**Note:** Currently (July 2023), Ephys Copilot automation and manual control within Pinpoint is not supported when
-connected to New Scale via Pathfinder MPM.
-
-### Options
-
-All options can be viewed with `ephys_link --help`.
-
-| Option | Input | Default | Description |
-|----------------------------------|-----------------------------------------------------|-------------|----------------------------------------------------------------|
-| `-h, --help` | | | Show help message and options |
-| `-b, --background` | | | Launch server without startup window |
-| `-t TYPE, --type TYPE` | `sensapex` or `new_scale` or `new_scale_pathfinder` | `sensapex` | Select manipulator type |
-| `-p PORT, --port PORT` | Valid HTTP port number | `8081` | HTTP port to serve on |
-| `--pathfinder_port` | Valid HTTP port number | `8080` | HTTP port Pathfinder's server is running on |
-| `-s [SERIAL], --serial [SERIAL]` | Serial port name (i.e. `COM3`) or empty | `no-e-stop` | Emergency stop serial port. Auto searches if no port specified |
-| `-d, --debug` | | | Enable verbose logging for debugging |
-| `--version` | | | Version number of server |
\ No newline at end of file
+as Ephys Link. New Scale manipulators should be connected to the Pathfinder software first and the Pathfinder HTTP server should be running.
\ No newline at end of file
diff --git a/source/pinpoint/tutorials/tutorial_ephys_link.md b/source/pinpoint/tutorials/tutorial_ephys_link.md
index 62ac1d7..bd5c54d 100644
--- a/source/pinpoint/tutorials/tutorial_ephys_link.md
+++ b/source/pinpoint/tutorials/tutorial_ephys_link.md
@@ -4,11 +4,11 @@ Pinpoint can be connected to electrophysiology manipulators
enabling experimenters to automate the placement of manipulators as well as
observe live where probes are placed inside the mouse brain.
-We currently (July 2023) support Sensapex uMp-4 and New Scale 3-axis
-manipulators.
+**In this tutorial you will learn how to:**
-**These features are only available on the Windows Desktop build of Pinpoint**
-they will not run in the web browser.
+1. [Configure and launch Ephys Link](configure-and-launch-ephys-link)
+2. [Connect to the server from Pinpoint](ephys-link-connection)
+3. [Mirror the positions of _in vivo_ probes in Pinpoint](ephys-link-mirror-probes)
[//]: # (**If you would like to use beta version of)
@@ -18,19 +18,71 @@ they will not run in the web browser.
[//]: # (.**)
-To enable this feature, an instance of an Ephys Link server must be running on
-the local network. Please see the
-instructions [here](https://virtualbrainlab.org/ephys_link/installation_and_use.html#installation)
-on how to install and run a server.
+[//]: # (To enable this feature, an instance of an Ephys Link server must be running on)
-
-
-
-
+[//]: # (the local network. Please see the)
-## Connecting to a server
+[//]: # (instructions [here](https://virtualbrainlab.org/ephys_link/installation_and_use.html#installation))
-![Connecting to Ephys Link](../../_static/images/Ephys-Link-connection.png)
+[//]: # (on how to install and run a server.)
+
+[//]: # ()
+
+[//]: # ()
+
+[//]: # ( )
+
+[//]: # (
)
+
+[//]: # (
)
+
+(configure-and-launch-ephys-link)=
+## 1. Configure and Launch Ephys Link
+
+### Install Ephys Link
+
+First, install Ephys Link. Follow the instructions on
+the [installation page](https://virtualbrainlab.org/ephys_link/installation_and_use.html#installation).
+We recommend most users install
+the [standalone executable](https://virtualbrainlab.org/ephys_link/installation_and_use.html#install-as-standalone-executable).
+
+### Launch Ephys Link
+
+With the executable downloaded, simply double-click the executable file to
+launch
+the configuration window.
+
+![Ephys Link configuration window](../../_static/images/tutorial/ephys_link/ephys_link_launch.png)
+
+### Configuring Ephys Link
+
+You can configure the server using the configuration window. All changes are
+preserved for future launches.
+
+- **Serving Settings**
+ - **IP:** the local IP address of the computer running the server. If
+ Pinpoint
+ is running on the same computer as Ephys Link, `localhost` will work as
+ the IP. Otherwise, copy this address to Pinpoint.
+ - **Port:** the port number that the server will listen on. Also copy this
+ to
+ Pinpoint.
+- **Platform Type:** Select the appropriate manipulator platform for your setup.
+- **Pathfinder Settings:** If you are using New Scale's Pathfinder MPM Control
+ software to control your manipulators, please enable the HTTP server and
+ specify the port number here (it should be 8080 by default).
+- **Emergency Stop Settings:** If you are using the Arduino hardware stop
+ button, please specify the serial port. An empty value will be used to
+ automatically detect the port and a value of `no-e-stop` will disable this
+ feature.
+
+Press "Launch Server" to save your configuration and start the server. The
+configuration window will close and the server will use the console window.
+
+(ephys-link-connection)=
+## 2. Connect to Ephys Link from Pinpoint
+
+![Connecting to Ephys Link](../../_static/images/tutorial/ephys_link/ephys_link_connection.png)
1. Press \[ESC\] to open the settings menu
2. Switch to the "Ephys Link" tab
@@ -41,19 +93,20 @@ on how to install and run a server.
configuration of manipulators and linking them to probes in the scene.
7. Press \[ESC\] again to close the settings menu
-## Linking a probe in the planner to a manipulator _in vivo_
+(ephys-link-mirror-probes)=
+## 3. Mirror the Positions of _in vivo_ Probes in Pinpoint
This step is not required for New Scale Pathfinder connections. See below
for details.
-![Connect a probe to a manipulator](../../_static/images/Ephys-Link-connect-probe.png)
+![Connect a probe to a manipulator](../../_static/images/tutorial/ephys_link/ephys_link_connect_probe.png)
1. Spawn the corresponding probe in the planner scene.
2. Press \[ESC\] to open the settings menu.
3. Switch to the "Ephys Link" tab.
4. Scroll down to the panel that represents the _in vivo_ manipulator.
-5. Use the dropdown to configure the manipulator's handedness. Currently (July
- 2023), configuration is necessary for Sensapex uMp manipulators only.
+5. Use the dropdown to configure the manipulator's handedness. As of July
+ 2023 configuration is necessary for Sensapex uMp manipulators only.
Configuration is hidden for New Scale manipulators. See the section below for
more information.
6. Use the dropdown to select a probe to link to this manipulator. Probes are
@@ -73,6 +126,9 @@ for details.
back to their zero coordinate.
10. Press \[ESC\] again to close the settings menu.
+At this point, the _in vivo_ probe positions should be mirrored in Pinpoint in
+real time.
+
### Sensapex Handedness
Handedness determines the orientation of the manipulator and which
@@ -85,15 +141,15 @@ determine the handedness of your manipulator.
![Sensapex handedness](../../_static/images/tutorial/sensapex_manipulators.png)
-### New Scale Pathfinder connections do not require configuration
+### New Scale Pathfinder MPM connections do not require configuration
Launching Ephys Link requires specifying the type of manipulator that is being
used. Configuration in Pinpoint will differ depending on the type of
manipulator. **New Scale Pathfinder connections do not require any
configuration** in Pinpoint as all manipulators are configured in Pathfinder.
Pinpoint will automatically create probes (colored in magenta) for
-each manipulator from Pathfinder and automatically echo their positions and
-angles.
+each manipulator from Pathfinder and automatically echo their positions,
+angles, and shank count.
## Enabling experiment automation (Ephys Copilot)