From f03db4119bd3a56c8fdf9340aeceab95b27f8db0 Mon Sep 17 00:00:00 2001 From: nathanrsxtn Date: Thu, 2 Dec 2021 17:02:10 -0700 Subject: [PATCH] Remove unused mode function - Update reflection table colors to match Driver Station --- src/main/java/frc4388/robot/Constants.java | 11 ++--------- src/main/java/frc4388/utility/CSV.java | 6 ++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/frc4388/robot/Constants.java b/src/main/java/frc4388/robot/Constants.java index 48b1159..3498847 100644 --- a/src/main/java/frc4388/robot/Constants.java +++ b/src/main/java/frc4388/robot/Constants.java @@ -53,13 +53,6 @@ public final class Constants { IntakeConstants.INTAKE_SPEED = IntakeConstants.INTAKE_SPEED_MODES[i]; StorageConstants.STORAGE_SPEED = StorageConstants.STORAGE_SPEED_MODES[i]; } - - public static void toggle() { - int i = mode.ordinal() + 1; - Mode[] values = values(); - i = i >= values.length ? 0 : i; - set(values[i]); - } } public static final int SELECTED_AUTO = 0; @@ -102,10 +95,10 @@ public final class Constants { public static final int DRIVE_CRUISE_VELOCITY = 30000; public static final int DRIVE_ACCELERATION = 23000; - private static final double[] STEER_WITH_JOYSTICK_FACTOR_MODES = { 1.0, 0.9 }; - public static double STEER_WITH_JOYSTICK_FACTOR; private static final double[] DRIVE_WITH_JOYSTICK_FACTOR_MODES = { 1.0, 0.7 }; public static double DRIVE_WITH_JOYSTICK_FACTOR; + private static final double[] STEER_WITH_JOYSTICK_FACTOR_MODES = { 1.0, 0.9 }; + public static double STEER_WITH_JOYSTICK_FACTOR; public static final Gains DRIVE_DISTANCE_GAINS_HIGH = new Gains(0.1, 0.0, 0.0, 0.0, 0, 0.5); public static final Gains DRIVE_VELOCITY_GAINS_HIGH = new Gains(0.1, 0.0, 0.0, 0.0, 0, 1.0); diff --git a/src/main/java/frc4388/utility/CSV.java b/src/main/java/frc4388/utility/CSV.java index 24a83b1..522980a 100644 --- a/src/main/java/frc4388/utility/CSV.java +++ b/src/main/java/frc4388/utility/CSV.java @@ -8,7 +8,6 @@ package frc4388.utility; import java.awt.Color; - import java.io.BufferedReader; import java.io.IOException; import java.lang.invoke.MethodHandleProxies; @@ -26,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.function.BiConsumer; -import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.IntFunction; import java.util.function.Predicate; @@ -159,8 +157,8 @@ public class CSV { return rows.stream().map(row -> IntStream.range(0, row.size()).mapToObj(i -> String.format(formatFormat.format(new Object[] { row.get(i).padRight ? "-" : "", columnWidths[i], row.get(i).escape, RESET_STYLE }), row.get(i).string)).collect(Collectors.joining("|"))).collect(Collectors.joining(LF)); } - private static final Color GRADIENT_MIN = new Color(0x00, 0x33, 0x00); - private static final Color GRADIENT_MAX = new Color(0x00, 0xFF, 0x00); + private static final Color GRADIENT_MIN = new Color(0x00, 0x99, 0x00); + private static final Color GRADIENT_MAX = new Color(0x66, 0xFF, 0x66); private static final String CONTROL = "\033"; private static final String CSI = "["; private static final String LF = "\n";