Skip to content

Commit 7cb40a8

Browse files
committed
Make requested change
1 parent 2ddcefc commit 7cb40a8

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

Robot2019/src/main/java/frc/robot/commands/Climb.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected void execute() {
6565
break;
6666
case RETRACTING:
6767
climber.runClimber(retract);
68-
if (climber.getEncDistance() >= retractGoal) {
68+
if (climber.getEncDistance() <= retractGoal) {
6969
state = State.FINISHED;
7070
}
7171
break;

Robot2019/src/main/java/frc/robot/commands/ManualClimb.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class ManualClimb extends Command {
1919
private Joystick leftJoy, rightJoy;
2020

2121
final private double retractDist = 0;
22-
final private double climbDist = -24.46; // In inches, reversed
22+
final private double climbDist = 24.46; // In inches
2323

2424
public ManualClimb(Climber climber, Drivetrain dt, Joystick leftJoy, Joystick rightJoy) {
2525
// Use requires() here to declare subsystem dependencies
@@ -47,9 +47,9 @@ protected void execute() {
4747
double climbSpeed = -leftJoy.getY();
4848
double driveSpeed = -rightJoy.getY();
4949

50-
if (climbSpeed > 0 && climber.getEncDistance() <= climbDist) {
50+
if (climbSpeed > 0 && climber.getEncDistance() >= climbDist) {
5151
climbSpeed = 0;
52-
} else if (climbSpeed < 0 && climber.getEncDistance() >= retractDist) {
52+
} else if (climbSpeed < 0 && climber.getEncDistance() <= retractDist) {
5353
climbSpeed = 0;
5454
}
5555
climber.runClimber(climbSpeed);

Robot2019/src/main/java/frc/robot/subsystems/Climber.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public Climber(VictorSP motor, Encoder enc, AHRS ahrs, DoubleSolenoid pistons) {
3636
double pulseFraction = 1.0/256;
3737
double pitchDiameter = 1.790; // https://www.vexrobotics.com/35-sprockets.html#Drawing
3838
enc.setDistancePerPulse(pulseFraction * Math.PI * pitchDiameter);
39+
enc.setReverseDirection(true);
3940
enc.reset();
4041
}
4142

0 commit comments

Comments
 (0)