From: Meryem Esa <meresa14@gmail.com>
Date: Thu, 11 Feb 2016 03:34:35 +0000 (-0800)
Subject: get rid of lidar variables and code that conflicted with lidar variables already... 
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=e36ea8639549381f44668601f9c86b95626be6c8

get rid of lidar variables and code that conflicted with lidar variables already initiated in master
---

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 98131673..40a227ce 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 edu.wpi.first.wpilibj.AnalogPotentiometer;
 import edu.wpi.first.wpilibj.CANTalon;
 import edu.wpi.first.wpilibj.CounterBase.EncodingType;
 import edu.wpi.first.wpilibj.DoubleSolenoid;
@@ -9,11 +10,10 @@ import edu.wpi.first.wpilibj.Encoder;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
 /***
- * The Shooter consists of a platform and wheel, each controlled by
- * separate 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.
+ * The Shooter consists of a platform and wheel, each controlled by separate
+ * 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
  *
@@ -26,6 +26,8 @@ public class Shooter extends Subsystem {
   private Lidar lidar;
 
   public Shooter() {
+    leftLidar = new AnalogPotentiometer(0);
+    rightLidar = new AnalogPotentiometer(0);
     shooter = new CANTalon(Constants.Shooter.PORT);
     hood = new DoubleSolenoid(Constants.Shooter.HOOD_FORWARD,
         Constants.Shooter.HOOD_REVERSE);
@@ -83,8 +85,8 @@ public class Shooter extends Subsystem {
     punch.set(Constants.Shooter.retract);
   }
 
-  public boolean isHoodOpen() {
-    return hood.get() == Constants.Shooter.open;
+  @Override
+  protected void initDefaultCommand() {
   }
 
   public void openHood() {