From 47140f21b200d519ba2ed5f9c80ca19c26a5739a Mon Sep 17 00:00:00 2001 From: Cindy Zhang Date: Thu, 9 Feb 2017 19:51:44 -0800 Subject: [PATCH] fix bugs --- src/org/usfirst/frc/team3501/robot/Constants.java | 4 ---- .../frc/team3501/robot/commands/climber/ToggleWinch.java | 2 +- src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index 2028274..c2fbf7b 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -57,15 +57,11 @@ public class Constants { public static final int ENCODER_RIGHT_B = 3; public static final SPI.Port GYRO_PORT = SPI.Port.kOnboardCS0; - - public final static int TRIGGER_DRIVE_PORT = 0; } public static class Intake { public static final int INTAKE_ROLLER_PORT = 8; - public final static int HOLD_INTAKE_PORT = 0; - } public static enum Direction { diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/ToggleWinch.java b/src/org/usfirst/frc/team3501/robot/commands/climber/ToggleWinch.java index 3e60406..66c8364 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/climber/ToggleWinch.java +++ b/src/org/usfirst/frc/team3501/robot/commands/climber/ToggleWinch.java @@ -34,7 +34,7 @@ public class ToggleWinch extends Command { @Override protected boolean isFinished() { - return false; + return Robot.getOI().toggleWinch.get(); } @Override diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java index ad2c263..566200e 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java @@ -57,7 +57,7 @@ public class DriveTrain extends Subsystem { private boolean isClimbing; private static double CLIMBER_SPEED;; - public boolean shouldBeClimbing; + public boolean shouldBeClimbing = false; private DriveTrain() { -- 2.30.2