projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
44c26e0
)
Initialize timer
author
Shivani Ghanta
<shivani.oghanta@gmail.com>
Sat, 28 Jan 2017 21:56:11 +0000
(13:56 -0800)
committer
Cindy Zhang
<cindyzyx9@gmail.com>
Sat, 4 Feb 2017 19:10:35 +0000
(11:10 -0800)
src/org/usfirst/frc/team3501/robot/commands/climber/MaintainWinchSpeed.java
patch
|
blob
|
blame
|
history
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
patch
|
blob
|
blame
|
history
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/climber/MaintainWinchSpeed.java
b/src/org/usfirst/frc/team3501/robot/commands/climber/MaintainWinchSpeed.java
index 6d11b64335f74b32ca28bf2d2a49a0869a30ca01..9741eaca200b8b48db27872c19d5e316a4d84536 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/climber/MaintainWinchSpeed.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/climber/MaintainWinchSpeed.java
@@
-37,6
+37,7
@@
public class MaintainWinchSpeed extends Command {
* value range is from -1 to 1
*/
public MaintainWinchSpeed(double time, double motorVal) {
+ timer = new Timer();
requires(Robot.getDriveTrain());
this.time = time;
this.motorVal = motorVal;
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 88195a4b2d89227fffaa90ea3bf2ede0cbda4572..2428aff2345244364035e842c40042626d27c74d 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
@@
-38,6
+38,7
@@
public class RunWinch extends Command {
*/
public RunWinch(double time, double motorVal) {
requires(Robot.getDriveTrain());
+ timer = new Timer();
this.time = time;
this.motorVal = motorVal;
}