X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FShooter.java;h=c613d7bb3abac19cee35dcf4f2969319de71d1e3;hb=f8bfcc62a43e76e355b581152ef9710c2fb8cd58;hp=8649045aa2d8119e5ff9a173ed1030d7d96a74b7;hpb=571a0e2a38e69a5f69c0a725d1da6600e67e9afb;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 8649045a..c613d7bb 100755
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -1,7 +1,6 @@
 package org.usfirst.frc.team3501.robot.subsystems;
 
 import org.usfirst.frc.team3501.robot.Constants;
-import org.usfirst.frc.team3501.robot.sensors.Photogate;
 
 import edu.wpi.first.wpilibj.DoubleSolenoid;
 import edu.wpi.first.wpilibj.command.Subsystem;
@@ -18,8 +17,6 @@ import edu.wpi.first.wpilibj.command.Subsystem;
 
 public class Shooter extends Subsystem {
   private DoubleSolenoid catapult1, catapult2;
-  private Photogate photogate;
-  private boolean usePhotoGate;
 
   public Shooter() {
     catapult1 = new DoubleSolenoid(Constants.Shooter.CATAPULT1_MODULE,
@@ -28,22 +25,6 @@ public class Shooter extends Subsystem {
     catapult2 = new DoubleSolenoid(Constants.Shooter.CATAPULT2_MODULE,
         Constants.Shooter.CATAPULT2_FORWARD,
         Constants.Shooter.CATAPULT2_REVERSE);
-    usePhotoGate = false;
-  }
-
-  /***
-   * This method checks to see if the ball has successfully passed through the
-   * intake rollers and is inside.
-   * 
-   * @return whether the presence of the ball is true or false and returns the
-   *         state of the condition (true or false).
-   */
-
-  public boolean isBallInside() {
-    if (usePhotogate())
-      return photogate.isBallPresent();
-    else
-      return true;
   }
 
   // Catapult Commands
@@ -57,14 +38,6 @@ public class Shooter extends Subsystem {
     catapult2.set(Constants.Shooter.reset);
   }
 
-  public boolean usePhotogate() {
-    return this.usePhotoGate;
-  }
-
-  public void togglePhotoGate() {
-    this.usePhotoGate = !this.usePhotoGate;
-  }
-
   @Override
   protected void initDefaultCommand() {
   }