X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FShooter.java;h=c3500e2ba27b644e309823556e7a45cfbdbddd1b;hb=fee6b62e5434872f8f10c74874179a45e697205e;hp=95d69af9358eb7f59041255c0a993272400ddb38;hpb=e062fd0698aa9583dd007f3a3759dd2adc9d2010;p=3501%2Fstronghold-2016 diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index 95d69af9..c3500e2b 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java @@ -3,6 +3,7 @@ package org.usfirst.frc.team3501.robot.subsystems; import org.usfirst.frc.team3501.robot.Constants; import edu.wpi.first.wpilibj.DoubleSolenoid; +import edu.wpi.first.wpilibj.DoubleSolenoid.Value; import edu.wpi.first.wpilibj.command.Subsystem; /*** @@ -10,9 +11,9 @@ import edu.wpi.first.wpilibj.command.Subsystem; * motors. The piston controlling the platform pushes the ball onto the wheel. * The wheel is controlled by a motor, which is running before the ball is * pushed onto the wheel. The spinning wheel propels the ball. - * + * * @author superuser - * + * */ public class Shooter extends Subsystem { @@ -38,6 +39,14 @@ public class Shooter extends Subsystem { catapult2.set(Constants.Shooter.RESET); } + public Value getCatapult1State() { + return catapult1.get(); + } + + public Value getCatapult2State() { + return catapult2.get(); + } + @Override protected void initDefaultCommand() { }