projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c846487
)
edit continuous commands
author
Cindy Zhang
<cindyzyx9@gmail.com>
Sat, 4 Feb 2017 20:01:59 +0000
(12:01 -0800)
committer
Cindy Zhang
<cindyzyx9@gmail.com>
Sat, 4 Feb 2017 20:01:59 +0000
(12:01 -0800)
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java
patch
|
blob
|
blame
|
history
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
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
index 6b8db75cc2c8eee9ccc09bb0572eeec1257c75f9..e20121024a0528b7d3a8c0637f96bc154f4a39a2 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
@@
-8,8
+8,8
@@
import edu.wpi.first.wpilibj.command.Command;
* This command runs the drive train motors (which runs the winch) continuously
* at a specified speed until the button triggering it is released
*
* This command runs the drive train motors (which runs the winch) continuously
* at a specified speed until the button triggering it is released
*
- * pre-condition: This command must be run by a button in OI
. The robot must be
- * attached to the rope.
+ * pre-condition: This command must be run by a button in OI
with
+ *
button.whileHeld(...). The robot must be
attached to the rope.
*
* post-condition: Drive train motors set to a specified speed.
*
*
* post-condition: Drive train motors set to a specified speed.
*
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java
b/src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java
index a75a4bb28b4b665596441e1da874f895876ef67c..f44631661476e7d309e58abdf663b0d5b75c1fdd 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java
@@
-7,7
+7,8
@@
import edu.wpi.first.wpilibj.command.Command;
/**
* Reverses the intake until the button triggering this command is released
*
/**
* Reverses the intake until the button triggering this command is released
*
- * pre-condition: button is pressed
+ * pre-condition: This command must be run by a button in OI with
+ * button.whileHeld(...).
*/
public class ReverseIntakeContinuous extends Command {
*/
public class ReverseIntakeContinuous extends Command {
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 af77483c85939ffa7205610078a4ee2630275805..1f1d5cd9d1f25a28dcd34e3be33684a583e16ec8 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
@@
-55,7
+55,7
@@
public class RunFlyWheelContinuous extends Command {
@Override
protected boolean isFinished() {
@Override
protected boolean isFinished() {
- return
!Robot.getOI().toggleFlyWheel.get()
;
+ 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 bf9af68ad85b3c0617672edba540c37aeb7d2989..adcd1a618df4b8f614824574952871d7c75f455b 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@
-55,7
+55,7
@@
public class RunIndexWheelContinuous extends Command {
@Override
protected boolean isFinished() {
@Override
protected boolean isFinished() {
- return
Robot.getOI().toggleIndexWheel.get()
;
+ return
false
;
}
}