fix bugs

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 20282740a75198a70f6551e0cdf421a661eed187..c2fbf7b121dc7e831d783cf066980d32eb0d4f05 100644 (file)
--- 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 3e60406cc66e332167c465d59dae56d08311b13f..66c8364b1a37e78bcf993b5d4414e29d172322a7 100644 (file)
--- 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 ad2c2635980a3bc532b5d79196ac848f7a7bb183..566200e6edf23cff6321b150475cc21db41662cf 100644 (file)
--- 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() {