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
/
RunWinch.java
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 0e980a49e3b3bb02ed2db8a95d6f866d568f893f..5a76b5c182b377c6892b64c75572ca0857fa44ec 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.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;
@@
-23,6
+24,8
@@
import edu.wpi.first.wpilibj.command.Command;
*/
public class RunWinch extends Command {
*/
public class RunWinch extends Command {
+ Climber climber = Robot.getClimber();
+
private double time;
private double motorVal;
private double time;
private double motorVal;
@@
-35,7
+38,7
@@
public class RunWinch extends Command {
* value range is from -1 to 1
*/
public RunWinch(double time, double motorVal) {
* value range is from -1 to 1
*/
public RunWinch(double time, double motorVal) {
- requires(
Robot.getDriveTrain()
);
+ requires(
climber
);
this.time = time;
this.motorVal = motorVal;
}
this.time = time;
this.motorVal = motorVal;
}
@@
-46,8
+49,7
@@
public class RunWinch extends Command {
@Override
protected void execute() {
@Override
protected void execute() {
- Robot.getDriveTrain().setMotorValues(motorVal, motorVal);
-
+ climber.setMotorValues(motorVal);
}
@Override
}
@Override
@@
-57,7
+59,7
@@
public class RunWinch extends Command {
@Override
protected void end() {
@Override
protected void end() {
-
Robot.getDriveTrain()
.stop();
+
climber
.stop();
}
@Override
}
@Override