Skip to content

Commit

Permalink
Merge branch 'main' into 29-auto-align-to-tag-using-pathfinding
Browse files Browse the repository at this point in the history
  • Loading branch information
Vilok1 committed Mar 23, 2024
2 parents 0b5492d + b327522 commit c37656f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions src/main/java/frc/robot/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -522,13 +522,12 @@ public class RhapsodyPivotConstants { // TODO: get real

public static final double ANGLE_TOLERANCE = 0.00208d;

public static final double ENCODER_OFFSET = -0.54008; // In rotations, was 0.282 //TODO: get real :)
public static final double ENCODER_OFFSET = -0.913834;//-0.54008; // In rotations
public static final SensorDirectionValue ENCODER_DIRECTION = SensorDirectionValue.Clockwise_Positive;
public static final double ENCODER_TO_MECHANISM_RATIO = 1d;
public static final double ROTOR_TO_ENCODER_RATIO = 275d;

public static final double BIAS_INCREMENT = 1d; // fDegrees to bias by per button press TODO get amount to bias
// by
public static final double BIAS_INCREMENT = 1d; // fDegrees to bias by per button press TODO get amount to bias by

public static final double STOW_ANGLE = 27d;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/subsystems/Climber.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public Climber() {
climbMotorL.setPosition(0d);
climbMotorR.setPosition(0d);

// initOldLogging();
initOldLogging();
initLogging();
}

Expand Down

0 comments on commit c37656f

Please sign in to comment.