From 58bcc21d7c4eb795cd976b38511b99bca59dac6b Mon Sep 17 00:00:00 2001 From: Cindy Zhang Date: Sat, 18 Feb 2017 11:44:37 -0800 Subject: [PATCH] change solenoids and shooting speeds --- .../usfirst/frc/team3501/robot/subsystems/DriveTrain.java | 4 ++-- src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java index 0a3dea2..0a68c4c 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java @@ -59,10 +59,10 @@ public class DriveTrain extends Subsystem { this.imu = new ADXRS450_Gyro(Constants.DriveTrain.GYRO_PORT); // TODO: Not sure if MODULE_NUMBER should be the same for both - leftGearPiston = new DoubleSolenoid( + leftGearPiston = new DoubleSolenoid(Constants.DriveTrain.PISTON_MODULE, Constants.DriveTrain.LEFT_GEAR_PISTON_FORWARD, Constants.DriveTrain.LEFT_GEAR_PISTON_REVERSE); - rightGearPiston = new DoubleSolenoid( + rightGearPiston = new DoubleSolenoid(Constants.DriveTrain.PISTON_MODULE, Constants.DriveTrain.RIGHT_GEAR_PISTON_FORWARD, Constants.DriveTrain.RIGHT_GEAR_PISTON_REVERSE); } diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index 0c58ba3..4869775 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java @@ -13,11 +13,11 @@ public class Shooter extends Subsystem { private static HallEffectSensor hallEffect; private final CANTalon flyWheel1, flyWheel2, indexWheel; - public static final double DEFAULT_INDEXING_SPEED = 0; - public static final double DEFAULT_SHOOTING_SPEED = 0; + public static final double DEFAULT_INDEXING_SPEED = -0.75; + public static final double DEFAULT_SHOOTING_SPEED = 0.75; public static double CURRENT_SHOOTING_SPEED = DEFAULT_SHOOTING_SPEED; - public static final double SHOOTING_SPEED_INCREMENT = 0; + public static final double SHOOTING_SPEED_INCREMENT = 0.05; private Shooter() { flyWheel1 = new CANTalon(Constants.Shooter.FLY_WHEEL1); -- 2.30.2