Skip to content

Commit

Permalink
reverted previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Pouman1 committed Feb 11, 2025
1 parent c9686cd commit 1d3657f
Show file tree
Hide file tree
Showing 12 changed files with 1 addition and 297 deletions.
3 changes: 1 addition & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,5 @@
},
"[java]": {
"editor.defaultFormatter": "richardwillis.vscode-spotless-gradle"
},
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable"
}
}
35 changes: 0 additions & 35 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
import frc.robot.subsystems.climb.Climb;
import frc.robot.subsystems.climb.ClimbConstants;
import frc.robot.subsystems.climb.ClimbIOSim;
import frc.robot.subsystems.coralrollerbar.CoralRoller;
import frc.robot.subsystems.coralrollerbar.CoralRollerIOReal;
import frc.robot.subsystems.coralrollerbar.CoralRollerIOSim;
import frc.robot.subsystems.AlgaeRollerbar.AlgaeRollerbar;
import frc.robot.subsystems.AlgaeRollerbar.AlgaeRollerbarIOReal;
import frc.robot.subsystems.AlgaeRollerbar.AlgaeRollerbarIOSim;
Expand All @@ -38,9 +35,6 @@
import frc.robot.subsystems.drive.ModuleIO;
import frc.robot.subsystems.drive.ModuleIOSim;
import frc.robot.subsystems.drive.ModuleIOSpark;
import frc.robot.subsystems.pivot.Pivot;
import frc.robot.subsystems.pivot.PivotIOReal;
import frc.robot.subsystems.pivot.PivotIOSim;
import org.littletonrobotics.junction.networktables.LoggedDashboardChooser;

/**
Expand All @@ -52,8 +46,6 @@
public class RobotContainer {
// Subsystems
private final Drive drive;
private final CoralRoller coralRoller;
private final Pivot pivot;
private final AlgaeRollerbar algaeRollerbar;
// Controller
private final CommandXboxController controller = new CommandXboxController(0);
Expand All @@ -65,8 +57,6 @@ public class RobotContainer {
public RobotContainer() {
switch (Constants.currentMode) {
case REAL:
coralRoller = CoralRoller.init(new CoralRollerIOReal());
pivot = Pivot.initialize(new PivotIOReal());
// Real robot, instantiate hardware IO implementations
drive =
new Drive(
Expand All @@ -80,8 +70,6 @@ public RobotContainer() {
break;

case SIM:
coralRoller = CoralRoller.init(new CoralRollerIOSim());
pivot = Pivot.initialize(new PivotIOSim());
// Sim robot, instantiate physics sim IO implementations
drive =
new Drive(
Expand All @@ -94,8 +82,6 @@ public RobotContainer() {
break;

default:
coralRoller = CoralRoller.init(new CoralRollerIOSim());
pivot = Pivot.initialize(new PivotIOSim());
// Replayed robot, disable IO implementations
drive =
new Drive(
Expand Down Expand Up @@ -139,21 +125,6 @@ public RobotContainer() {
* edu.wpi.first.wpilibj2.command.button.JoystickButton}.
*/
private void configureButtonBindings() {
controller
.leftTrigger()
.whileTrue(
Commands.startEnd(
() -> pivot.setVoltage(controller.getLeftTriggerAxis() * 12),
() -> pivot.setVoltage(0),
pivot));
controller
.rightTrigger()
.whileTrue(
Commands.startEnd(
() -> pivot.setVoltage(controller.getRightTriggerAxis() * -12),
() -> pivot.setVoltage(0),
pivot));

// Default command, normal field-relative drive
drive.setDefaultCommand(
DriveCommands.joystickDrive(
Expand Down Expand Up @@ -205,12 +176,6 @@ private void configureButtonBindings() {
new Pose2d(drive.getPose().getTranslation(), new Rotation2d())),
drive)
.ignoringDisable(true));
controller
.leftBumper()
.onTrue(Commands.runOnce(() -> coralRoller.setVoltage(6), coralRoller));
controller
.rightBumper()
.onTrue(Commands.runOnce(() -> coralRoller.setVoltage(-6), coralRoller));

controller
.leftTrigger()
Expand Down
50 changes: 0 additions & 50 deletions src/main/java/frc/robot/subsystems/coralrollerbar/CoralRoller.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

39 changes: 0 additions & 39 deletions src/main/java/frc/robot/subsystems/pivot/Pivot.java

This file was deleted.

7 changes: 0 additions & 7 deletions src/main/java/frc/robot/subsystems/pivot/PivotConstants.java

This file was deleted.

18 changes: 0 additions & 18 deletions src/main/java/frc/robot/subsystems/pivot/PivotIO.java

This file was deleted.

32 changes: 0 additions & 32 deletions src/main/java/frc/robot/subsystems/pivot/PivotIOReal.java

This file was deleted.

33 changes: 0 additions & 33 deletions src/main/java/frc/robot/subsystems/pivot/PivotIOSim.java

This file was deleted.

0 comments on commit 1d3657f

Please sign in to comment.