Fix conflicts with main

robototes · Mar 19, 2024 · 97971aa · 97971aa
1 parent cc5a16e
commit 97971aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/main/java/frc/team2412/robot/Controls.java b/src/main/java/frc/team2412/robot/Controls.java
@@ -20,7 +20,6 @@
 import frc.team2412.robot.commands.intake.AllStopCommand;
 import frc.team2412.robot.commands.intake.FeederInCommand;
 import frc.team2412.robot.commands.intake.IntakeRejectCommand;
-import frc.team2412.robot.commands.intake.RumbleCommand;
 import frc.team2412.robot.commands.launcher.FullTargetCommand;
 import frc.team2412.robot.commands.launcher.ManualAngleCommand;
 import frc.team2412.robot.commands.launcher.SetAngleAmpLaunchCommand;

diff --git a/src/main/java/frc/team2412/robot/subsystems/IntakeSubsystem.java b/src/main/java/frc/team2412/robot/subsystems/IntakeSubsystem.java
@@ -91,8 +91,7 @@ public IntakeSubsystem() {
 		intakeLeftSensor = intakeMotorLeft.getForwardLimitSwitch(SparkLimitSwitch.Type.kNormallyOpen);
 		intakeRightSensor = intakeMotorRight.getForwardLimitSwitch(SparkLimitSwitch.Type.kNormallyOpen);
 
-
-	//todo: MOVE THIS TO CONFIGURE MOTOR
+		// todo: MOVE THIS TO CONFIGURE MOTOR
 		intakeFrontSensor.enableLimitSwitch(false);
 		intakeLeftSensor.enableLimitSwitch(false);
 		intakeRightSensor.enableLimitSwitch(false);
@@ -250,7 +249,7 @@ public boolean getSensorOverride() {
 	public boolean getRejectOverride() {
 		return rejectOverride.getBoolean(false);
 	}
-	
+
 	// logging
 	public void initShuffleboard() {
 		if (Robot.isDebugMode()) {
@@ -291,7 +290,7 @@ public void initShuffleboard() {
 		shuffleboardTab.addBoolean("Intake Front Sensor - ", this::intakeFrontSeesNote).withSize(1, 1);
 		shuffleboardTab.addBoolean("Intake Left Sensor - ", this::intakeLeftSeesNote).withSize(1, 1);
 		shuffleboardTab.addBoolean("Intake Right Sensor - ", this::intakeRightSeesNote).withSize(1, 1);
-		
+
 		setIntakeInSpeedEntry =
 				shuffleboardTab
 						.addPersistent("Intake in speed - ", INTAKE_IN_SPEED)