From f3c16970288b1f6d4b3b934afa489c2601863264 Mon Sep 17 00:00:00 2001 From: wpiformat <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 18:33:04 +0000 Subject: [PATCH] Automated formatting changes --- src/main/Choreo autobuilder.chor | 2 +- src/main/cpp/RobotContainer.cpp | 6 +---- .../autonomous/autonomous_summer_activity.cpp | 23 +++++++++---------- src/main/include/RobotContainer.h | 2 +- .../autonomous/autonomous_summer_activity.h | 2 +- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/main/Choreo autobuilder.chor b/src/main/Choreo autobuilder.chor index cb1132f7..f758805c 100644 --- a/src/main/Choreo autobuilder.chor +++ b/src/main/Choreo autobuilder.chor @@ -41,4 +41,4 @@ }, "splitTrajectoriesAtStopPoints": true, "usesObstacles": true -} \ No newline at end of file +} diff --git a/src/main/cpp/RobotContainer.cpp b/src/main/cpp/RobotContainer.cpp index ebea3406..389dd1e7 100644 --- a/src/main/cpp/RobotContainer.cpp +++ b/src/main/cpp/RobotContainer.cpp @@ -179,11 +179,7 @@ RobotContainer::RobotContainer() // &m_autoSourceSideSubwoofer3PieceSteal, &m_autoChoreoTest}, &m_autoNothing} - , m_autoSummer{m_intakeSubsystem, - m_ShooterSubSystem, - m_elevatorSubsystem, - m_climberSubsystem, - m_swerveDrive} + , m_autoSummer{m_intakeSubsystem, m_ShooterSubSystem, m_elevatorSubsystem, m_climberSubsystem, m_swerveDrive} , m_transitionedFromAuto{false} { // Initialize all of your commands and subsystems here diff --git a/src/main/cpp/commands/autonomous/autonomous_summer_activity.cpp b/src/main/cpp/commands/autonomous/autonomous_summer_activity.cpp index 84fd9492..d0274f3a 100644 --- a/src/main/cpp/commands/autonomous/autonomous_summer_activity.cpp +++ b/src/main/cpp/commands/autonomous/autonomous_summer_activity.cpp @@ -11,18 +11,17 @@ #include "commands/drive_choreo.h" -AutonomousSummerActivty::AutonomousSummerActivty( - IntakeSubsystem& intake, - ShooterSubsystem& shooter, - ElevatorSubsystem& elevator, - ClimberSubsystem& climb, - SwerveDriveSubsystem& swerve) - : m_Intake{intake}, - m_Shooter{shooter}, - m_Elevator{elevator}, - m_Climb{climb}, - m_Swerve{swerve}, - m_commands{frc2::SequentialCommandGroup{DriveChoreo{m_Swerve, "Any_0Note", true}}} {} +AutonomousSummerActivty::AutonomousSummerActivty(IntakeSubsystem& intake, + ShooterSubsystem& shooter, + ElevatorSubsystem& elevator, + ClimberSubsystem& climb, + SwerveDriveSubsystem& swerve) + : m_Intake{intake} + , m_Shooter{shooter} + , m_Elevator{elevator} + , m_Climb{climb} + , m_Swerve{swerve} + , m_commands{frc2::SequentialCommandGroup{DriveChoreo{m_Swerve, "Any_0Note", true}}} {} // Called when the command is initially scheduled. void AutonomousSummerActivty::Initialize() { diff --git a/src/main/include/RobotContainer.h b/src/main/include/RobotContainer.h index f4d84b9d..1bc0fbf4 100644 --- a/src/main/include/RobotContainer.h +++ b/src/main/include/RobotContainer.h @@ -28,8 +28,8 @@ #include "commands/autonomous/autonomous_source_side_subwoofer_4_piece.h" #include "commands/autonomous/autonomous_source_side_subwoofer_5_piece.h" #include "commands/autonomous/autonomous_source_side_subwoofer_steal2.h" -#include "commands/autonomous/autonomous_zero_note.h" #include "commands/autonomous/autonomous_summer_activity.h" +#include "commands/autonomous/autonomous_zero_note.h" #include "commands/climber_command.h" #include "commands/climber_homing_command.h" #include "commands/crossfield_shot_command.h" diff --git a/src/main/include/commands/autonomous/autonomous_summer_activity.h b/src/main/include/commands/autonomous/autonomous_summer_activity.h index 39538ec8..d0707594 100644 --- a/src/main/include/commands/autonomous/autonomous_summer_activity.h +++ b/src/main/include/commands/autonomous/autonomous_summer_activity.h @@ -12,11 +12,11 @@ #include #include "commands/autonomous/autonomous_command.h" -#include "subsystems/swerve_drive_subsystem.h" #include "subsystems/climber_subsystem.h" #include "subsystems/elevator_subsystem.h" #include "subsystems/intake_subsystem.h" #include "subsystems/shooter_subsystem.h" +#include "subsystems/swerve_drive_subsystem.h" class AutonomousSummerActivty : public frc2::CommandHelper