diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java index 9e32324..3510e8b 100644 --- a/src/main/java/frc/robot/Robot.java +++ b/src/main/java/frc/robot/Robot.java @@ -8,6 +8,7 @@ import edu.wpi.first.math.geometry.Rotation2d; import edu.wpi.first.wpilibj.TimedRobot; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.CommandScheduler; +import frc.robot.subsystems.ShooterSubsystem; public class Robot extends TimedRobot { private Command m_autonomousCommand; @@ -26,7 +27,12 @@ public class Robot extends TimedRobot { } @Override - public void disabledInit() {} + public void disabledInit() { + System.out.println("Robot disabledInit called"); + m_robotContainer.shooterSubsystem.stopAll(); + m_robotContainer.climberSubsystem.stopAll(); + m_robotContainer.IntakerSubsystem.stopAll(); + } @Override public void disabledPeriodic() {} diff --git a/src/main/java/frc/robot/subsystems/ClimberSubsystem.java b/src/main/java/frc/robot/subsystems/ClimberSubsystem.java index c50d994..f65ab12 100644 --- a/src/main/java/frc/robot/subsystems/ClimberSubsystem.java +++ b/src/main/java/frc/robot/subsystems/ClimberSubsystem.java @@ -126,6 +126,10 @@ public class ClimberSubsystem extends SubsystemBase { autoClimbUsedInAuto = false; } + public void stopAll() { + climberMotor.set(0); + } + @Override public void periodic() { climberTable.getEntry("velocityRps").setDouble(getVelocityRps()); diff --git a/src/main/java/frc/robot/subsystems/IntakerSubsystem.java b/src/main/java/frc/robot/subsystems/IntakerSubsystem.java index f1603fd..7a77f9b 100644 --- a/src/main/java/frc/robot/subsystems/IntakerSubsystem.java +++ b/src/main/java/frc/robot/subsystems/IntakerSubsystem.java @@ -106,4 +106,8 @@ public class IntakerSubsystem extends SubsystemBase{ public void setIntakerRotater(double rotaterspeed){ intakerotater.set(rotaterspeed); } + public void stopAll() { + stopIntakerotater(); + setIntakerGetterSpeed(0); + } } diff --git a/src/main/java/frc/robot/subsystems/ShooterSubsystem.java b/src/main/java/frc/robot/subsystems/ShooterSubsystem.java index a059a36..9a75144 100644 --- a/src/main/java/frc/robot/subsystems/ShooterSubsystem.java +++ b/src/main/java/frc/robot/subsystems/ShooterSubsystem.java @@ -185,4 +185,9 @@ public class ShooterSubsystem extends SubsystemBase { public double getDistanceToPassball(){ return NetworkTableInstance.getDefault().getTable("AutoControl").getEntry("distanceToPassball").getDouble(0.0); } + public void stopAll() { + setFlywheelSpeedByRPS(0); + setConveyorSpeedByRPS(0); + backboardMotor.set(0); + } }