Merge branch 'master' into patch-1

PhotonVision · Feb 28, 2024 · 9fca0d1 · 9fca0d1
2 parents d86d910 + 7c3e89e
commit 9fca0d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/source/conf.py b/source/conf.py
@@ -17,7 +17,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'PhotonVision'
-copyright = '2023, PhotonVision'
+copyright = '2024, PhotonVision'
 author = 'Banks Troutman, Matt Morley'
 
 # -- General configuration ---------------------------------------------------

diff --git a/source/docs/troubleshooting/networking-troubleshooting.rst b/source/docs/troubleshooting/networking-troubleshooting.rst
@@ -19,8 +19,8 @@ A few issues make up the majority of support requests. Run through this checklis
    - Raspberry Pi devices (including Pi 3, Pi 4, CM3 and CM4) should be flashed using the Raspberry Pi image (eg, `photonvision-v2024.2.8-linuxarm64_RaspberryPi.img.xz`).
    - Orange Pi 5 devices should be flashed using the Orange Pi 5 image (eg, `photonvision-v2024.2.8-linuxarm64_orangepi5.img.xz`).
    - Orange Pi 5+ devices should be flashed using the Orange Pi 5+ image (eg, `photonvision-v2024.2.8-linuxarm64_orangepi5plus.img.xz`).
-- Is your robot code using a **2023** version of WPILib, and is your coprocessor using the most up to date **2023** release?
-   - 2022 and 2023 versions of either cannot be mix-and-matched!
+- Is your robot code using a **2024** version of WPILib, and is your coprocessor using the most up to date **2024** release?
+   - 2022, 2023 and 2024 versions of either cannot be mix-and-matched!
    - Your PhotonVision version can be checked on the :ref:`settings tab<docs/settings:settings>`.
 - Is your team number correctly set on the :ref:`settings tab<docs/settings:settings>`?
 
@@ -41,7 +41,7 @@ Please check that:
 1. You don't have the NetworkTables Server on (toggleable in the settings tab). Turn this off when doing work on a robot.
 2. You have your team number set properly in the settings tab.
 3. Your camera name in the ``PhotonCamera`` constructor matches the name in the UI.
-4. You are using the 2023 version of WPILib and RoboRIO image.
+4. You are using the 2024 version of WPILib and RoboRIO image.
 5. Your robot is on.
 
 If all of the above are met and you still have issues, feel free to :ref:`contact us <index:contact us>` and provide the following information: