From: iefomit Date: Mon, 16 Feb 2026 23:05:44 +0000 (-0800) Subject: revert for main X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=649d01ce0a08fd9cffb8130ba75d2dc3bcef0873;p=FRC2026.git revert for main --- diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index fc28b4d..be86b88 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -79,7 +79,7 @@ public class RobotContainer { default: case WaffleHouse: - + case SwerveCompetition: // AKA "Vantage" case BetaBot: // AKA "Pancake" @@ -95,31 +95,31 @@ public class RobotContainer { case PrimeJr: case Vertigo: // AKA "French Toast" - // drive = new Drivetrain(vision, new GyroIOPigeon2()); - // driver = new PS5ControllerDriverConfig(drive); - // operator = new Operator(drive); + drive = new Drivetrain(vision, new GyroIOPigeon2()); + driver = new PS5ControllerDriverConfig(drive); + operator = new Operator(drive); // Detected objects need access to the drivetrain - // DetectedObject.setDrive(drive); - + DetectedObject.setDrive(drive); + // SignalLogger.start(); - // driver.configureControls(); - // operator.configureControls(); - - // initializeAutoBuilder(); - // registerCommands(); - // PathGroupLoader.loadPathGroups(); - // // Load the auto command - // try { - // PathPlannerAuto.getPathGroupFromAutoFile("Command Name"); - // auto = new PathPlannerAuto("Path Name"); - // } catch (IOException | ParseException e) { - // e.printStackTrace(); - // } - // drive.setDefaultCommand(new DefaultDriveCommand(drive, driver)); + driver.configureControls(); + operator.configureControls(); + + initializeAutoBuilder(); + registerCommands(); + PathGroupLoader.loadPathGroups(); + // Load the auto command + try { + PathPlannerAuto.getPathGroupFromAutoFile("Command Name"); + auto = new PathPlannerAuto("Path Name"); + } catch (IOException | ParseException e) { + e.printStackTrace(); + } + drive.setDefaultCommand(new DefaultDriveCommand(drive, driver)); break; - } + } // This is really annoying so it's disabled DriverStation.silenceJoystickConnectionWarning(true); @@ -140,7 +140,6 @@ public class RobotContainer { drive.setVisionEnabled(enabled); } - public void initializeAutoBuilder() { AutoBuilder.configure( () -> drive.getPose(), @@ -177,15 +176,14 @@ public class RobotContainer { } public boolean brownout() { - if(RobotController.getBatteryVoltage() < 6.0) { + if (RobotController.getBatteryVoltage() < 6.0) { return true; - } - else { + } else { return false; } } -// Autos + // Autos /** * Initialize the SendableChooser on the SmartDashbboard. @@ -204,6 +202,7 @@ public class RobotContainer { /** * Gets the auto command from SmartDashboard + * * @return */ public Command getAutoCommand() { @@ -213,16 +212,14 @@ public class RobotContainer { return autoSelected; } - public void logComponents(){ - if(!Constants.LOG_MECHANISMS) return; - + public void logComponents() { + if (!Constants.LOG_MECHANISMS) + return; + Logger.recordOutput( - "ComponentPoses", - new Pose3d[] { + "ComponentPoses", + new Pose3d[] { // Subsystem Pose3ds - } - ); + }); } } - - diff --git a/src/main/java/frc/robot/constants/Climb/ClimbConstants.java b/src/main/java/frc/robot/constants/Climb/ClimbConstants.java index acfdf77..853a6c5 100644 --- a/src/main/java/frc/robot/constants/Climb/ClimbConstants.java +++ b/src/main/java/frc/robot/constants/Climb/ClimbConstants.java @@ -1,7 +1,7 @@ package frc.robot.constants.Climb; public class ClimbConstants { - + // CHANGE LATER public final static double CLIMB_GEAR_RATIO = 9.0 / 1 * 5.0 / 1; public final static double MAX_VELOCITY = 1; diff --git a/src/main/java/frc/robot/subsystems/Climb/LinearClimb.java b/src/main/java/frc/robot/subsystems/Climb/LinearClimb.java index ba99c2d..3edc773 100644 --- a/src/main/java/frc/robot/subsystems/Climb/LinearClimb.java +++ b/src/main/java/frc/robot/subsystems/Climb/LinearClimb.java @@ -122,4 +122,4 @@ public class LinearClimb extends SubsystemBase { counter = 0; setCurrentLimits(ClimbConstants.STRONG_CURRENT); } -} \ No newline at end of file +}