projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
210ebcc
)
Implement stopFlyWheel and stopIndexWheel
author
shainachen
<shaina.sierra@gmail.com>
Sat, 14 Jan 2017 23:46:59 +0000
(15:46 -0800)
committer
Cindy Zhang
<cindyzyx9@gmail.com>
Wed, 25 Jan 2017 03:40:38 +0000
(19:40 -0800)
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/shooter/StopFlyWheel.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/shooter/StopIndexWheel.java
patch
|
blob
|
blame
|
history
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
index a5e8501f1a5b50b137221d1b8fd4d44827e52ee2..8a6e5be4f9e3f1571afd4debb4c431198416fa73 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
@@
-52,6
+52,7
@@
public class RunFlyWheelContinuous extends Command {
@Override
protected boolean isFinished() {
@Override
protected boolean isFinished() {
+ // TODO
return false;
}
return false;
}
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 aa2dbb26dd95c7a2717312909faeb69551ea4d64..2c243385f2395284613349f81d97e3c6ab17552d 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@
-52,6
+52,7
@@
public class RunIndexWheelContinuous extends Command {
@Override
protected boolean isFinished() {
@Override
protected boolean isFinished() {
+ // TODO
return false;
}
return false;
}
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/StopFlyWheel.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/StopFlyWheel.java
index 53fc35c5ea543e80b04f9caf16baefa020fa51d1..cbce00577b05d1b952d8cf4d0b1485f2e65c8b74 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/StopFlyWheel.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/StopFlyWheel.java
@@
-1,5
+1,7
@@
package org.usfirst.frc.team3501.robot.commands.shooter;
package org.usfirst.frc.team3501.robot.commands.shooter;
+import org.usfirst.frc.team3501.robot.Robot;
+
import edu.wpi.first.wpilibj.command.Command;
/**
import edu.wpi.first.wpilibj.command.Command;
/**
@@
-30,6
+32,7
@@
public class StopFlyWheel extends Command {
// Called once after isFinished returns true
@Override
protected void end() {
// Called once after isFinished returns true
@Override
protected void end() {
+ Robot.getShooter().stopFlyWheel();
}
// Called when another command which requires one or more of the same
}
// Called when another command which requires one or more of the same
@@
-40,8
+43,7
@@
public class StopFlyWheel extends Command {
@Override
protected boolean isFinished() {
@Override
protected boolean isFinished() {
- // TODO Auto-generated method stub
- return false;
+ return true;
}
}
}
}
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/StopIndexWheel.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/StopIndexWheel.java
index 4a04f4caacf2dee9816ca7b791dd9ff41e9aba12..e878182263275f13f560d849e0efeb535f8df3e1 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/StopIndexWheel.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/StopIndexWheel.java
@@
-1,5
+1,7
@@
package org.usfirst.frc.team3501.robot.commands.shooter;
package org.usfirst.frc.team3501.robot.commands.shooter;
+import org.usfirst.frc.team3501.robot.Robot;
+
import edu.wpi.first.wpilibj.command.Command;
/**
import edu.wpi.first.wpilibj.command.Command;
/**
@@
-29,6
+31,7
@@
public class StopIndexWheel extends Command {
// Called once after isFinished returns true
@Override
protected void end() {
// Called once after isFinished returns true
@Override
protected void end() {
+ Robot.getShooter().stopIndexWheel();
}
// Called when another command which requires one or more of the same
}
// Called when another command which requires one or more of the same
@@
-39,8
+42,7
@@
public class StopIndexWheel extends Command {
@Override
protected boolean isFinished() {
@Override
protected boolean isFinished() {
- // TODO Auto-generated method stub
- return false;
+ return true;
}
}
}
}