projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
86d283b
)
Edit JavaDoc comments in two methods
author
shainachen
<shaina.sierra@gmail.com>
Tue, 17 Jan 2017 03:33:01 +0000
(19:33 -0800)
committer
shainachen
<shaina.sierra@gmail.com>
Sat, 21 Jan 2017 19:16:40 +0000
(11:16 -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
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 edb926e9517ecf118771b48a550bfa7192798aae..646dc56d41be28562bffee314fdc4c0da8ab1535 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
@@
-3,9
+3,10
@@
package org.usfirst.frc.team3501.robot.commands.shooter;
import edu.wpi.first.wpilibj.command.Command;
/**
import edu.wpi.first.wpilibj.command.Command;
/**
- * Runs fly wheel continuously when corresponding button pressed
+ * This command will run the fly wheel motor continuously until the button
+ * triggering it is released.
*
*
- *
Run stopFlyWheel command to stop
+ *
pre-condition: This command must be run by a button in OI.
*
* @param motorVal
* [-1,1]
*
* @param motorVal
* [-1,1]
@@
-37,6
+38,7
@@
public class RunFlyWheelContinuous extends Command {
// subsystems is scheduled to run
@Override
protected void interrupted() {
// subsystems is scheduled to run
@Override
protected void interrupted() {
+ end();
}
@Override
}
@Override
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 161f7b6b68a344f60cb69b7fa67a36e57671fcb2..f4b06930b6e13a755b489df95c0f9f99d053ac30 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,10
+3,11
@@
package org.usfirst.frc.team3501.robot.commands.shooter;
import edu.wpi.first.wpilibj.command.Command;
/**
import edu.wpi.first.wpilibj.command.Command;
/**
- * Runs index wheel continuously when corresponding button is pressed
- *
- * Run stopIndexWheel to stop
+ * This command will run the index wheel motor continuously until the button
+ * triggering it is released.
*
*
+ * pre-condition: This command must be run by a button in OI.
+ *
* @param motorVal
* [-1,1]
* @author shaina
* @param motorVal
* [-1,1]
* @author shaina