From 04227dc08047e7c2902515867c2c685aeebf68f0 Mon Sep 17 00:00:00 2001 From: shainachen Date: Sat, 14 Jan 2017 14:54:43 -0800 Subject: [PATCH] Delete unneeded methods in Shooter --- .../team3501/robot/subsystems/Shooter.java | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index f22a188..06073a7 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java @@ -1,12 +1,25 @@ package org.usfirst.frc.team3501.robot.subsystems; -public class Shooter { +import org.usfirst.frc.team3501.robot.Constants; + +import com.ctre.CANTalon; + +import edu.wpi.first.wpilibj.command.Subsystem; + +public class Shooter extends Subsystem { private static Shooter shooter; + private final CANTalon flyWheel, indexWheel; private Shooter() { - + flyWheel = new CANTalon(Constants.Shooter.FLY_WHEEL); + indexWheel = new CANTalon(Constants.Shooter.INDEX_WHEEL); } + /** + * Returns shooter object + * + * @return Shooter object + */ public static Shooter getShooter() { if (shooter == null) { shooter = new Shooter(); @@ -15,24 +28,41 @@ public class Shooter { } /** - * Stops fly wheel + * Sets fly wheel motor value to input. + * + * @param val + * motor value from -1 to 1(fastest forward) */ - public void stopFlywheel() { - + public void setFlyWheelMotorVal(final double val) { + flyWheel.set(val); } - public void setFlyWheelMotorVal(final double val) { + /** + * Stops fly wheel motor. + */ + public void stopFlyWheel() { + flyWheel.set(0); + } + /** + * Sets index wheel motor value to input. + * + * @param val + * motor value from -1 to 1(fastest forward) + */ + public void setIndexWheelMotorVal(final double val) { + indexWheel.set(val); } /** - * Stops index wheel + * Stops index wheel motor. */ public void stopIndexWheel() { - + indexWheel.set(0); } - public void setIndexWheelMotorVal(final double val) { + @Override + protected void initDefaultCommand() { } } -- 2.30.2