Skip to content

Commit

Permalink
Gear ratios
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekChen1 committed Oct 25, 2023
1 parent a5485ad commit 9f2496e
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/main/java/frc/robot/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,12 @@ public static final class Setpoints {
public static final double MIN_HEIGHT = 0;

public static final int ELEVATOR_TICKS = 2048;
public static final double ELEVATOR_GEAR_RATIO = 1.0;
public static final double ELEVATOR_GEAR_CIRCUMFERENCE = 1.5 * Math.PI;
public static final double ELEVATOR_GEAR_RATIO = 1 / 9.9206;
public static final double ELEVATOR_GEAR_CIRCUMFERENCE = 1.432 * Math.PI;

public static final int WRIST_TICKS = 2048;
public static final double WRIST_DEGREES = 360;
public static final double WRIST_GEAR_RATIO = 0.061;
public static final double WRIST_GEAR_RATIO = 1 / 75;

public static final double ANGLE_EPSILON = 0.5;
public static final double HEIGHT_EPSILON = 5;
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,6 @@ public void containerMatchStarting() {
*/
private void configureButtonBindings() {

/* Current Controls:
* Back buttons: Zero gyroscope,
*/

// vibrate jacob controller when in layer
jacobLayer.whenChanged(
(enabled) -> {
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/frc/robot/commands/ScoreCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,9 @@ private Command createStep(ScoreStep scoreStep) {
var elevatorState = scoreStep.elevatorState();
var intakeState = scoreStep.intakeState();
if (elevatorState.isPresent() && intakeState.isPresent()) {
// FIXME: we need a working elevatorposition command here
return new ElevatorPositionCommand(elevatorSubsystem, elevatorState.get())
.deadlineWith(new IntakeModeCommand(intakeSubsystem, intakeState.get()));
} else if (elevatorState.isPresent()) {

// FIXME: we need a working elevatorposition command here
return new ElevatorPositionCommand(elevatorSubsystem, elevatorState.get());
} else if (intakeState.isPresent()) {
return new IntakeModeCommand(intakeSubsystem, intakeState.get());
Expand Down
1 change: 0 additions & 1 deletion src/main/java/frc/robot/commands/SetZeroModeCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public SetZeroModeCommand(ElevatorSubsystem elevatorSubsystem, boolean includeWr
this(elevatorSubsystem, Optional.of(includeWrist), Optional.of(true));
}

// FIXME make it zero elevator + wrist
@Override
public void initialize() {
new ElevatorPositionCommand(elevatorSubsystem, Constants.Elevator.Setpoints.ZERO);
Expand Down

0 comments on commit 9f2496e

Please sign in to comment.