diff --git a/src/main/java/frc4388/robot/Constants.java b/src/main/java/frc4388/robot/Constants.java index ce15b92..9d6381f 100644 --- a/src/main/java/frc4388/robot/Constants.java +++ b/src/main/java/frc4388/robot/Constants.java @@ -105,12 +105,6 @@ public final class Constants { public static final class GyroConstants { public static final int ID = 14; // TODO: find the actual ID } - - public static final class ArmConstants { - public static final int MIN_ARM_LEN = 0; - public static final int MAX_ARM_LEN = 1; - public static final int SMARTDASHBOARD_UPDATE_FRAME = 2; - } public static final class ArmConstants { public static final double MIN_ARM_LEN = 1; diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 7c897c3..78b2aea 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -7,42 +7,17 @@ package frc4388.robot; -import java.util.ArrayList; -import java.util.List; - -import org.opencv.objdetect.HOGDescriptor; - -import edu.wpi.first.math.controller.HolonomicDriveController; -import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.controller.ProfiledPIDController; -import edu.wpi.first.math.geometry.Pose2d; -import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.trajectory.Trajectory; -import edu.wpi.first.math.trajectory.TrajectoryConfig; -import edu.wpi.first.math.trajectory.TrajectoryGenerator; -import edu.wpi.first.math.trajectory.Trajectory.State; -import edu.wpi.first.wpilibj.Joystick; import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.InstantCommand; import edu.wpi.first.wpilibj2.command.RunCommand; -import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; -import edu.wpi.first.wpilibj2.command.SwerveControllerCommand; import edu.wpi.first.wpilibj2.command.button.JoystickButton; import frc4388.robot.Constants.*; import frc4388.robot.subsystems.Arm; -import frc4388.robot.subsystems.LED; -import frc4388.robot.Constants.SwerveDriveConstants.AutoConstants; -import frc4388.robot.Constants.SwerveDriveConstants.PIDConstants; import frc4388.robot.commands.AutoBalance; import frc4388.robot.subsystems.SwerveDrive; -import frc4388.utility.controller.IHandController; -import frc4388.robot.commands.JoystickPlayback; import frc4388.robot.commands.JoystickRecorder; import frc4388.robot.commands.PlaybackChooser; -import frc4388.robot.subsystems.SwerveDrive; import frc4388.utility.controller.DeadbandedXboxController; import frc4388.utility.controller.XboxController; @@ -59,7 +34,7 @@ public class RobotContainer { /* Subsystems */ private final Arm m_robotArm = new Arm(m_robotMap.pivot, m_robotMap.tele, m_robotMap.pivotEncoder); - private final LED m_robotLED = new LED(m_robotMap.LEDController); + // private final LED m_robotLED = new LED(m_robotMap.LEDController); public final SwerveDrive m_robotSwerveDrive = new SwerveDrive(m_robotMap.leftFront, @@ -75,7 +50,7 @@ public class RobotContainer { /* Autos */ public SendableChooser chooser = new SendableChooser<>(); - private Command noAuto = new InstantCommand(); + // private Command noAuto = new InstantCommand(); // private Command balance = new AutoBalance(m_robotMap.gyro, m_robotSwerveDrive); diff --git a/src/main/java/frc4388/robot/RobotMap.java b/src/main/java/frc4388/robot/RobotMap.java index e454e52..6762ddd 100644 --- a/src/main/java/frc4388/robot/RobotMap.java +++ b/src/main/java/frc4388/robot/RobotMap.java @@ -9,12 +9,10 @@ package frc4388.robot; import com.ctre.phoenix.motorcontrol.NeutralMode; import com.ctre.phoenix.motorcontrol.can.WPI_TalonFX; -import com.ctre.phoenix.motorcontrol.NeutralMode; import com.ctre.phoenix.sensors.CANCoder; import com.ctre.phoenix.sensors.WPI_Pigeon2; import frc4388.robot.Constants.ArmConstants; -import frc4388.robot.Constants.LEDConstants; import frc4388.robot.Constants.SwerveDriveConstants; import frc4388.robot.subsystems.SwerveModule; import frc4388.utility.RobotGyro;