From 1582effab9916acddafddb475cea712314f273f2 Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Wed, 6 Nov 2024 19:15:57 -0800 Subject: [PATCH 1/2] Update more CTRE links Update Pigeon code examples for Phoenix 6 --- .../hardware-apis/sensors/gyros-software.rst | 12 +++--------- .../resources/using-the-compressor-in-labview.rst | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/source/docs/software/hardware-apis/sensors/gyros-software.rst b/source/docs/software/hardware-apis/sensors/gyros-software.rst index 51827c21b9..a94aa2829d 100644 --- a/source/docs/software/hardware-apis/sensors/gyros-software.rst +++ b/source/docs/software/hardware-apis/sensors/gyros-software.rst @@ -127,22 +127,16 @@ The navX uses the :code:`AHRS` class. See the [navX documentation](https://pdoc ## Pigeon -The Pigeon should use the :code:`WPI_PigeonIMU` class. The Pigeon can either be connected with CAN or by data cable to a TalonSRX. The [Pigeon IMU User's Guide](https://store.ctr-electronics.com/content/user-manual/Pigeon%20IMU%20User's%20Guide.pdf) contains full details on using the Pigeon. +The Pigeon should use the :code:`Pigeon2` class. The Pigeon can either be connected with CAN or by data cable to a TalonSRX. The [Pigeon IMU User's Guide](https://ctre.download/files/user-manual/Pigeon2%20User's%20Guide.pdf) contains full details on using the Pigeon. .. tab-set-code:: ```java - WPI_PigeonIMU gyro = new WPI_PigeonIMU(0); // Pigeon is on CAN Bus with device ID 0 - // OR (choose one or the other based on your connection) - TalonSRX talon = new TalonSRX(0); // TalonSRX is on CAN Bus with device ID 0 - WPI_PigeonIMU gyro = new WPI_PigeonIMU(talon); // Pigeon uses the talon created above + private final Pigeon2 pidgey = new Pigeon2(1, "rio"); // Pigeon is on roboRIO CAN Bus with device ID 1 ``` ```c++ - WPI_PigeonIMU gyro{0}; // Pigeon is on CAN Bus with device ID 0 - // OR (choose one or the other based on your connection) - TalonSRX talon{0}; // TalonSRX is on CAN Bus with device ID 0 - WPI_PigeonIMU gyro{talon}; // Pigeon uses the talon created above + ctre::phoenix6::hardware::Pigeon2 pidgey{1, "rio"}; // Pigeon is on roboRIO CAN Bus with device ID 1 ``` ```python diff --git a/source/docs/software/labview/resources/using-the-compressor-in-labview.rst b/source/docs/software/labview/resources/using-the-compressor-in-labview.rst index 2fc3c4f77d..8be71122e2 100644 --- a/source/docs/software/labview/resources/using-the-compressor-in-labview.rst +++ b/source/docs/software/labview/resources/using-the-compressor-in-labview.rst @@ -6,7 +6,7 @@ For more information, check out the following links: :download:`FRC Pneumatics Manual ` -[PCM User's Guide](https://store.ctr-electronics.com/content/user-manual/PCM%20User%27s%20Guide.pdf) +[PCM User's Guide](https://ctre.download/files/user-manual/PCM%20User's%20Guide.pdf) [Pneumatics Step by Step for the roboRIO](http://team358.org/files/pneumatic/Pneumatics-StepByStep-roboRIO.pdf) From 64848a23f8fdda782aef870d802a9ce8b8319cf0 Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Thu, 7 Nov 2024 17:26:52 -0800 Subject: [PATCH 2/2] Pigeon 2 Co-authored-by: Jason Daming --- source/docs/software/hardware-apis/sensors/gyros-software.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/docs/software/hardware-apis/sensors/gyros-software.rst b/source/docs/software/hardware-apis/sensors/gyros-software.rst index a94aa2829d..f15d66151f 100644 --- a/source/docs/software/hardware-apis/sensors/gyros-software.rst +++ b/source/docs/software/hardware-apis/sensors/gyros-software.rst @@ -125,7 +125,7 @@ The navX uses the :code:`AHRS` class. See the [navX documentation](https://pdoc self.gyro = navx.AHRS(SPI.Port.kMXP) ``` -## Pigeon +## Pigeon 2 The Pigeon should use the :code:`Pigeon2` class. The Pigeon can either be connected with CAN or by data cable to a TalonSRX. The [Pigeon IMU User's Guide](https://ctre.download/files/user-manual/Pigeon2%20User's%20Guide.pdf) contains full details on using the Pigeon.