Skip to content

Commit ce20013

Browse files
committed
spotless
1 parent b2a03c6 commit ce20013

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

src/main/java/frc/robot/commands/drive/AutoPickupCommand.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ public void initialize() {
8080
logger.info("Starting auto pickup going to {}", endPose);
8181
omegaAutoDriveController.reset(driveSubsystem.getPoseMeters().getRotation().getRadians());
8282
xAutoDriveController.reset(
83-
driveSubsystem.getPoseMeters().getX(), robotStateSubsystem.isBlueAlliance() ? driveSubsystem.getFieldRelSpeed().vxMetersPerSecond : -driveSubsystem.getFieldRelSpeed().vxMetersPerSecond);
83+
driveSubsystem.getPoseMeters().getX(),
84+
robotStateSubsystem.isBlueAlliance()
85+
? driveSubsystem.getFieldRelSpeed().vxMetersPerSecond
86+
: -driveSubsystem.getFieldRelSpeed().vxMetersPerSecond);
8487
yAutoDriveController.reset(
85-
driveSubsystem.getPoseMeters().getY(), robotStateSubsystem.isBlueAlliance() ? driveSubsystem.getFieldRelSpeed().vyMetersPerSecond : -driveSubsystem.getFieldRelSpeed().vyMetersPerSecond);
88+
driveSubsystem.getPoseMeters().getY(),driveSubsystem.getFieldRelSpeed().vyMetersPerSecond);
8689
}
8790

8891
@Override
@@ -96,12 +99,11 @@ public void execute() {
9699
MathUtil.angleModulus(driveSubsystem.getGyroRotation2d().getRadians()),
97100
robotStateSubsystem.getAllianceColor() == Alliance.Blue ? 0.0 : Math.PI);
98101
if (robotStateSubsystem.isBlueAlliance()) {
99-
if (driveSubsystem.getPoseMeters().getX() <= endPose.getX()) {
100-
xCalc = Math.abs(xCalc);
101-
}
102-
} else
103-
if (driveSubsystem.getPoseMeters().getX() >= endPose.getX())
104-
xCalc = -1 * Math.abs(xCalc);
102+
if (driveSubsystem.getPoseMeters().getX() <= endPose.getX()) {
103+
xCalc = Math.abs(xCalc);
104+
}
105+
} else if (driveSubsystem.getPoseMeters().getX() >= endPose.getX())
106+
xCalc = -1 * Math.abs(xCalc);
105107
logger.info(
106108
"Moving X : {} | Moving Y : {} | \nCurrent Pose {}",
107109
xCalc,

src/main/java/frc/robot/subsystems/ElbowSubsystem.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,9 @@ public Set<Measure> getMeasures() {
165165
return Set.of(
166166
new Measure("Relative Degrees", () -> getRelativeDegs()),
167167
new Measure("Absolute Ticks USED", () -> absoluteTalon),
168-
new Measure("The queried values", () -> (double) getPulseWidthFor(PWMChannel.PWMChannel0)),
169-
new Measure("Elbow Error", () -> elbowError), new Measure("SelectedSensor /52.4", () -> elbowFalcon.getSelectedSensorPosition()/52.4));
168+
new Measure("The queried values", () -> (double) getPulseWidthFor(PWMChannel.PWMChannel0)),
169+
new Measure("Elbow Error", () -> elbowError),
170+
new Measure("SelectedSensor /52.4", () -> elbowFalcon.getSelectedSensorPosition() / 52.4));
170171
}
171172

172173
@Override

0 commit comments

Comments
 (0)