projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged with master
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
commands
/
shooter
/
RunIndexWheelContinuous.java
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
index 95940130f11aac8c50ebc54dc29af5d2d13dcf76..ccc0e4374d6223121eefff87bc28ced1bee495c2 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@
-3,7
+3,7
@@
package org.usfirst.frc.team3501.robot.commands.shooter;
import org.usfirst.frc.team3501.robot.Constants;
import org.usfirst.frc.team3501.robot.Robot;
import org.usfirst.frc.team3501.robot.subsystems.Shooter;
import org.usfirst.frc.team3501.robot.Constants;
import org.usfirst.frc.team3501.robot.Robot;
import org.usfirst.frc.team3501.robot.subsystems.Shooter;
-
+import edu.wpi.first.wpilibj.Timer;
import edu.wpi.first.wpilibj.command.Command;
/**
import edu.wpi.first.wpilibj.command.Command;
/**
@@
-20,6
+20,7
@@
import edu.wpi.first.wpilibj.command.Command;
*/
public class RunIndexWheelContinuous extends Command {
private Shooter shooter = Robot.getShooter();
*/
public class RunIndexWheelContinuous extends Command {
private Shooter shooter = Robot.getShooter();
+ private Timer t = new Timer();
/**
* See JavaDoc comment in class for details
/**
* See JavaDoc comment in class for details
@@
-30,23
+31,23
@@
public class RunIndexWheelContinuous extends Command {
@Override
protected void initialize() {
@Override
protected void initialize() {
+ t.start();
}
@Override
protected void execute() {
}
@Override
protected void execute() {
- if (t
imeSinceInitialized() % 0.5 <= 0.02
) {
+ if (t
.get() >= 1
) {
if (Shooter.getShooter().getPistonValue() == Constants.Shooter.LOW_GEAR) {
Shooter.getShooter().setHighGear();
} else {
Shooter.getShooter().setLowGear();
}
if (Shooter.getShooter().getPistonValue() == Constants.Shooter.LOW_GEAR) {
Shooter.getShooter().setHighGear();
} else {
Shooter.getShooter().setLowGear();
}
+ t.reset();
}
}
- double shooterSpeed = shooter.getShooterRPM();
- double targetShooterSpeed = shooter.getTargetShootingSpeed();
- double threshold = shooter.getRPMThreshold();
- if (Math.abs(shooterSpeed - targetShooterSpeed) <= threshold)
+ if (shooter.isShooterRPMWithinRangeOfTargetSpeed(25))
shooter.runIndexWheel();
shooter.runIndexWheel();
+
}
@Override
}
@Override