Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions TeamCode/src/main/java/codebase/actions/MoveToAction.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package codebase.actions;

import com.qualcomm.robotcore.hardware.PIDCoefficients;
import com.qualcomm.robotcore.hardware.PIDController;

import codebase.controllers.PIDController;
import codebase.geometry.Angles;
import codebase.geometry.FieldPosition;
import codebase.geometry.MovementVector;
Expand Down Expand Up @@ -44,12 +44,10 @@ public MoveToAction(MecanumDriver driver, Localizer localizer, FieldPosition des
this.maxDistanceError = maxDistanceError;
this.maxRotationalError = maxRotationalError;

this.xPID = new PIDController(MOVEMENT_PID_COEFFICIENTS.p, MOVEMENT_PID_COEFFICIENTS.i, MOVEMENT_PID_COEFFICIENTS.d, () -> localizer.getCurrentPosition().x, () -> destination.x);
this.yPID = new PIDController(MOVEMENT_PID_COEFFICIENTS.p, MOVEMENT_PID_COEFFICIENTS.i, MOVEMENT_PID_COEFFICIENTS.d, () -> localizer.getCurrentPosition().y, () -> destination.y);
this.xPID = new PIDController(MOVEMENT_PID_COEFFICIENTS, () -> localizer.getCurrentPosition().x, () -> destination.x);
this.yPID = new PIDController(MOVEMENT_PID_COEFFICIENTS, () -> localizer.getCurrentPosition().y, () -> destination.y);
this.directionPID = new PIDController(
DIRECTION_PID_COEFFICIENTS.p, DIRECTION_PID_COEFFICIENTS.i, DIRECTION_PID_COEFFICIENTS.d,
() -> localizer.getCurrentPosition().direction,
() -> destination.direction,
DIRECTION_PID_COEFFICIENTS,
() -> Angles.angleDifference(localizer.getCurrentPosition().direction, destination.direction)
);
}
Expand Down
Loading