Skip to content

Commit 2a1858b

Browse files
committed
removed SimpleShooterSubsystem and debug
1 parent 437c8e9 commit 2a1858b

File tree

4 files changed

+9
-124
lines changed

4 files changed

+9
-124
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import frc.robot.subsystems.indexer.IndexerSubsystem;
2424
import frc.robot.subsystems.intake.IntakeSubsystem;
2525
import frc.robot.subsystems.shooter.ShooterSubsystem;
26-
import frc.robot.subsystems.shooter.SimpleShooterSubsystem;
2726

2827
@Logged
2928
public class RobotContainer {
@@ -46,7 +45,6 @@ public class RobotContainer {
4645
@Logged(name = "Shooter")
4746
public final ShooterSubsystem shooter = new ShooterSubsystem();
4847

49-
public final SimpleShooterSubsystem simpleShooter = new SimpleShooterSubsystem();
5048

5149
private final SendableChooser<Command> autoChooser;
5250

@@ -105,10 +103,10 @@ public void configureTestBindings() {
105103
driverJoystick.rightBumper().onTrue(Commands.runOnce(SignalLogger::start));
106104
driverJoystick.leftBumper().onTrue(Commands.runOnce(SignalLogger::stop));
107105

108-
operatorJoystick.y().whileTrue(simpleShooter.sysIdQuasistatic(SysIdRoutine.Direction.kForward));
109-
operatorJoystick.a().whileTrue(simpleShooter.sysIdQuasistatic(SysIdRoutine.Direction.kReverse));
110-
operatorJoystick.b().whileTrue(simpleShooter.sysIdDynamic(SysIdRoutine.Direction.kForward));
111-
operatorJoystick.x().whileTrue(simpleShooter.sysIdDynamic(SysIdRoutine.Direction.kReverse));
106+
operatorJoystick.y().whileTrue(shooter.sysIdQuasistatic(SysIdRoutine.Direction.kForward));
107+
operatorJoystick.a().whileTrue(shooter.sysIdQuasistatic(SysIdRoutine.Direction.kReverse));
108+
operatorJoystick.b().whileTrue(shooter.sysIdDynamic(SysIdRoutine.Direction.kForward));
109+
operatorJoystick.x().whileTrue(shooter.sysIdDynamic(SysIdRoutine.Direction.kReverse));
112110

113111
// Reset the field-centric heading on left bumper press.
114112
driverJoystick.start().onTrue(drivetrain.runOnce(drivetrain::seedFieldCentric));
@@ -140,7 +138,7 @@ public void configureTeleopBindings() {
140138
driverJoystick
141139
.leftTrigger()
142140
.whileTrue(shooter.launchLemonsCommand())
143-
.onFalse(simpleShooter.stopLaunchLemonsNoPIDCommand());
141+
.onFalse(shooter.stopLaunchLemonsNoPIDCommand());
144142

145143
driverJoystick
146144
.rightTrigger()
@@ -149,8 +147,8 @@ public void configureTeleopBindings() {
149147

150148
operatorJoystick
151149
.leftTrigger()
152-
.whileTrue(simpleShooter.launchLemonsCommandNoPID())
153-
.onFalse(simpleShooter.stopLaunchLemonsNoPIDCommand());
150+
.whileTrue(shooter.launchLemonsCommandNoPID())
151+
.onFalse(shooter.stopLaunchLemonsNoPIDCommand());
154152

155153
operatorJoystick
156154
.rightTrigger()

src/main/java/frc/robot/subsystems/intake/IntakeConstants.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.ctre.phoenix6.configs.MotorOutputConfigs;
44
import com.ctre.phoenix6.configs.Slot0Configs;
55
import com.ctre.phoenix6.configs.SoftwareLimitSwitchConfigs;
6-
import com.ctre.phoenix6.signals.InvertedValue;
76
import com.ctre.phoenix6.signals.NeutralModeValue;
87

98
public class IntakeConstants {
@@ -58,7 +57,7 @@ public static SoftwareLimitSwitchConfigs createExtensionSoftwareLimitSwitchConfi
5857

5958
public static MotorOutputConfigs createExtensionMotorOutputConfigs() {
6059
MotorOutputConfigs newConfigs = new MotorOutputConfigs();
61-
//newConfigs.Inverted = InvertedValue.Clockwise_Positive;
60+
// newConfigs.Inverted = InvertedValue.Clockwise_Positive;
6261
newConfigs.NeutralMode = NeutralModeValue.Coast;
6362
return newConfigs;
6463
}

src/main/java/frc/robot/subsystems/intake/IntakeSubsystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private void setRollerVoltage(double magnitude) {
8686
rollerMotor.setVoltage(magnitude);
8787
}
8888

89-
public Command setRollerNoPID() {
89+
public Command startRollerNoPID() {
9090
return run(() -> rollerMotor.set(IntakePreferences.rollerIntakePercent.getValue()))
9191
.withName("Set Roller Percent");
9292
}

src/main/java/frc/robot/subsystems/shooter/SimpleShooterSubsystem.java

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)