Skip to content

Commit ee0dbf8

Browse files
committed
simplified color dimming code
1 parent 9df29ca commit ee0dbf8

File tree

1 file changed

+12
-20
lines changed

1 file changed

+12
-20
lines changed

Ambient_Color_Control_Pad/ambient_color_control_pad.py

+12-20
Original file line numberDiff line numberDiff line change
@@ -47,40 +47,30 @@
4747
WHITE_WARM = (120, 100, 80)
4848
WHITE_COOL = (80, 100, 120)
4949
WHITE_GREEN = (80, 120, 100)
50-
# dim versions
51-
RED_ALT = (25, 0, 0)
52-
YELLOW_ALT = (15, 15, 0)
53-
YELLOW_GREEN_ALT = (12, 25, 0)
54-
GREEN_ALT = (0, 25, 0)
55-
CYAN_ALT = (0, 25, 25)
56-
LIGHT_BLUE_ALT = (0, 12, 25)
57-
BLUE_ALT = (0, 0, 25)
58-
PURPLE_ALT = (18, 0, 25)
59-
ORANGE_ALT = (25, 8, 0)
60-
PINK_ALT = (25, 0, 25)
61-
ROUGE_ALT = (25, 0, 13)
62-
WHITE_ALT = (10, 10, 10)
50+
6351

6452
COLORS = [ # normal button color states
6553
RED, ORANGE, YELLOW, YELLOW_GREEN,
6654
GREEN, CYAN, LIGHT_BLUE, BLUE,
6755
PURPLE, PINK, ROUGE, WHITE,
68-
WHITE_WARM, WHITE_COOL, WHITE_GREEN, OFF,
69-
# pressed button color states
70-
RED_ALT, ORANGE_ALT, YELLOW_ALT, YELLOW_GREEN_ALT,
71-
GREEN_ALT, CYAN_ALT, LIGHT_BLUE_ALT, BLUE_ALT,
72-
PURPLE_ALT, PINK_ALT, ROUGE_ALT, WHITE_ALT,
73-
WHITE_ALT, WHITE_ALT, WHITE_ALT, OFF]
56+
WHITE_WARM, WHITE_COOL, WHITE_GREEN, OFF
57+
]
7458

7559
pixels.fill(COLORS[1]) # turn on the strip
7660
pixels.show()
7761

62+
63+
def dimmed_colors(color_values):
64+
(red_value, green_value, blue_value) = color_values
65+
return (red_value // 10, green_value // 10, blue_value // 10)
66+
67+
7868
# this will be called when button events are received
7969
def blink(event):
8070
# turn the LED on when a rising edge is detected
8171
# do the fade for the NeoPixel strip
8272
if event.edge == NeoTrellis.EDGE_RISING:
83-
trellis.pixels[event.number] = COLORS[event.number+16]
73+
trellis.pixels[event.number] = dimmed_colors(COLORS[event.number])
8474
for fade_i in range(num_pixels): # fade off
8575
pixels[fade_i] = (OFF)
8676
pixels.show()
@@ -95,6 +85,8 @@ def blink(event):
9585
# turn the LED off when a rising edge is detected
9686
elif event.edge == NeoTrellis.EDGE_FALLING:
9787
trellis.pixels[event.number] = COLORS[event.number]
88+
89+
9890
# boot up animation
9991
trellis.pixels.brightness = 0.2
10092
for i in range(16):

0 commit comments

Comments
 (0)