From 5130512c8ef82bd0a06dc405f59629a354c3ca1d Mon Sep 17 00:00:00 2001 From: Cherriae Date: Sat, 19 Oct 2024 17:38:51 -0400 Subject: [PATCH] final qual for saturday --- src/main/java/frc/robot/Constants.java | 2 +- .../frc/robot/subsystems/ElevatorSubsystem.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java index 1637050..a79b683 100644 --- a/src/main/java/frc/robot/Constants.java +++ b/src/main/java/frc/robot/Constants.java @@ -77,7 +77,7 @@ public static class Speeds { public static final double SHOOTER_IDLE_SPEED = 0.3; public static final double SHOOTER_ANGLE_MAX_SPEED = 0.3; - public static final double ELEVATOR_MAX_SPEED = 1; + public static final double ELEVATOR_MAX_SPEED = 0.6; public static final double INTAKE_FEED_SPEED = 0.6; public static final double OUTTAKE_FEED_SPEED = -0.4; diff --git a/src/main/java/frc/robot/subsystems/ElevatorSubsystem.java b/src/main/java/frc/robot/subsystems/ElevatorSubsystem.java index 4ff9972..f4a8056 100644 --- a/src/main/java/frc/robot/subsystems/ElevatorSubsystem.java +++ b/src/main/java/frc/robot/subsystems/ElevatorSubsystem.java @@ -125,6 +125,22 @@ public void driveElevator(double speed) { // _leftMotor.set(ff + speed); } + public void operateElevator(double speed) { + double ff = 0; + + if (_usingClimberFeed) + // ff = _climbFeed.calculate(speed); + ff = _climbFeed.calculate(0); + else { + // ff = _elevatorFeed.calculate(speed); + ff = _elevatorFeed.calculate(speed); + } + + ff = UtilFuncs.FromVolts(ff); + + _leftMotor.set(ff + speed); + } + /** Stops elevator movement. */ public void stopElevator() { driveElevator(0);