From b1b03bed85ce61a7c0d08f9d8444ce64ff823811 Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Sun, 7 Jan 2024 17:06:26 -0800 Subject: [PATCH] [wpilib] Update MotorControllerGroup deprecation message (#6171) The current message could be read as encouraging the use of CAN motor controllers. This tries to make it more clear. --- .../native/include/frc/motorcontrol/MotorControllerGroup.h | 4 ++-- .../wpi/first/wpilibj/motorcontrol/MotorControllerGroup.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wpilibc/src/main/native/include/frc/motorcontrol/MotorControllerGroup.h b/wpilibc/src/main/native/include/frc/motorcontrol/MotorControllerGroup.h index 6ecfe99e24..6500fb3e2f 100644 --- a/wpilibc/src/main/native/include/frc/motorcontrol/MotorControllerGroup.h +++ b/wpilibc/src/main/native/include/frc/motorcontrol/MotorControllerGroup.h @@ -21,8 +21,8 @@ namespace frc { * Allows multiple MotorController objects to be linked together. */ class [[deprecated( - "Use CAN motor controller followers or " - "PWMMotorController::AddFollower()")]] MotorControllerGroup + "Use PWMMotorController::AddFollower() or if using CAN motor controllers," + "use their method of following.")]] MotorControllerGroup : public wpi::Sendable, public MotorController, public wpi::SendableHelper { diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/motorcontrol/MotorControllerGroup.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/motorcontrol/MotorControllerGroup.java index a499c3960d..c56496cd48 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/motorcontrol/MotorControllerGroup.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/motorcontrol/MotorControllerGroup.java @@ -12,8 +12,8 @@ import java.util.Arrays; /** * Allows multiple {@link MotorController} objects to be linked together. * - * @deprecated Use CAN motor controller followers or {@link - * PWMMotorController#addFollower(PWMMotorController)}. + * @deprecated Use {@link PWMMotorController#addFollower(PWMMotorController)} or if using CAN motor + * controllers, use their method of following. */ @SuppressWarnings("removal") @Deprecated(forRemoval = true, since = "2024")