Skip to content

Commit

Permalink
pivot
Browse files Browse the repository at this point in the history
  • Loading branch information
rgodha24 committed Feb 24, 2024
1 parent 8a8833b commit 76a9e3b
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 4 deletions.
4 changes: 4 additions & 0 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
import frc.robot.commands.DriveCommands;
import frc.robot.commands.FeedForwardCharacterization;
import frc.robot.commands.PivotCommands;
import frc.robot.subsystems.drive.*;
import frc.robot.subsystems.intake.*;
import frc.robot.subsystems.pivot.*;
Expand Down Expand Up @@ -143,6 +144,9 @@ private void configureButtonBindings() {
operator.x().toggleOnTrue(shooter.conveyorOnCommand());
operator.y().toggleOnTrue(shooter.conveyorOffCommand());

pivot.setDefaultCommand(
PivotCommands.basicOperatorControl(
pivot, () -> operator.getRightX() - operator.getLeftX()));
}

/**
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/frc/robot/commands/PivotCommands.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package frc.robot.commands;

import edu.wpi.first.math.geometry.Rotation2d;
import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.Commands;
import frc.robot.subsystems.pivot.Pivot;
import java.util.function.DoubleSupplier;

public class PivotCommands {
private PivotCommands() {}

public static Command basicOperatorControl(Pivot pivot, DoubleSupplier rotationSupplier) {
return Commands.run(
() -> {
var target =
pivot
.getCurrentPosition()
.plus(Rotation2d.fromDegrees(rotationSupplier.getAsDouble()));

pivot.setTargetPosition(target);
},
pivot);
}
}
3 changes: 1 addition & 2 deletions src/main/java/frc/robot/subsystems/intake/IntakeIOReal.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package frc.robot.subsystems.intake;

import com.revrobotics.CANSparkMax;
import com.revrobotics.CANSparkLowLevel.MotorType;

import com.revrobotics.CANSparkMax;
import frc.robot.Constants.IntakeConstants;

public class IntakeIOReal implements IntakeIO {
Expand Down
21 changes: 21 additions & 0 deletions src/main/java/frc/robot/subsystems/pivot/Pivot.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,40 @@
import edu.wpi.first.math.geometry.Rotation2d;
import edu.wpi.first.wpilibj2.command.SubsystemBase;
import frc.robot.Constants.PivotConstants;
import org.littletonrobotics.junction.Logger;

public class Pivot extends SubsystemBase {
private final PivotIO io;
private final PivotIOInputsAutoLogged inputs = new PivotIOInputsAutoLogged();

public Pivot(PivotIO io) {
this.io = io;
}

public void setTargetPosition(Rotation2d target) {
if (target.getRadians() < PivotConstants.pivotStart.getRadians()) {
target = PivotConstants.pivotStart;
}

if (target.getRadians() > PivotConstants.pivotEnd.getRadians()) {
target = PivotConstants.pivotEnd;
}

// surely this isnt necessary
if (target.getRadians() < PivotConstants.pivotStart.getRadians()
|| target.getRadians() > PivotConstants.pivotEnd.getRadians()) {
throw new IllegalArgumentException("Target position is out of bounds");
}
io.setTargetPosition(target);
}

public Rotation2d getCurrentPosition() {
return inputs.pivotCurentAngle;
}

@Override
public void periodic() {
io.updateInputs(inputs);
Logger.processInputs("Pivot", inputs);
}
}
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/subsystems/pivot/PivotIO.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

public interface PivotIO {
@AutoLog
class PivotIOInputs {
public static class PivotIOInputs {
public Rotation2d pivotCurentAngle = new Rotation2d();
public Rotation2d pivotTargetAngle = new Rotation2d();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package frc.robot.subsystems.shooter;

public class ShooterIOSim implements ShooterIO {
//todo
// todo
}

0 comments on commit 76a9e3b

Please sign in to comment.