From 59f938b584d91f0c5f494d2d898eac36038f852f Mon Sep 17 00:00:00 2001 From: Rohit Vighne Date: Thu, 11 Jan 2018 22:16:42 -0800 Subject: [PATCH] Invert when getting motor speed in SpeedControllerGroup (#886) --- wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp | 2 +- .../main/java/edu/wpi/first/wpilibj/SpeedControllerGroup.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp b/wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp index dc1c8877a0..4eafcdea51 100644 --- a/wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp +++ b/wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp @@ -19,7 +19,7 @@ void SpeedControllerGroup::Set(double speed) { double SpeedControllerGroup::Get() const { if (!m_speedControllers.empty()) { - return m_speedControllers.front().get().Get(); + return m_speedControllers.front().get().Get() * (m_isInverted ? -1 : 1); } return 0.0; } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SpeedControllerGroup.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SpeedControllerGroup.java index 0f08f42132..656c097d1f 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SpeedControllerGroup.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SpeedControllerGroup.java @@ -45,7 +45,7 @@ public class SpeedControllerGroup extends SendableBase implements SpeedControlle @Override public double get() { if (m_speedControllers.length > 0) { - return m_speedControllers[0].get(); + return m_speedControllers[0].get() * (m_isInverted ? -1 : 1); } return 0.0; }