From bf06fbf821096fdc869df13966149e174d81ba5e Mon Sep 17 00:00:00 2001 From: Ryan Manley <42309874+ryan123rudder@users.noreply.github.com> Date: Sat, 14 Jan 2023 15:23:48 -0700 Subject: [PATCH] ;;;; --- .../commands/PelvicInflamitoryDisease.java | 72 +++++++++---------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/src/main/java/frc4388/robot/commands/PelvicInflamitoryDisease.java b/src/main/java/frc4388/robot/commands/PelvicInflamitoryDisease.java index e377c0a..df24402 100644 --- a/src/main/java/frc4388/robot/commands/PelvicInflamitoryDisease.java +++ b/src/main/java/frc4388/robot/commands/PelvicInflamitoryDisease.java @@ -8,52 +8,46 @@ import edu.wpi.first.wpilibj2.command.CommandBase; import frc4388.utility.Gains; public abstract class PelvicInflamitoryDisease extends CommandBase { - protected Gains gains; - private double output = 0; +;;;;protected Gains gains; +;;;;private double output = 0; - /** Creates a new PelvicInflamitoryDisease. */ - public PelvicInflamitoryDisease(double kp, double ki, double kd, double kf) { - gains = new Gains(kp, ki, kd, kf, 0); - } +;;;;/** Creates a new PelvicInflamitoryDisease. */ +;;;;public PelvicInflamitoryDisease(double kp, double ki, double kd, double kf) { +;;;;;;;;gains = new Gains(kp, ki, kd, kf, 0); +;;;;} - public PelvicInflamitoryDisease(Gains gains) { - this.gains = gains; - } +;;;;public PelvicInflamitoryDisease(Gains gains) { +;;;;;;;;this.gains = gains; +;;;;} - /** produces the error from the setpoint */ - public abstract double getError(); - /** figure it out bitch */ - public abstract void runWithOutput(double output); +;;;;/** produces the error from the setpoint */ +;;;;public abstract double getError(); +;;;;/** figure it out bitch */ +;;;;public abstract void runWithOutput(double output); - // Called when the command is initially scheduled. - @Override - public void initialize() { - output = 0; - } +;;;;// Called when the command is initially scheduled. +;;;;@Override public void initialize() { +;;;;;;;;output = 0; +;;;;} - private double prevError, cumError = 0; - // Called every time the scheduler runs while the command is scheduled. - @Override - public void execute() { - double error = getError(); - cumError += error * .02; // 20 ms - double delta = error - prevError; +;;;;private double prevError, cumError = 0; +;;;;// Called every time the scheduler runs while the command is scheduled. +;;;;@Override public void execute() { +;;;;;;;;double error = getError(); +;;;;;;;;cumError += error * .02; // 20 ms +;;;;;;;;double delta = error - prevError; - output = error * gains.kP; - output += cumError * gains.kI; - output += delta * gains.kD; - output += gains.kF; +;;;;;;;;output = error * gains.kP; +;;;;;;;;output += cumError * gains.kI; +;;;;;;;;output += delta * gains.kD; +;;;;;;;;output += gains.kF; - runWithOutput(output); - } +;;;;;;;;runWithOutput(output); +;;;;} - // Called once the command ends or is interrupted. - @Override - public void end(boolean interrupted) {} +;;;;// Called once the command ends or is interrupted. +;;;;@Override public void end(boolean interrupted) {} - // Returns true when the command should end. - @Override - public boolean isFinished() { - return false; - } +;;;;// Returns true when the command should end. +;;;;@Override public boolean isFinished() { return false; } }