From e36ea8639549381f44668601f9c86b95626be6c8 Mon Sep 17 00:00:00 2001 From: Meryem Esa Date: Wed, 10 Feb 2016 19:34:35 -0800 Subject: [PATCH] get rid of lidar variables and code that conflicted with lidar variables already initiated in master --- .../frc/team3501/robot/subsystems/Shooter.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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() { -- 2.30.2