From c29daee3e31dd308bc647ad390c605bbea6834c8 Mon Sep 17 00:00:00 2001 From: nathanrsxtn Date: Fri, 29 Apr 2022 11:42:43 -0600 Subject: [PATCH] Minor code dusting --- .../java/frc4388/robot/RobotContainer.java | 4 +-- .../java/frc4388/utility/AnsiLogging.java | 4 +-- src/main/java/frc4388/utility/CSV.java | 3 +-- .../utility/controller/XboxControllerPOV.java | 25 ------------------- 4 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 src/main/java/frc4388/utility/controller/XboxControllerPOV.java diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 97d0654..99f76a8 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -18,7 +18,6 @@ import edu.wpi.first.util.sendable.Sendable; import edu.wpi.first.util.sendable.SendableBuilder; import edu.wpi.first.util.sendable.SendableRegistry; import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.GenericHID; import edu.wpi.first.wpilibj.PowerDistribution; import edu.wpi.first.wpilibj.XboxController; import edu.wpi.first.wpilibj.smartdashboard.SendableBuilderImpl; @@ -54,7 +53,6 @@ import frc4388.robot.subsystems.Turret; import frc4388.robot.subsystems.VisionOdometry; import frc4388.utility.controller.ButtonBox; import frc4388.utility.controller.DeadbandedXboxController; -import frc4388.utility.controller.XboxControllerPOV; import frc4388.utility.shuffleboard.CachingSendableChooser; /** @@ -377,7 +375,7 @@ public class RobotContainer { builder.addStringProperty("default", () -> "Low", null); builder.addStringArrayProperty("options", () -> new String[] {"Low", "High"}, null); builder.addStringProperty("active", () -> m_robotSwerveDrive.speedAdjust == SwerveDriveConstants.JOYSTICK_TO_METERS_PER_SECOND_SLOW ? "Low" : "High", null); - builder.addStringProperty("selected", null, val -> m_robotSwerveDrive.speedAdjust = val.equals("Low") ? SwerveDriveConstants.JOYSTICK_TO_METERS_PER_SECOND_SLOW : SwerveDriveConstants.JOYSTICK_TO_METERS_PER_SECOND_FAST); + builder.addStringProperty("selected", null, val -> m_robotSwerveDrive.speedAdjust = "Low".equals(val) ? SwerveDriveConstants.JOYSTICK_TO_METERS_PER_SECOND_SLOW : SwerveDriveConstants.JOYSTICK_TO_METERS_PER_SECOND_FAST); } }); putData("Accelerometer", new NTSendable() { diff --git a/src/main/java/frc4388/utility/AnsiLogging.java b/src/main/java/frc4388/utility/AnsiLogging.java index 7b706b8..969aad8 100644 --- a/src/main/java/frc4388/utility/AnsiLogging.java +++ b/src/main/java/frc4388/utility/AnsiLogging.java @@ -31,7 +31,7 @@ import org.fusesource.jansi.AnsiPrintStream; import edu.wpi.first.hal.HAL; -public class AnsiLogging { +public final class AnsiLogging { public static final Level LEVEL = Level.ALL; private static final AnsiPrintStream ANSI_CONSOLE_STREAM = AnsiConsole.err(); @@ -136,4 +136,4 @@ public class AnsiLogging { } }, true); } -} \ No newline at end of file +} diff --git a/src/main/java/frc4388/utility/CSV.java b/src/main/java/frc4388/utility/CSV.java index e1cb508..a8eb6b0 100644 --- a/src/main/java/frc4388/utility/CSV.java +++ b/src/main/java/frc4388/utility/CSV.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.function.BiConsumer; -import java.util.function.BinaryOperator; import java.util.function.Function; import java.util.function.IntFunction; import java.util.function.Predicate; @@ -108,7 +107,7 @@ public class CSV { */ @SuppressWarnings("unchecked") public R[] read(final Path path) throws IOException { - try (final BufferedReader reader = Files.newBufferedReader(path)) { + try (BufferedReader reader = Files.newBufferedReader(path)) { final BiConsumer[] fieldSetters = Stream.of(headerSanitizer(reader.readLine()).split(",")).map(this::nameProcessor).map(setters::get).toArray(BiConsumer[]::new); final Stream lines = reader.lines(); return lines.filter(Predicate.not(String::isBlank)).map(line -> deserializeRecordString(line, fieldSetters, generator.get())).toArray(arrayGenerator); diff --git a/src/main/java/frc4388/utility/controller/XboxControllerPOV.java b/src/main/java/frc4388/utility/controller/XboxControllerPOV.java deleted file mode 100644 index 38b958f..0000000 --- a/src/main/java/frc4388/utility/controller/XboxControllerPOV.java +++ /dev/null @@ -1,25 +0,0 @@ -package frc4388.utility.controller; - -/** Represents a d-pad angle on an XboxController. */ -public enum XboxControllerPOV { - kUp(0), - kUpRight(45), - kRight(90), - kDownRight(135), - kDown(180), - kDownLeft(225), - kLeft(270), - kUpLeft(315); - - @SuppressWarnings("MemberName") - public final int value; - - XboxControllerPOV(int value) { - this.value = value; - } - - @Override - public String toString() { - return this.name().substring(1) + "Button"; - } -}