From 9dc2ba27d4e9be0b33498452f2d98202feef64ed Mon Sep 17 00:00:00 2001 From: OakvilleDynamicsProgrammer Date: Mon, 11 Mar 2024 15:25:43 -0500 Subject: [PATCH] Fixed Red Lines Fixed all of the redlines, not sure if it works as the bot is in multiple pieces at the time of this commit being made. --- src/main/java/frc/robot/RobotContainer.java | 12 +++++++----- src/main/java/frc/robot/subsystems/Elevator.java | 3 +-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index f4a5432..a0d374d 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -21,14 +21,16 @@ import frc.robot.Constants.OperatorConstants; import frc.robot.commands.ConveyorCommand; import frc.robot.commands.DumpControl; -import frc.robot.commands.FlyWCommand; import frc.robot.commands.IntakeCommand; import frc.robot.commands.swervedrive.drivebase.AbsoluteDriveAdv; import frc.robot.subsystems.Conveyor; import frc.robot.subsystems.Dump; -import frc.robot.subsystems.FlyWheel; import frc.robot.subsystems.Intake; import frc.robot.subsystems.swervedrive.SwerveSubsystem; +import frc.robot.commands.FlyWCommand; +import frc.robot.commands.ElevatorControl; +import frc.robot.subsystems.Elevator; +import frc.robot.subsystems.FlyWheel; import java.io.File; /** @@ -53,8 +55,8 @@ public class RobotContainer { private final Intake intake = new Intake(); private final Dump dump = new Dump(); private final Conveyor conveyor = new Conveyor(); - private final FlyWheel flyWheel = new FlyWheel(); - private final Flywheel elevator = new elevator(); + private final FlyWheel FlyWheel = new FlyWheel(); + private final Elevator elevator = new Elevator(); /** The container for the robot. Contains subsystems, OI devices, and commands. */ public RobotContainer() { @@ -62,7 +64,7 @@ public RobotContainer() { intake.setDefaultCommand(new IntakeCommand(intake)); dump.setDefaultCommand(new DumpControl(dump)); conveyor.setDefaultCommand(new ConveyorCommand(conveyor)); - flyWheel.setDefaultCommand(new FlyWCommand(flyWheel)); + FlyWheel.setDefaultCommand(new FlyWCommand(FlyWheel)); elevator.setDefaultCommand(new ElevatorControl(elevator)); // Configure the trigger bindings diff --git a/src/main/java/frc/robot/subsystems/Elevator.java b/src/main/java/frc/robot/subsystems/Elevator.java index 5a3bb61..b7fd9fe 100644 --- a/src/main/java/frc/robot/subsystems/Elevator.java +++ b/src/main/java/frc/robot/subsystems/Elevator.java @@ -4,7 +4,6 @@ package frc.robot.subsystems; -import edu.wpi.first.math.proto.System; import edu.wpi.first.wpilibj.DoubleSolenoid; import edu.wpi.first.wpilibj.PneumaticsModuleType; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; @@ -24,7 +23,7 @@ public class Elevator extends SubsystemBase { /** Create new pnuematic system */ public Elevator() { - System.out.println("Pneumatic Elevator initialized"); + System.out.println("Elevator Initialized"); SmartDashboard.putBoolean(getName(), false); }