Skip to content

Commit 82cb0cd

Browse files
committed
Allow single element LED or color mix lists to create tuples
1 parent bc08dac commit 82cb0cd

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

ev3dev/brickpi.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ class Leds(object):
5050
blue_one = Led(name='brickpi1:blue:ev3dev')
5151
blue_two = Led(name='brickpi2:blue:ev3dev')
5252

53-
BLUE_ONE = ( blue_one )
54-
BLUE_TWO = ( blue_two )
53+
BLUE_ONE = ( blue_one, )
54+
BLUE_TWO = ( blue_two, )
5555

56-
BLUE = ( 1 )
56+
BLUE = ( 1, )
5757

5858
@staticmethod
5959
def set_color(group, color, pct=1):

ev3dev/ev3.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ class Leds(object):
5252
green_left = Led(name='ev3-left1:green:ev3dev')
5353
green_right = Led(name='ev3-right1:green:ev3dev')
5454

55-
LEFT = ( red_left, green_left )
56-
RIGHT = ( red_right, green_right )
57-
58-
RED = ( 1, 0 )
59-
GREEN = ( 0, 1 )
60-
AMBER = ( 1, 1 )
61-
ORANGE = ( 1, 0.5 )
62-
YELLOW = ( 0.5, 1 )
55+
LEFT = ( red_left, green_left, )
56+
RIGHT = ( red_right, green_right, )
57+
58+
RED = ( 1, 0, )
59+
GREEN = ( 0, 1, )
60+
AMBER = ( 1, 1, )
61+
ORANGE = ( 1, 0.5, )
62+
YELLOW = ( 0.5, 1, )
6363

6464
@staticmethod
6565
def set_color(group, color, pct=1):

templates/led-colors.liquid

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ endfor %}
66
assign groupName = group.name | upcase | underscore_spaces %}{%
77
assign ledNames = '' %}{%
88
for name in group.entries %}{%
9-
capture ledNames %}{{ ledNames }}, {{ name | downcase | underscore_spaces }}{%
9+
capture ledNames %}{{ ledNames }}{{ name | downcase | underscore_spaces }}, {%
1010
endcapture %}{%
1111
endfor %}
12-
{{ groupName }} = ( {{ ledNames | remove_first:', ' }} ){%
12+
{{ groupName }} = ( {{ ledNames }}){%
1313
endfor %}
1414
{% for color in currentClass.colors %}{%
1515
assign colorName = color.name | upcase | underscore_spaces %}{%
1616
assign mixValues = '' %}{%
1717
for value in color.value %}{%
18-
capture mixValues %}{{ mixValues }}, {{ value }}{%
18+
capture mixValues %}{{ mixValues }}{{ value }}, {%
1919
endcapture %}{%
2020
endfor %}
21-
{{ colorName }} = ( {{ mixValues | remove_first:', ' }} ){%
21+
{{ colorName }} = ( {{ mixValues }}){%
2222
endfor %}
2323

2424
@staticmethod

0 commit comments

Comments
 (0)