projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a2a99ce
)
Edit JavaDoc comments
author
shainachen
<shaina.sierra@gmail.com>
Sat, 14 Jan 2017 21:28:01 +0000
(13:28 -0800)
committer
Cindy Zhang
<cindyzyx9@gmail.com>
Sat, 14 Jan 2017 22:28:37 +0000
(14:28 -0800)
src/org/usfirst/frc/team3501/robot/commandGroups/Shoot.java
[deleted file]
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.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/RunIndexWheel.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/commandGroups/Shoot.java
b/src/org/usfirst/frc/team3501/robot/commandGroups/Shoot.java
deleted file mode 100644
(file)
index
70ea60f
..0000000
--- a/
src/org/usfirst/frc/team3501/robot/commandGroups/Shoot.java
+++ /dev/null
@@
-1,9
+0,0 @@
-package org.usfirst.frc.team3501.robot.commandGroups;
-
-import edu.wpi.first.wpilibj.command.CommandGroup;
-
-public class Shoot extends CommandGroup {
- public Shoot() {
-
- }
-}
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
index 5a60707ee75053d9afaf2d6304bbc50608fc3c51..85543ce6b15aec119ad506e05d356e82886fcd33 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheel.java
@@
-6,7
+6,7
@@
import edu.wpi.first.wpilibj.command.Command;
* Runs the fly wheel at a given speed for a given time (sec)
*
* @param motorVal
* Runs the fly wheel at a given speed for a given time (sec)
*
* @param motorVal
- *
in ()
+ *
[-1,1]
* @param time
* in seconds
* @author shaina
* @param time
* in seconds
* @author shaina
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 c1a316502873df4e42f8ce2c19f69b8595df1084..e317eea8c83e9d89c1b5ce66c1c20aba2fb9b1e9 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
@@
-6,7
+6,7
@@
import edu.wpi.first.wpilibj.command.Command;
* Runs fly wheel continuously when corresponding button pressed
*
* @param motorVal
* Runs fly wheel continuously when corresponding button pressed
*
* @param motorVal
- *
motor value
+ *
[-1,1]
* @author shaina
*/
public class RunFlyWheelContinuous extends Command {
* @author shaina
*/
public class RunFlyWheelContinuous extends Command {
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheel.java
b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheel.java
index 5cb3ada2c93251a7b15c51842c8c0c27e7eb983b..5d075313a4b2fe99555325ea4b45544faa2128fd 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheel.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheel.java
@@
-3,10
+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 index wheel at a given speed
in ()
for given time in seconds
+ * Runs index wheel at a given speed for given time in seconds
*
*
- * @param
speed
- *
in ()
+ * @param
motorVal
+ *
[-1,1]
* @param time
* in seconds
* @author shaina
* @param time
* in seconds
* @author shaina
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 85ac51f4df46568d5728cae6bf16e8dcbd64b4c9..66ccb3dfbb3c3f147d588e37c5274304bd4ec00e 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@
-4,9
+4,9
@@
import edu.wpi.first.wpilibj.command.Command;
/**
* Runs index wheel continuously when corresponding button is pressed
/**
* Runs index wheel continuously when corresponding button is pressed
- *
+ *
* @param motorVal
* @param motorVal
- *
motor value
+ *
[-1,1]
* @author shaina
*/
public class RunIndexWheelContinuous extends Command {
* @author shaina
*/
public class RunIndexWheelContinuous extends Command {