From 8eab390ab384a3ed742a6ed623906886036adfb0 Mon Sep 17 00:00:00 2001 From: bobopop787 Date: Sun, 22 Oct 2023 19:03:20 -0400 Subject: [PATCH] Fall fest fixes --- src/main/java/frc/robot/RobotContainer.java | 2 +- src/main/java/frc/robot/subsystems/Drivetrain.java | 5 ++++- src/main/java/frc/robot/subsystems/Lights.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index fa510da..e6bc23a 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -139,7 +139,7 @@ private void configureBindings() { m_auxBox.leftTrigger().onTrue(m_lights.runDefaultColor()); m_auxBox.rightTrigger(). onTrue( - Commands.run(() -> { + Commands.runOnce(() -> { m_drivetrain.togglePauseMainControl(); m_lights.setPauseMainControl(m_drivetrain.getPauseMainControl()); })); diff --git a/src/main/java/frc/robot/subsystems/Drivetrain.java b/src/main/java/frc/robot/subsystems/Drivetrain.java index 6fd2b92..2937311 100644 --- a/src/main/java/frc/robot/subsystems/Drivetrain.java +++ b/src/main/java/frc/robot/subsystems/Drivetrain.java @@ -234,12 +234,15 @@ public void setWheelSpeeds(double leftSpeed, double rightSpeed) { public Command arcadeDrive(DoubleSupplier forward, DoubleSupplier rot, double deadzone) { return this.run(() -> { - if(pauseMainControl) return; m_speedMult = fastMode ? 1 : (slowMode ? DriveConstants.slowModeMult : DriveConstants.defaultSpeedMult); double x = MathUtil.applyDeadband(forward.getAsDouble(), deadzone) * (DriveConstants.kMaxSpeedMetersPerSecond * m_speedMult); double z = MathUtil.applyDeadband(rot.getAsDouble(), deadzone) * (DriveConstants.kMaxRotationSpeedMetersPerSecond * m_speedMult); + if(pauseMainControl) { + x = 0; + z = 0; + } arcadeDrive( x, z); diff --git a/src/main/java/frc/robot/subsystems/Lights.java b/src/main/java/frc/robot/subsystems/Lights.java index 7a37bad..e32fea8 100644 --- a/src/main/java/frc/robot/subsystems/Lights.java +++ b/src/main/java/frc/robot/subsystems/Lights.java @@ -36,7 +36,7 @@ public Lights() { @Override public void periodic() { if(pauseMainControl) { - setColor((int) Timer.getFPGATimestamp() % 2 == 0 ? pausedColor : Color.kBlack); + setColor((int) (Timer.getFPGATimestamp() * 3) % 2 == 0 ? pausedColor : Color.kBlack); } else { setColor(color); }