From d5498c9f699d654fbb0bf00ddcd837eea8bcc78e Mon Sep 17 00:00:00 2001 From: Rohan Rodrigues Date: Wed, 8 Mar 2017 16:58:12 -0800 Subject: [PATCH] Fix conflict in Shooter --- .../frc/team3501/robot/subsystems/Shooter.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index 445584a..820bc6a 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java @@ -177,20 +177,4 @@ public class Shooter extends Subsystem { } return false; } - - public Value getPistonValue() { - return piston.get(); - } - - public void setHighGear() { - changeGear(Constants.Shooter.HIGH_GEAR); - } - - public void setLowGear() { - changeGear(Constants.Shooter.LOW_GEAR); - } - - private void changeGear(DoubleSolenoid.Value gear) { - piston.set(gear); - } } -- 2.30.2