X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FShooter.java;h=0d9187a441b6a734e4fc0e61ef3d848a7034d16f;hp=3633c04ca10e2fea9e5c63a656427a86642eaea1;hb=c63ba9b9649deb7b4441f318a578c638cb26ebb9;hpb=786a78c72aa11ff2c03ca170aaf24f5999a3feee diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index 3633c04c..0d9187a4 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java @@ -2,6 +2,7 @@ package org.usfirst.frc.team3501.robot.subsystems; import org.usfirst.frc.team3501.robot.Constants; import org.usfirst.frc.team3501.robot.sensors.Lidar; +import org.usfirst.frc.team3501.robot.sensors.Photogate; import edu.wpi.first.wpilibj.CANTalon; import edu.wpi.first.wpilibj.CounterBase.EncodingType; @@ -24,6 +25,7 @@ public class Shooter extends Subsystem { private DoubleSolenoid hood1, hood2, punch; private Encoder encoder; private Lidar lidar; + private Photogate photogate; public Shooter() { shooter = new CANTalon(Constants.Shooter.PORT); @@ -47,7 +49,7 @@ public class Shooter extends Subsystem { */ public boolean isBallInside() { - return true; + return photogate.isBallPresent(); } public void setSpeed(double speed) {