projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
411129c
)
Edit javadoc comments
author
Shivani Ghanta
<shivani.oghanta@gmail.com>
Sat, 21 Jan 2017 21:55:59 +0000
(13:55 -0800)
committer
Shivani Ghanta
<shivani.oghanta@gmail.com>
Sat, 21 Jan 2017 22:27:38 +0000
(14:27 -0800)
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
patch
|
blob
|
blame
|
history
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
index f02ed62510aabf2a731addd2a04f675a009627f8..8433170746f0dd32249f5b10cbefbf08ffb0f04c 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
@@
-7,7
+7,8
@@
import edu.wpi.first.wpilibj.command.Command;
/**
* This command runs the winch at a specified speed and time in seconds when the
/**
* This command runs the winch at a specified speed and time in seconds when the
- * button triggering it is pressed. This command also runs the drive train.
+ * button triggering it is pressed. This command also makes the drive train
+ * motors run because the winch is controlled by the drive train.
*
* pre-condition: This command is run by a button in OI. The robot must be
* attached to the rope.
*
* pre-condition: This command is run by a button in OI. The robot must be
* attached to the rope.
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 6b8209bd40e835ff68bd3c243dfcd4a4dbd49de2..1cd5381786659f8f9e4c00b6f640efac174ea00a 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
@@
-6,7
+6,8
@@
import edu.wpi.first.wpilibj.command.Command;
/**
* This command will run the winch motor continuously until the button
/**
* This command will run the winch motor continuously until the button
- * triggering it is released. This command also runs the drive train.
+ * triggering it is released. This command also makes the drive train motors run
+ * because the winch is controlled by the drive train.
*
* 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. The robot must be
* attached to the rope.