diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/RobotMap.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/RobotMap.java index c355cee..075c9f6 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/RobotMap.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/RobotMap.java @@ -27,10 +27,9 @@ public class RobotMap { //Climber Motors - public static final int CLIMBER_CAN_ID = 10; - public static final int CLIMBER_WHEEL1_ID = 9; - public static final int CLIMBER_WHEEL2_ID = 11; - public static final int CLIMBER_RATCHET_ID = 12; + public static final int CLIMBER_CAN_ID = 11; + public static final int CLIMBER_WHEEL1_ID = 12; + public static final int CLIMBER_WHEEL2_ID = 13; // Pneumatics diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java index bd37efd..f88dd67 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java @@ -57,7 +57,6 @@ public class Climber extends Subsystem{ climberBack = new WPI_TalonSRX(RobotMap.CLIMBER_CAN_ID); climberFront = new WPI_TalonSRX(RobotMap.CLIMBER_WHEEL1_ID); climberFront2 = new WPI_TalonSRX(RobotMap.CLIMBER_WHEEL2_ID); - flipOutMotor = new WPI_TalonSRX(RobotMap.CLIMBER_RATCHET_ID); climberFront2.set(ControlMode.Follower, climberFront.getDeviceID()); climberBack.configForwardLimitSwitchSource(limitSwitchSource, LimitSwitchNormal.NormallyOpen, 0);