From ee0d835304086cab0bb86522075c9e6e892a4fe8 Mon Sep 17 00:00:00 2001 From: Brad Miller Date: Thu, 18 Dec 2014 18:28:15 -0500 Subject: [PATCH] Remove an extra constructor from a bad merge Change-Id: I0475eef143814ebf8ee4ec71a019872420442c4f --- .../src/main/java/edu/wpi/first/wpilibj/CANTalon.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANTalon.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANTalon.java index b1d2542e30..f837746b8e 100644 --- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANTalon.java +++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/CANTalon.java @@ -103,16 +103,6 @@ public class CANTalon implements MotorSafety, PIDOutput, SpeedController { setProfile(m_profile); applyControlMode(ControlMode.PercentVbus); } - public CANTalon(int deviceNumber,int controlPeriodMs) { - m_deviceNumber = deviceNumber; - m_impl = new CanTalonSRX(deviceNumber,controlPeriodMs); /* bound period to be within [1 ms,95 ms] */ - m_safetyHelper = new MotorSafetyHelper(this); - m_controlEnabled = true; - m_profile = 0; - m_setPoint = 0; - setProfile(m_profile); - changeControlMode(ControlMode.PercentVbus); - } @Override public void pidWrite(double output)