From 7f5af868008669b0002bfa4b2e164cc6bff587fe Mon Sep 17 00:00:00 2001 From: Noah Date: Fri, 18 Oct 2024 00:44:58 +0000 Subject: [PATCH] Fixed formatting and code errors --- src/main/java/frc/robot/RobotContainer.java | 26 +++++++++---------- .../DrivetrainConstants.java | 2 +- .../FlipperConstants.java | 2 +- .../{Constants => constants}/OIConstants.java | 2 +- .../ShooterConstants.java | 2 +- .../Drivetrain.java | 4 +-- .../{Subsystems => subsystems}/Flipper.java | 4 +-- .../{Subsystems => subsystems}/Shooter.java | 4 +-- 8 files changed, 23 insertions(+), 23 deletions(-) rename src/main/java/frc/robot/{Constants => constants}/DrivetrainConstants.java (88%) rename src/main/java/frc/robot/{Constants => constants}/FlipperConstants.java (81%) rename src/main/java/frc/robot/{Constants => constants}/OIConstants.java (81%) rename src/main/java/frc/robot/{Constants => constants}/ShooterConstants.java (81%) rename src/main/java/frc/robot/{Subsystems => subsystems}/Drivetrain.java (95%) rename src/main/java/frc/robot/{Subsystems => subsystems}/Flipper.java (93%) rename src/main/java/frc/robot/{Subsystems => subsystems}/Shooter.java (91%) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index d6f08a8..64b2dc4 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -9,10 +9,10 @@ import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard; import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.button.CommandXboxController; -import frc.robot.Constants.OIConstants; -import frc.robot.Subsystems.Drivetrain; -import frc.robot.Subsystems.Flipper; -import frc.robot.Subsystems.Shooter; +import frc.robot.constants.OIConstants; +import frc.robot.subsystems.Drivetrain; +import frc.robot.subsystems.Flipper; +import frc.robot.subsystems.Shooter; public class RobotContainer { @@ -35,12 +35,12 @@ public class RobotContainer { configureShuffleboard(); } - //runs our autonomous command// + //moves forwards at half speed for 2 seconds, runs the shooter for 1 second, then runs the shooter & flipper for 3 seconds// public Command getAutonomousCommand() { return drivetrain.driveTank(() -> .5, () -> .5).withTimeout(2) - .andThen(shooter.runShooter()).withTimeout(1) - .andThen(shooter.runShooter() - .alongWith(flipper.runFlipper()).withTimeout(3)); + .andThen(shooter.runShooter()).withTimeout(1) + .andThen(shooter.runShooter() + .alongWith(flipper.runFlipper()).withTimeout(3)); } //sets up the default commands for each subsystem// @@ -62,11 +62,11 @@ public class RobotContainer { //creates tabs and transforms them on the shuffleboard// private void configureShuffleboard() { - ShuffleboardTab robotIndicatorTab = Shuffleboard.getTab(OIConstants.kSensorsTab); + ShuffleboardTab sensorTab = Shuffleboard.getTab(OIConstants.kSensorsTab); - robotIndicatorTab.addBoolean("Frisbee Loaded?", flipper::getPhotoSwitch1) - .withPosition(0, 0) - .withSize(2, 1) - .withWidget(BuiltInWidgets.kBooleanBox); + sensorTab.addBoolean("Frisbee Loaded?", flipper::getPhotoSwitch1) + .withPosition(0, 0) + .withSize(2, 1) + .withWidget(BuiltInWidgets.kBooleanBox); } } diff --git a/src/main/java/frc/robot/Constants/DrivetrainConstants.java b/src/main/java/frc/robot/constants/DrivetrainConstants.java similarity index 88% rename from src/main/java/frc/robot/Constants/DrivetrainConstants.java rename to src/main/java/frc/robot/constants/DrivetrainConstants.java index 1829eee..2d552bd 100644 --- a/src/main/java/frc/robot/Constants/DrivetrainConstants.java +++ b/src/main/java/frc/robot/constants/DrivetrainConstants.java @@ -1,4 +1,4 @@ -package frc.robot.Constants; +package frc.robot.constants; public class DrivetrainConstants { public static final int kLeftFrontPWM = 0; diff --git a/src/main/java/frc/robot/Constants/FlipperConstants.java b/src/main/java/frc/robot/constants/FlipperConstants.java similarity index 81% rename from src/main/java/frc/robot/Constants/FlipperConstants.java rename to src/main/java/frc/robot/constants/FlipperConstants.java index 49898d5..09b20ca 100644 --- a/src/main/java/frc/robot/Constants/FlipperConstants.java +++ b/src/main/java/frc/robot/constants/FlipperConstants.java @@ -1,4 +1,4 @@ -package frc.robot.Constants; +package frc.robot.constants; public class FlipperConstants { public static final int kFlipperPhotoSwitch = 0; diff --git a/src/main/java/frc/robot/Constants/OIConstants.java b/src/main/java/frc/robot/constants/OIConstants.java similarity index 81% rename from src/main/java/frc/robot/Constants/OIConstants.java rename to src/main/java/frc/robot/constants/OIConstants.java index a3baed4..c142843 100644 --- a/src/main/java/frc/robot/Constants/OIConstants.java +++ b/src/main/java/frc/robot/constants/OIConstants.java @@ -1,4 +1,4 @@ -package frc.robot.Constants; +package frc.robot.constants; public class OIConstants { public static final int kDriverUSB = 0; diff --git a/src/main/java/frc/robot/Constants/ShooterConstants.java b/src/main/java/frc/robot/constants/ShooterConstants.java similarity index 81% rename from src/main/java/frc/robot/Constants/ShooterConstants.java rename to src/main/java/frc/robot/constants/ShooterConstants.java index 0e5a7a3..53433e8 100644 --- a/src/main/java/frc/robot/Constants/ShooterConstants.java +++ b/src/main/java/frc/robot/constants/ShooterConstants.java @@ -1,4 +1,4 @@ -package frc.robot.Constants; +package frc.robot.constants; public class ShooterConstants { public static final int frontMotorPWM = 4; diff --git a/src/main/java/frc/robot/Subsystems/Drivetrain.java b/src/main/java/frc/robot/subsystems/Drivetrain.java similarity index 95% rename from src/main/java/frc/robot/Subsystems/Drivetrain.java rename to src/main/java/frc/robot/subsystems/Drivetrain.java index e918229..b5cb131 100644 --- a/src/main/java/frc/robot/Subsystems/Drivetrain.java +++ b/src/main/java/frc/robot/subsystems/Drivetrain.java @@ -1,4 +1,4 @@ -package frc.robot.Subsystems; +package frc.robot.subsystems; import java.util.function.DoubleSupplier; @@ -6,7 +6,7 @@ import edu.wpi.first.wpilibj.drive.DifferentialDrive; import edu.wpi.first.wpilibj.motorcontrol.VictorSP; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.SubsystemBase; -import frc.robot.Constants.DrivetrainConstants; +import frc.robot.constants.DrivetrainConstants; public class Drivetrain extends SubsystemBase { diff --git a/src/main/java/frc/robot/Subsystems/Flipper.java b/src/main/java/frc/robot/subsystems/Flipper.java similarity index 93% rename from src/main/java/frc/robot/Subsystems/Flipper.java rename to src/main/java/frc/robot/subsystems/Flipper.java index f601f6e..bcd4e6d 100644 --- a/src/main/java/frc/robot/Subsystems/Flipper.java +++ b/src/main/java/frc/robot/subsystems/Flipper.java @@ -1,10 +1,10 @@ -package frc.robot.Subsystems; +package frc.robot.subsystems; import edu.wpi.first.wpilibj.DigitalInput; import edu.wpi.first.wpilibj.motorcontrol.VictorSP; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.SubsystemBase; -import frc.robot.Constants.FlipperConstants; +import frc.robot.constants.FlipperConstants; public class Flipper extends SubsystemBase{ diff --git a/src/main/java/frc/robot/Subsystems/Shooter.java b/src/main/java/frc/robot/subsystems/Shooter.java similarity index 91% rename from src/main/java/frc/robot/Subsystems/Shooter.java rename to src/main/java/frc/robot/subsystems/Shooter.java index 1b6236b..556c8e7 100644 --- a/src/main/java/frc/robot/Subsystems/Shooter.java +++ b/src/main/java/frc/robot/subsystems/Shooter.java @@ -1,9 +1,9 @@ -package frc.robot.Subsystems; +package frc.robot.subsystems; import edu.wpi.first.wpilibj.motorcontrol.VictorSP; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.SubsystemBase; -import frc.robot.Constants.ShooterConstants; +import frc.robot.constants.ShooterConstants; public class Shooter extends SubsystemBase{