From: Rohan Rodrigues Date: Fri, 3 Mar 2017 00:34:44 +0000 (-0800) Subject: Changed rpm of shooter to 2800 X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=005d6bf032e0a6bc2434d632b3965abab318cf6e Changed rpm of shooter to 2800 --- diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index e6ad60d..1278a33 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -29,6 +29,7 @@ public class Robot extends IterativeRobot { } public static DriveTrain getDriveTrain() { + return DriveTrain.getDriveTrain(); } diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index 91da098..9cdbea4 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java @@ -15,7 +15,7 @@ public class Shooter extends Subsystem { private final CANTalon flyWheel1, flyWheel2, indexWheel; private static final double DEFAULT_INDEXING_SPEED = -0.75; - private static final double DEFAULT_SHOOTING_SPEED = 2700; // rpm + private static final double DEFAULT_SHOOTING_SPEED = 2800; // rpm private static final double SHOOTING_SPEED_INCREMENT = 25; private double currentShootingSpeed = DEFAULT_SHOOTING_SPEED;