From 83ba97a77c6bb8ced811b5fd305b8b9d41294976 Mon Sep 17 00:00:00 2001 From: Asa Paparo Date: Wed, 1 Nov 2023 16:39:56 -0400 Subject: [PATCH] fixed building --- .../java/org/sciborgs1155/robot/Constants.java | 18 ------------------ .../java/org/sciborgs1155/robot/Ports.java | 4 ---- .../java/org/sciborgs1155/robot/Robot.java | 1 - .../java/org/sciborgs1155/robot/arm/Arm.java | 4 +++- 4 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/sciborgs1155/robot/Constants.java b/src/main/java/org/sciborgs1155/robot/Constants.java index 96ca0320..ba29a7af 100644 --- a/src/main/java/org/sciborgs1155/robot/Constants.java +++ b/src/main/java/org/sciborgs1155/robot/Constants.java @@ -1,8 +1,6 @@ package org.sciborgs1155.robot; import edu.wpi.first.math.geometry.Translation2d; -import edu.wpi.first.math.trajectory.TrapezoidProfile.Constraints; -import java.awt.Color; import java.util.Map; import org.sciborgs1155.lib.constants.PIDConstants; @@ -20,10 +18,6 @@ *
  • time: seconds *
  • angle: radians * - * - * @see MotorConfig - * @see PIDConstants - * @see Constraints */ public final class Constants { @@ -95,16 +89,4 @@ public static final class Field { Map.entry(5, new Translation2d(1.83, 1.63)), Map.entry(6, new Translation2d(1.83, 0.51))); } - - public static final class LED { - public static final int buffer1Length = 60; - - public static final int buffer2Length = 60; - - // RGB COLORS - public static Color lightPurple = new Color(147, 112, 219); - public static Color yellow = new Color(237, 237, 12); - public static Color blue = new Color(0, 0, 228); - public static Color rainbow1stPixel = new Color(255, 0, 0); - } } diff --git a/src/main/java/org/sciborgs1155/robot/Ports.java b/src/main/java/org/sciborgs1155/robot/Ports.java index a8340d17..f723577d 100644 --- a/src/main/java/org/sciborgs1155/robot/Ports.java +++ b/src/main/java/org/sciborgs1155/robot/Ports.java @@ -49,8 +49,4 @@ public static final class Elevator { public static final class Intake { public static final int WHEEL_MOTOR = 7; } - - public static final class LED { - public static final int STRIP = 9; - } } diff --git a/src/main/java/org/sciborgs1155/robot/Robot.java b/src/main/java/org/sciborgs1155/robot/Robot.java index 9149a844..2bd6a2f9 100644 --- a/src/main/java/org/sciborgs1155/robot/Robot.java +++ b/src/main/java/org/sciborgs1155/robot/Robot.java @@ -2,7 +2,6 @@ import edu.wpi.first.wpilibj.DataLogManager; import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; import edu.wpi.first.wpilibj2.command.ProxyCommand; import edu.wpi.first.wpilibj2.command.button.CommandXboxController; diff --git a/src/main/java/org/sciborgs1155/robot/arm/Arm.java b/src/main/java/org/sciborgs1155/robot/arm/Arm.java index 9418d6d5..b6be49fc 100644 --- a/src/main/java/org/sciborgs1155/robot/arm/Arm.java +++ b/src/main/java/org/sciborgs1155/robot/arm/Arm.java @@ -37,7 +37,9 @@ public static Arm createNone() { return new Arm(new NoElevator(), new NoJoint(), new NoJoint()); } - /** Factory for an Arm with either real or simulated segments, depending on {@link Robot#isReal()} */ + /** + * Factory for an Arm with either real or simulated segments, depending on {@link Robot#isReal()} + */ public static Arm createFromConfig( ElevatorConfig elevator, JointConfig elbow, JointConfig wrist) { return Robot.isReal()