X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FShooter.java;fp=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FShooter.java;h=0c58ba32bb7605bc5a5e0d8c6c1addd6aebcaf52;hb=3a86b1a511ebbed2d97a8f33092e22599d675d24;hp=d786d22cf5120e6ff680d6c017256ba8c487bd44;hpb=366f1cfd9d6ad65174100145464e01b7e8d984d1;p=3501%2F2017steamworks diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index d786d22..0c58ba3 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java @@ -11,7 +11,7 @@ public class Shooter extends Subsystem { public double wheelP = 0, wheelI = 0, wheelD = -0; private static Shooter shooter; private static HallEffectSensor hallEffect; - private final CANTalon flyWheel, indexWheel; + private final CANTalon flyWheel1, flyWheel2, indexWheel; public static final double DEFAULT_INDEXING_SPEED = 0; public static final double DEFAULT_SHOOTING_SPEED = 0; @@ -20,7 +20,8 @@ public class Shooter extends Subsystem { public static final double SHOOTING_SPEED_INCREMENT = 0; private Shooter() { - flyWheel = new CANTalon(Constants.Shooter.FLY_WHEEL); + flyWheel1 = new CANTalon(Constants.Shooter.FLY_WHEEL1); + flyWheel2 = new CANTalon(Constants.Shooter.FLY_WHEEL2); indexWheel = new CANTalon(Constants.Shooter.INDEX_WHEEL); hallEffect = new HallEffectSensor(Constants.Shooter.HALL_EFFECT_PORT, 1); @@ -49,14 +50,16 @@ public class Shooter extends Subsystem { * motor value from -1 to 1(fastest forward) */ public void setFlyWheelMotorVal(final double val) { - flyWheel.set(val); + flyWheel1.set(val); + flyWheel2.set(val); } /** * Stops fly wheel motor. */ public void stopFlyWheel() { - flyWheel.set(0); + flyWheel1.set(0); + flyWheel2.set(0); } /**