projects
/
3501
/
stronghold-2016
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add constants same format as meryem did to constants and also add time dead reckoning
[3501/stronghold-2016]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
commands
/
shooter
/
Shoot.java
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java
index 90105e0c9368663df2ba0a69d131e5c36481cc03..31fb261e576f0a9748769a1bfa7dd3d5f94b1aee 100755
(executable)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java
@@
-1,6
+1,6
@@
package org.usfirst.frc.team3501.robot.commands.shooter;
package org.usfirst.frc.team3501.robot.commands.shooter;
+
import org.usfirst.frc.team3501.robot.Robot;
import org.usfirst.frc.team3501.robot.Robot;
-import org.usfirst.frc.team3501.robot.commands.auton.AimAndAlign;
import edu.wpi.first.wpilibj.command.CommandGroup;
import edu.wpi.first.wpilibj.command.WaitCommand;
import edu.wpi.first.wpilibj.command.CommandGroup;
import edu.wpi.first.wpilibj.command.WaitCommand;
@@
-10,7
+10,6
@@
public class Shoot extends CommandGroup {
public boolean usePhotogate;
public Shoot() {
public boolean usePhotogate;
public Shoot() {
- addSequential(new AimAndAlign());
addSequential(new WaitCommand(3.0));
addSequential(new runShooter());
addSequential(new WaitCommand(3.0));
addSequential(new WaitCommand(3.0));
addSequential(new runShooter());
addSequential(new WaitCommand(3.0));