From f3db582dbefd6e46ee60b0250c62cc22d7d6c885 Mon Sep 17 00:00:00 2001 From: shainachen Date: Sat, 14 Jan 2017 15:46:59 -0800 Subject: [PATCH] Implement stopFlyWheel and stopIndexWheel --- .../robot/commands/shooter/RunFlyWheelContinuous.java | 1 + .../robot/commands/shooter/RunIndexWheelContinuous.java | 1 + .../frc/team3501/robot/commands/shooter/StopFlyWheel.java | 6 ++++-- .../frc/team3501/robot/commands/shooter/StopIndexWheel.java | 6 ++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java index a5e8501..8a6e5be 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java @@ -52,6 +52,7 @@ public class RunFlyWheelContinuous extends Command { @Override protected boolean isFinished() { + // TODO return false; } diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java index aa2dbb2..2c24338 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java @@ -52,6 +52,7 @@ public class RunIndexWheelContinuous extends Command { @Override protected boolean isFinished() { + // TODO return false; } diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/StopFlyWheel.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/StopFlyWheel.java index 53fc35c..cbce005 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/shooter/StopFlyWheel.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/StopFlyWheel.java @@ -1,5 +1,7 @@ package org.usfirst.frc.team3501.robot.commands.shooter; +import org.usfirst.frc.team3501.robot.Robot; + import edu.wpi.first.wpilibj.command.Command; /** @@ -30,6 +32,7 @@ public class StopFlyWheel extends Command { // Called once after isFinished returns true @Override protected void end() { + Robot.getShooter().stopFlyWheel(); } // Called when another command which requires one or more of the same @@ -40,8 +43,7 @@ public class StopFlyWheel extends Command { @Override protected boolean isFinished() { - // TODO Auto-generated method stub - return false; + return true; } } diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/StopIndexWheel.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/StopIndexWheel.java index 4a04f4c..e878182 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/shooter/StopIndexWheel.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/StopIndexWheel.java @@ -1,5 +1,7 @@ package org.usfirst.frc.team3501.robot.commands.shooter; +import org.usfirst.frc.team3501.robot.Robot; + import edu.wpi.first.wpilibj.command.Command; /** @@ -29,6 +31,7 @@ public class StopIndexWheel extends Command { // Called once after isFinished returns true @Override protected void end() { + Robot.getShooter().stopIndexWheel(); } // Called when another command which requires one or more of the same @@ -39,8 +42,7 @@ public class StopIndexWheel extends Command { @Override protected boolean isFinished() { - // TODO Auto-generated method stub - return false; + return true; } } -- 2.30.2