Skip to content

Commit 3b2d4ba

Browse files
committed
fix
1 parent 76cd2be commit 3b2d4ba

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

src/main/java/org/steelhawks/RobotContainer.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.steelhawks.generated.TunerConstants;
1515
import org.steelhawks.generated.TunerConstantsAlpha;
1616
import org.steelhawks.generated.TunerConstantsHawkRider;
17-
import org.steelhawks.subsystems.led.LED.LEDColor;
1817
import edu.wpi.first.wpilibj2.command.Commands;
1918
import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
2019
import org.steelhawks.Constants.*;
@@ -30,6 +29,7 @@
3029
import org.steelhawks.subsystems.elevator.ElevatorIOSim;
3130
import org.steelhawks.subsystems.elevator.*;
3231
import org.steelhawks.subsystems.elevator.ElevatorConstants.State;
32+
import org.steelhawks.subsystems.led.LEDMatrix.Color;
3333
import org.steelhawks.subsystems.swerve.*;
3434
import org.steelhawks.subsystems.vision.*;
3535
import org.steelhawks.util.DoublePressTrigger;
@@ -306,20 +306,20 @@ private void checkIfDevicesConnected() {
306306
private void configureTriggers() {
307307
s_Elevator.atLimit()
308308
.onTrue(
309-
s_LEDMatrix.flashCommand(LEDColor.PURPLE, 0.1, 1).ignoringDisable(false));
309+
s_LEDMatrix.flashCommand(Color.PURPLE, 0.1, 1).ignoringDisable(false));
310310

311311
new Trigger(() -> s_Claw.hasCoral())
312312
.onTrue(
313313
Commands.parallel(
314-
s_LEDMatrix.flashCommand(LEDColor.GREEN, 0.1, 0.5),
314+
s_LEDMatrix.flashCommand(Color.GREEN, 0.1, 0.5),
315315
new VibrateController(1.0, 1.0, driver))
316316
.ignoringDisable(false));
317317

318318
if (s_AlgaeClaw != null) {
319319
new Trigger(() -> s_AlgaeClaw.hasAlgae())
320320
.onTrue(
321321
Commands.parallel(
322-
s_LEDMatrix.flashCommand(LEDColor.GREEN, 0.1, 1.0),
322+
s_LEDMatrix.flashCommand(Color.GREEN, 0.1, 1.0),
323323
new VibrateController(1.0, 1.0, driver))
324324
.ignoringDisable(false));
325325
}
@@ -341,7 +341,7 @@ private void configureDriver() {
341341
if (!s_Elevator.isLocked()) {
342342
Commands.parallel(
343343
new VibrateController(1.0, 1.0, driver),
344-
s_LEDMatrix.flashCommand(LEDColor.RED, 0.1, 1.0)).schedule();
344+
s_LEDMatrix.flashCommand(Color.RED, 0.1, 1.0)).schedule();
345345
return;
346346
}
347347

@@ -404,8 +404,8 @@ private void configureDriver() {
404404
.alongWith(
405405
new VibrateController(driver),
406406
Commands.either(
407-
s_LEDMatrix.flashCommand(LEDColor.GREEN, 0.2, 2),
408-
s_LEDMatrix.flashCommand(LEDColor.RED, 0.2, 2),
407+
s_LEDMatrix.flashCommand(Color.GREEN, 0.2, 2),
408+
s_LEDMatrix.flashCommand(Color.RED, 0.2, 2),
409409
() -> s_Swerve.isSlowMode()).withInterruptBehavior(InterruptionBehavior.kCancelSelf)));
410410

411411
driver.rightStick()
@@ -440,12 +440,12 @@ private void configureDriver() {
440440
driver.leftTrigger()
441441
.whileTrue(
442442
s_Claw.shootCoral()
443-
.alongWith(s_LEDMatrix.flashCommand(LEDColor.WHITE, 0.2, 2.0).repeatedly()));
443+
.alongWith(s_LEDMatrix.flashCommand(Color.WHITE, 0.2, 2.0).repeatedly()));
444444

445445
driver.povLeft()
446446
.whileTrue(
447447
s_Claw.reverseCoral()
448-
.alongWith(s_LEDMatrix.flashCommand(LEDColor.PINK, 0.2, 2.0).repeatedly()));
448+
.alongWith(s_LEDMatrix.flashCommand(Color.PINK, 0.2, 2.0).repeatedly()));
449449

450450
driver.povDown()
451451
.whileTrue(
@@ -504,7 +504,7 @@ private void configureDriver() {
504504
ReefState.removeScoredCoral(lastPosition);
505505
Commands.parallel(
506506
new VibrateController(1.0, 0.25, driver),
507-
s_LEDMatrix.flashCommand(LEDColor.GREEN, 0.2, 2.0)).schedule();
507+
s_LEDMatrix.flashCommand(Color.GREEN, 0.2, 2.0)).schedule();
508508
}
509509
}))
510510
.onFalse(
@@ -513,9 +513,9 @@ private void configureDriver() {
513513
Toggles.autoMark.set(!Toggles.autoMark.get());
514514
autoMarkingDisabled.set(!Toggles.autoMark.get());
515515
if (Toggles.autoMark.get()) {
516-
s_LEDMatrix.flashCommand(LEDColor.GREEN, 0.2, 2.0).schedule();
516+
s_LEDMatrix.flashCommand(Color.GREEN, 0.2, 2.0).schedule();
517517
} else {
518-
s_LEDMatrix.flashCommand(LEDColor.RED, 0.2, 2.0).schedule();
518+
s_LEDMatrix.flashCommand(Color.RED, 0.2, 2.0).schedule();
519519
}
520520
}
521521
toggleTriggered = false;
@@ -532,7 +532,7 @@ private void configureDriver() {
532532
.getDistance(s_Swerve.getPose().getTranslation()) <= 1.5
533533
) {
534534
ReefState.scoreCoral(ReefUtil.getClosestCoralBranch(), s_Elevator.getState());
535-
s_LEDMatrix.flashCommand(LEDColor.BLUE, 0.2, 2.0).schedule();
535+
s_LEDMatrix.flashCommand(Color.BLUE, 0.2, 2.0).schedule();
536536
}
537537
}));
538538
}

src/main/java/org/steelhawks/subsystems/led/LEDMatrix.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public Color(int r, int g, int b) {
4747
public static final Color MAGENTA = new Color(255, 0, 255);
4848
public static final Color ORANGE = new Color(255, 165, 0);
4949
public static final Color PURPLE = new Color(128, 0, 128);
50+
public static final Color PINK = new Color(255, 192, 203);
5051

5152
public Color blend(Color other, double ratio) {
5253
ratio = Math.max(0, Math.min(1, ratio));

0 commit comments

Comments
 (0)