Skip to content

Commit 08a9533

Browse files
committed
Cleanup logic
1 parent 44bcf5e commit 08a9533

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

src/main/java/frc/robot/RobotContainer.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class RobotContainer {
5252
@Logged(name = "Hood", importance = Logged.Importance.INFO)
5353
private Hood m_hood;
5454

55-
private CommandSwerveDrivetrain m_swerveDrive = V1Constants.createDrivetrain();
55+
private final CommandSwerveDrivetrain m_swerveDrive = V1Constants.createDrivetrain();
5656

5757
@Logged(name = "Intake", importance = Logged.Importance.INFO)
5858
private Intake m_intake;
@@ -106,7 +106,7 @@ public boolean isHubActive() {
106106
private Robot2d m_robotSim;
107107
private final Telemetry m_telemetry = new Telemetry(MaxSpeed, SWERVE.kModuleTranslations);
108108
private FieldSim m_fieldSim = new FieldSim();
109-
private FuelSim m_fuelSim = FuelSim.getInstance();
109+
private final FuelSim m_fuelSim = FuelSim.getInstance();
110110

111111
@Logged(name = "AutoChooser")
112112
private final SendableChooser<Command> m_autoChooser = new SendableChooser<>();
@@ -175,20 +175,20 @@ private void initializeSubSystems() {
175175

176176
private void configureBindings() {
177177
// aim at target
178-
if (m_swerveDrive != null && m_vision != null && m_flywheel != null && m_hood != null) {
178+
if (m_vision != null && m_flywheel != null && m_hood != null) {
179179
m_driverController
180180
.rightBumper()
181181
.toggleOnTrue(
182182
new ParallelCommandGroup(
183183
new AutoAlignDrive(
184184
m_swerveDrive,
185185
m_vision,
186-
() -> m_driverController.getLeftY(),
187-
() -> m_driverController.getLeftX()),
186+
m_driverController::getLeftY,
187+
m_driverController::getLeftX),
188188
new Shoot(m_flywheel, m_vision, m_hood)));
189189
}
190190

191-
if (m_swerveDrive != null && m_vision != null) {
191+
if (m_vision != null) {
192192
m_driverController
193193
.leftBumper()
194194
.toggleOnTrue(
@@ -199,7 +199,7 @@ private void configureBindings() {
199199
m_driverController::getLeftX));
200200
}
201201

202-
if (m_swerveDrive != null && m_flywheel != null && m_vision != null) {
202+
if (m_flywheel != null && m_vision != null) {
203203
m_driverController.x().whileTrue(new Shoot(m_flywheel, m_vision, m_hood));
204204
m_driverController
205205
.a()

0 commit comments

Comments
 (0)