diff --git a/src/main/java/frc/robot/commands/DefaultLEDCommand.java b/src/main/java/frc/robot/commands/DefaultLEDCommand.java index 6d837de..dfdb6e8 100644 --- a/src/main/java/frc/robot/commands/DefaultLEDCommand.java +++ b/src/main/java/frc/robot/commands/DefaultLEDCommand.java @@ -47,11 +47,11 @@ public void initialize() { } shootSpeed = m_shooterSubsystem.returnCurrentSpeed(); - if (shootSpeed > 500 && shootSpeed < 1899 * 2) {// if charging up + if (shootSpeed > 500 && shootSpeed < 1899 * Math.PI) { // if charging up rgb[0] = 150; rgb[1] = 150; rgb[2] = 0; - } else if (shootSpeed > 1899 * 2) {// if the shooter is ready to shoot + } else if (shootSpeed > 1899 * Math.PI) { // if the shooter is ready to shoot rgb[0] = 0; rgb[1] = 255; rgb[2] = 0; diff --git a/src/main/java/frc/robot/subsystems/LEDSubsystem.java b/src/main/java/frc/robot/subsystems/LEDSubsystem.java index 2e235d0..7ab725e 100644 --- a/src/main/java/frc/robot/subsystems/LEDSubsystem.java +++ b/src/main/java/frc/robot/subsystems/LEDSubsystem.java @@ -59,7 +59,7 @@ private void rainbow() { m_LEDBuffer.setHSV(i, hue, 255, 128); } // Increase by to make the rainbow "move" - m_rainbowFirstPixelHue += 1; + m_rainbowFirstPixelHue += 2; // Check bounds m_rainbowFirstPixelHue %= 180; diff --git a/src/main/java/frc/robot/subsystems/ShooterSubsystem.java b/src/main/java/frc/robot/subsystems/ShooterSubsystem.java index b765535..54ffc08 100644 --- a/src/main/java/frc/robot/subsystems/ShooterSubsystem.java +++ b/src/main/java/frc/robot/subsystems/ShooterSubsystem.java @@ -70,7 +70,7 @@ public double returnCurrentSpeed() { public void periodic() { // This method will be called once per scheduler run // SmartDashboard.putNumber("bottom Speed", m_bottomSpeed); - SmartDashboard.putNumber("top Speed", m_topSpeed); + SmartDashboard.putNumber("top Speed", m_bottom.getEncoder().getVelocity()); m_bottom.set(m_bottomSpeed); m_top.set(m_topSpeed);