Skip to content

Commit 62aa3f2

Browse files
committed
changed led code
1 parent 4a028d8 commit 62aa3f2

File tree

1 file changed

+34
-51
lines changed

1 file changed

+34
-51
lines changed
Lines changed: 34 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
\
1+
22

33
public class LEDs extends SubsystemBase {
44

5-
public class AddressableLEDs extends SubsystemBase {
6-
75
private final AddressableLED ledStrip;
86
private final AddressableLEDBuffer ledBuffer;
97

10-
public LEDs (int port, int leds) {
11-
8+
public LEDs(int port, int leds) {
129
this.ledStrip = new AddressableLED(port);
1310
this.ledBuffer = new AddressableLEDBuffer(leds);
1411

@@ -19,70 +16,56 @@ public LEDs (int port, int leds) {
1916
@Override
2017
public void periodic() {
2118
// This method will be called once per scheduler run
22-
23-
// Update the buffer with the pattern
24-
pattern.applyTo(m_ledBuffer);
19+
LEDPattern pattern = LEDPattern.progressMaskLayer(() -> m_elevator.getHeight() / m_elevator.getMaxHeight());
20+
pattern.applyTo(ledBuffer);
2521

2622
// Set the LEDs
27-
ledBuffer.setData(m_ledBuffer);
23+
ledStrip.setData(ledBuffer);
2824
}
2925

30-
// Colors include Color.kRed, Color.kOrange, Color.kYellow, Color.kGreen
31-
LEDPattern pattern = LEDPattern.progressMaskLayer(() -> m_elevator.getHeight() / m_elevator.getMaxHeight());
32-
pattern.applyTo(m_ledBuffer);
33-
m_led.setData(m_ledBuffer);
34-
}
35-
public void setSolidPatternC1(){
36-
37-
LEDPattern green = LEDPattern.solid(Color.kGreen);
38-
green.applyTo(m_ledBuffer);
39-
m_led.setData(m_ledBuffer);
26+
public void setSolidPatternC1() {
27+
LEDPattern green = LEDPattern.solid(Color.kGreen);
28+
green.applyTo(ledBuffer);
29+
ledStrip.setData(ledBuffer);
4030
}
4131

4232
public void setSolidPatternC2() {
43-
44-
LEDPattern purple = LEDPattern.solid(Color.kPurple);
45-
red.applyTo(m_ledBuffer);
46-
m_led.setData(m_ledBuffer);
33+
LEDPattern purple = LEDPattern.solid(Color.kPurple);
34+
purple.applyTo(ledBuffer); // Fixed to use purple instead of red
35+
ledStrip.setData(ledBuffer);
4736
}
37+
4838
public void setSolidPatternA1() {
49-
5039
LEDPattern teal = LEDPattern.solid(Color.kTeal);
51-
teal.applyTo(m_ledBuffer);
52-
m_led.setData(m_ledBuffer);
40+
teal.applyTo(ledBuffer);
41+
ledStrip.setData(ledBuffer);
5342
}
5443

5544
public void setSolidPatternA2() {
56-
5745
LEDPattern purple = LEDPattern.solid(Color.kPurple);
58-
red.applyTo(m_ledBuffer);
59-
m_led.setData(m_ledBuffer);
60-
}
46+
purple.applyTo(ledBuffer); // Fixed to use purple instead of red
47+
ledStrip.setData(ledBuffer);
48+
}
6149

62-
public void setRainbowPattern(){}
63-
private final LEDPattern m_rainbow = LEDPattern.rainbow(255, 128);
50+
public void setRainbowPattern() {
51+
// Add functionality for rainbow pattern here
52+
}
6453

65-
private static final Distance kLedSpacing = Meters.of(1 / 120.0);
66-
private final LEDPattern m_scrollingRainbow =
67-
m_rainbow.scrollAtAbsoluteSpeed(MetersPerSecond.of(1), kLedSpacing);
54+
public void setYellowProgressMask() {
55+
LEDPattern pattern = LEDPattern.progressMaskLayer(() -> m_elevator.getHeight() / m_elevator.getMaxHeight());
56+
pattern.applyTo(ledBuffer);
57+
ledStrip.setData(ledBuffer);
58+
}
6859

69-
public void setYellowProgressMask(){
60+
public void setRedProgressMask() {
7061
LEDPattern pattern = LEDPattern.progressMaskLayer(() -> m_elevator.getHeight() / m_elevator.getMaxHeight());
71-
pattern.applyTo(m_ledBuffer);
72-
m_led.setData(m_ledBuffer);
62+
pattern.applyTo(ledBuffer);
63+
ledStrip.setData(ledBuffer);
7364
}
74-
75-
public void setRedProgressMask(){
76-
LEDPattern pattern = LEDPattern.progressMaskLayer(() -> m_elevator.getHeight() / m_elevator.getMaxHeight());
77-
pattern.applyTo(m_ledBuffer);
78-
m_led.setData(m_ledBuffer);}
79-
80-
81-
public void seBlueAndGreenFlamesPattern(){
82-
LEDPattern steps = LEDPattern.steps(Map.of(0, Color.kGreen, 0.5, Color.kBlue));
83-
steps.applyTo(m_ledBuffer);
8465

85-
// Write the data to the LED strip
86-
m_led.setData(m_ledBuffer);
66+
public void setBlueAndGreenFlamesPattern() {
67+
LEDPattern steps = LEDPattern.steps(Map.of(0, Color.kGreen, 0.5, Color.kBlue));
68+
steps.applyTo(ledBuffer);
69+
ledStrip.setData(ledBuffer);
8770
}
88-
71+
}

0 commit comments

Comments
 (0)