projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
47693e1
)
Edit comments
author
Shivani Ghanta
<shivani.oghanta@gmail.com>
Wed, 18 Jan 2017 02:52:15 +0000
(18:52 -0800)
committer
Cindy Zhang
<cindyzyx9@gmail.com>
Wed, 25 Jan 2017 03:40:39 +0000
(19:40 -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
src/org/usfirst/frc/team3501/robot/subsystems/Climber.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 c8b8b8deb03df2bdc561413793b60c3c834bdba1..88195a4b2d89227fffaa90ea3bf2ede0cbda4572 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
@@
-15,6
+15,10
@@
import edu.wpi.first.wpilibj.command.Command;
*
* post-condition: Winch motor set to a specified speed for a specified time.
*
*
* post-condition: Winch motor set to a specified speed for a specified time.
*
+ * @param motorVal
+ * value range is from -1 to 1
+ * @param time
+ * in seconds
* @author shivanighanta
*
*/
* @author shivanighanta
*
*/
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 e0a6700115c1b77234cb3d14db5e516b7a3e64ae..959dd37b8fcdaa54c8de6693de7a73a40d4da025 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
@@
-43,7
+43,7
@@
public class RunWinchContinuous extends Command {
@Override
protected boolean isFinished() {
@Override
protected boolean isFinished() {
- return
false
;
+ return
!Robot.getOI().toggleWinch.get()
;
}
@Override
}
@Override
diff --git
a/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java
b/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java
index 3426dad718b70fce7772c37871d39bbed8647de6..9dd7361ba83d3b2da383834f0150aa86696ca345 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/subsystems/Climber.java
+++ b/
src/org/usfirst/frc/team3501/robot/subsystems/Climber.java
@@
-15,10
+15,10
@@
public class Climber {
}
public void stop() {
}
public void stop() {
- setMotorValue
s
(0);
+ setMotorValue(0);
}
}
- public void setMotorValue
s
(final double val) {
+ public void setMotorValue(final double val) {
}
}
}
}