projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
competition fixes
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
commands
/
climber
/
StopWinch.java
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
index 6c83816c37cc9102e23bed14b23b3e421701c042..2bb575280e2a07100523795efd242104bc140a4c 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
@@
-1,6
+1,7
@@
package org.usfirst.frc.team3501.robot.commands.climber;
import org.usfirst.frc.team3501.robot.Robot;
package org.usfirst.frc.team3501.robot.commands.climber;
import org.usfirst.frc.team3501.robot.Robot;
+import org.usfirst.frc.team3501.robot.subsystems.Climber;
import edu.wpi.first.wpilibj.command.Command;
import edu.wpi.first.wpilibj.command.Command;
@@
-11,9
+12,10
@@
import edu.wpi.first.wpilibj.command.Command;
*
*/
public class StopWinch extends Command {
*
*/
public class StopWinch extends Command {
+ Climber climber = Robot.getClimber();
public StopWinch() {
public StopWinch() {
- requires(
Robot.getClimber()
);
+ requires(
climber
);
}
@Override
}
@Override
@@
-22,20
+24,21
@@
public class StopWinch extends Command {
@Override
protected void execute() {
@Override
protected void execute() {
-
}
@Override
protected boolean isFinished() {
}
@Override
protected boolean isFinished() {
- return
fals
e;
+ return
tru
e;
}
@Override
protected void end() {
}
@Override
protected void end() {
-
+ climber.stop();
+ climber.setCANTalonsBrakeMode(climber.BRAKE_MODE);
}
@Override
protected void interrupted() {
}
@Override
protected void interrupted() {
+ end();
}
}
}
}