From d0a3a99e6e2e593b189cea7842eee444153fc8e9 Mon Sep 17 00:00:00 2001 From: shainachen Date: Sat, 21 Jan 2017 17:00:10 -0800 Subject: [PATCH] Fix merging errors with climber subclass --- src/org/usfirst/frc/team3501/robot/Constants.java | 1 + .../robot/commands/climber/RunWinchContinuous.java | 10 ++++++++++ .../frc/team3501/robot/commands/climber/StopWinch.java | 2 -- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index af90000..0c4880e 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -20,6 +20,7 @@ public class Constants { public static final int FLY_WHEEL = 0; public static final int INDEX_WHEEL = 0; public final static int TOGGLE_WINCH_PORT = 0; + public final static int TOGGLE_FLYWHEEL_PORT = 0; public final static int TOGGLE_INDEXWHEEL_PORT = 0; diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java index a3e6f3f..8a76664 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java @@ -5,6 +5,7 @@ import org.usfirst.frc.team3501.robot.Robot; import edu.wpi.first.wpilibj.command.Command; /** +<<<<<<< HEAD * <<<<<<< HEAD <<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66 This command * runs the winch motor continuously at a specified speed until the button * triggering it is released. This command also makes the drive train motors run @@ -20,6 +21,15 @@ import edu.wpi.first.wpilibj.command.Command; * runs the drive train. >>>>>>> Delete StopWinch and Climber subsystem, edit * javadoc comments >>>>>>> Delete StopWinch and Climber subsystem, edit javadoc * comments +======= + * <<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66 This command runs the winch + * motor continuously at a specified speed until the button triggering it is + * released. This command also makes the drive train motors run because the + * winch is controlled by the drive train. ======= This command will run the + * winch motor continuously until the button triggering it is released. This + * command also runs the drive train. >>>>>>> Delete StopWinch and Climber + * subsystem, edit javadoc comments +>>>>>>> Fix merging errors with climber subclass * * pre-condition: This command must be run by a button in OI. The robot must be * attached to the rope. diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java index 45ae19e..0924614 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java +++ b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java @@ -13,10 +13,8 @@ import edu.wpi.first.wpilibj.command.Command; public class StopWinch extends Command { public StopWinch() { - requires(Robot.getDriveTrain()); requires(Robot.getClimber()); - } @Override -- 2.30.2