X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fcommands%2Fintakearm%2FIntakeBall.java;fp=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fcommands%2Fintakearm%2FIntakeBall.java;h=7966c6144b730ecefc61dc9e87f0a076c84dd8f5;hb=68e554b243aad0de65f60658ff21ec893119d526;hp=8eda8dba52c2aaa1ea16920d9f54d665cc314803;hpb=c63ba9b9649deb7b4441f318a578c638cb26ebb9;p=3501%2Fstronghold-2016 diff --git a/src/org/usfirst/frc/team3501/robot/commands/intakearm/IntakeBall.java b/src/org/usfirst/frc/team3501/robot/commands/intakearm/IntakeBall.java index 8eda8dba..7966c614 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/intakearm/IntakeBall.java +++ b/src/org/usfirst/frc/team3501/robot/commands/intakearm/IntakeBall.java @@ -28,7 +28,7 @@ public class IntakeBall extends Command { @Override protected void initialize() { this.setTimeout(TIMEOUT_AMOUNT); - if (!Robot.photogate.isBallPresent()) + if (!Robot.shooter.isBallInside()) Robot.intakeArm.intakeBall(); } @@ -40,7 +40,7 @@ public class IntakeBall extends Command { @Override protected boolean isFinished() { - return (this.isTimedOut() || Robot.photogate.isBallPresent()); + return (this.isTimedOut() || Robot.shooter.isBallInside()); } @Override