finish merge

CamDavidsonPilon · CamDavidsonPilon · commit d40be1280a78 · 2025-05-02T13:37:27.000-04:00
diff --git a/user-guide/00-introduction.md b/user-guide/00-introduction.md
@@ -28,8 +28,8 @@ If you are interested in the software internals, take a look at our [developer g
 2. Ask a question on our [community forums](https://forum.pioreactor.com/)
 2. Contact us at support@pioreactor.com
 
+-----
 
 ### Compliance
 
  - [EU Declaration of Conformity](https://cdn.shopify.com/s/files/1/0678/1739/files/EU_Declaration_of_Conformity.pdf?v=1745430430)
- -
diff --git a/user-guide/03-Extending your Pioreactor/04-Experiment Profiles/02-create-edit-experiment-profiles.md b/user-guide/03-Extending your Pioreactor/04-Experiment Profiles/02-create-edit-experiment-profiles.md
@@ -192,7 +192,7 @@ pioreactors:
           - type: update
             hours_elapsed: 12
             options:
-              target_rpm: ${{ worker1:stirring:target_rpm + worker1:od_reading:od1.od * 10 }}
+              target_rpm: ${{ worker1:stirring:target_rpm + worker1:od_reading:od2.od * 10 }}
 ```
 
 
@@ -228,7 +228,7 @@ common:
           hours_elapsed: 6
           if: ${{ ::stirring:target_rpm <= 500 }}
           options:
-            target_rpm: ${{ ::stirring:target_rpm + 10 * ::od_reading:od1.od }}
+            target_rpm: ${{ ::stirring:target_rpm + 10 * ::od_reading:od2.od }}
 ```
 
 ### Built-in functions in expressions
@@ -297,7 +297,7 @@ common:
     dosing_automation:
       actions:
         - type: when
-          condition: ${{::od_reading:od1.od > 2.0}}
+          condition: ${{::od_reading:od2.od > 2.0}}
           hours_elapsed: 0
           actions:
             - type: start
@@ -353,7 +353,7 @@ Finally, there is more control using the other optional fields:
        - type: repeat
          hours_elapsed: 6.0
          repeat_every_hours: 0.0025 # every 9 seconds
-         while: ${{ worker1:od_reading:od1.od > 3.0 }}
+         while: ${{ worker1:od_reading:od2.od > 3.0 }}
          actions:
            - type: start
              options:
@@ -363,7 +363,7 @@ Finally, there is more control using the other optional fields:
        - type: repeat
          hours_elapsed: 6.0
          repeat_every_hours: 0.0025 # every 9 seconds
-         while: ${{ worker1:od_reading:od1.od > 3.0 }}
+         while: ${{ worker1:od_reading:od2.od > 3.0 }}
          actions:
            - type: start
              options:
@@ -386,12 +386,12 @@ common:
       actions:
         - type: update
           hours_elapsed: 12.0
-          if: ${{ ::od_reading:od1.od < od_threshold }}
+          if: ${{ ::od_reading:od2.od < od_threshold }}
           options:
             target_temperature: ${{ stationary_phase_temp }}
         - type: update
           hours_elapsed: 12.0
-          if: ${{ ::od_reading:od1.od >= od_threshold }}
+          if: ${{ ::od_reading:od2.od >= od_threshold }}
           options:
             target_temperature: ${{ growth_phase_temp }}
 
diff --git a/user-guide/30-Advanced/07-remote-access/01-introduction.md b/user-guide/30-Advanced/07-remote-access/01-introduction.md
@@ -8,11 +8,10 @@ slug: /remote-access
 
 The Pioreactor connects to your local network, and the UI is hosted locally on the Raspberry Pi. _A priori_, there's no access to view the UI from outside your local network (this is a good thing for security reasons). Let's change that.
 
-With some extra free services, we can safely connect to our Pioreactor cluster remotely. We've documented `2` ways to do this. Both require [command-line access](/user-guide/accessing-raspberry-pi) to the leader Pioreactor and some external services.
+With some extra free services, we can safely connect to our Pioreactor cluster remotely. We've documented `1` ways to do this. Both require [command-line access](/user-guide/accessing-raspberry-pi) to the leader Pioreactor and some external services.
 
 
- - [Option 1: Ngrok](/user-guide/ngrok-remote-access). Remotely access your UI behind a simple username / password.
- - [Option 2: Tailscale](/user-guide/tailscale-remote-access). Spin up a simple VPN, and expose your UI to users of your VPN. Also allows for Pioreactors in _different locations_ to be used together over the VPN.
+ - [Option 1: Tailscale](/user-guide/tailscale-remote-access). Spin up a simple VPN, and expose your UI to users of your VPN. Also allows for Pioreactors in _different locations_ to be used together over the VPN.
 
 
 ## Security
diff --git a/user-guide/30-Advanced/07-remote-access/02-ngrok.md b/user-guide/30-Advanced/07-remote-access/02-ngrok.md
diff --git a/user-guide/30-Advanced/07-remote-access/03-tailscale.md b/user-guide/30-Advanced/07-remote-access/03-tailscale.md
@@ -7,7 +7,7 @@ slug: /tailscale-remote-access
 Unlike using Ngrok, this method does not expose your UI to the public internet. To access the UI remotely, you need to join an authenticated VPN. This greatly improves security, but adds a bit of additional work for users.
 
 :::info
-Tailscale is a really really cool service! You may find yourself using it for other projects, too.
+Tailscale is a really cool service! You may find yourself using it for other projects, too.
 :::
 
 
@@ -17,20 +17,17 @@ Tailscale is a really really cool service! You may find yourself using it for ot
 4. [SSH into your leader Pioreactor](/user-guide/accessing-raspberry-pi). Install Tailscale for Raspberry Pi with the following: `curl -fsSL https://tailscale.com/install.sh | sh`. You don't need to install anything on the workers.
 5. Back in your [Tailscale admin](https://login.tailscale.com/admin/machines), you should see two machines: your computer and the leader Pioreactor. Make note of the ipv4 address for the leader - we will use it below.
 6. You should still be able to access `http://pioreactor.local` without any problems.
-8. In your config.ini, add your ipv4 address to the `[mqtt]` section:
-   ```
-   [mqtt]
-   ...
-   broker_address=<ipv4 address>
-   ...
-   ```
-
-   If you have other Pioreactors in your cluster: you likely won't be adding those to tailscale (only adding the leader is necessary for remote access), so in each of the worker config files, add:
-   ```
-   [mqtt]
-   broker_address=<leader name>.local
-   ```
-   And save. This means that your workers will connect "locally" (over the local network), but the UI  will connect "remotely".
+8. 1. In your **shared config.ini**, add your ipv4 address to the `[mqtt]` section:
+      ```
+      broker_address=<ipv4 address>
+      ```
+   2. If you have other Pioreactors in your cluster: you likely won't be adding those to tailscale (only adding the leader is necessary for remote access), so in each of the **workers' config** files, add the new `[mqtt]` section like so:
+      ```
+      [mqtt]
+      broker_address=<leader name>.local
+      ```
+      And save. This means that your workers will connect "locally" (over the local network), but the UI  will connect "remotely".
+   3. Your **leader's config** file should stay the same (confirm it's `localhost`)
 
 7. Now, when you leave the local network, and if you have internet access, you can turn your VPN on and still access `http://<ipv4 address>`. Troubleshooting: try `http://<hostname>`, but confirm that magicDNS is on, too.
 8. You can use the Tailscale admin to add users to your VPN, too.
diff --git a/user-guide/50-Troubleshooting/UI troubleshooting.md b/user-guide/50-Troubleshooting/UI troubleshooting.md
@@ -46,7 +46,7 @@ Another reason might be that your institution's firewall is blocking port 9001.
 
 :::
 
-#### If you are using a remote access service, like ngrok or tailscale
+#### If you are using a remote access service, like tailscale
 
 Likely you didn't fill out the `mqtt` `broker_address` parameter in the configuration correctly. See the [remote access instructions](https://docs.pioreactor.com/user-guide/remote-access) again.
 
