Fix LED group name overlap with color name

Author: rhempel

ev3dev/brickpi.py

@@ -50,10 +50,10 @@ class Leds(object):
     blue_one = Led(name='brickpi1:blue:ev3dev')
     blue_two = Led(name='brickpi2:blue:ev3dev')
 
-    BLUE_ONE = (blue_one, )
-    BLUE_TWO = (blue_two, )
+    ONE = ( blue_one )
+    TWO = ( blue_two )
 
-    BLUE = (1, )
+    BLUE = ( 1 )
 
     @staticmethod
     def set_color(group, color, pct=1):

ev3dev/ev3.py

@@ -52,14 +52,14 @@ class Leds(object):
     green_left = Led(name='ev3-left1:green:ev3dev')
     green_right = Led(name='ev3-right1:green:ev3dev')
 
-    LEFT = (red_left, green_left, )
-    RIGHT = (red_right, green_right, )
-
-    RED = (1, 0, )
-    GREEN = (0, 1, )
-    AMBER = (1, 1, )
-    ORANGE = (1, 0.5, )
-    YELLOW = (0.5, 1, )
+    LEFT = ( red_left, green_left )
+    RIGHT = ( red_right, green_right )
+
+    RED = ( 1, 0 )
+    GREEN = ( 0, 1 )
+    AMBER = ( 1, 1 )
+    ORANGE = ( 1, 0.5 )
+    YELLOW = ( 0.5, 1 )
 
     @staticmethod
     def set_color(group, color, pct=1):

templates/led-colors.liquid

@@ -3,15 +3,22 @@
     {{instanceName}} = Led(name='{{instance.systemName}}'){%
 endfor %}
 {% for group in currentClass.groups %}{%
-    assign groupName = group.name | upcase | underscore_spaces %}
-    {{ groupName }} = ({% for e in group.entries %}{%
-        assign instance = e | downcase | underscore_spaces
-%}{{ instance }}, {%
-    endfor %}){%
+    assign groupName = group.name | upcase | underscore_spaces %}{%
+    assign ledNames = '' %}{%
+    for name in group.entries %}{%
+        capture ledNames %}{{ ledNames }}, {{ name | downcase | underscore_spaces }}{%
+        endcapture %}{%
+    endfor %}
+    {{ groupName }} = ( {{ ledNames | remove_first:', ' }} ){%
 endfor %}
 {% for color in currentClass.colors %}{%
-    assign colorName = color.name | upcase | underscore_spaces %}
-    {{ colorName }} = ({% for v in color.value %}{{ v }}, {%endfor %}){%
+    assign colorName = color.name | upcase | underscore_spaces %}{%
+    assign mixRatio = '' %}{%
+    for mix in color.mix %}{%
+        capture mixRatio %}{{ mixRatio }}, {{ mix.value }}{%
+        endcapture %}{%
+    endfor %}
+    {{ colorName }} = ( {{ mixRatio | remove_first:', ' }} ){%
 endfor %}
 
     @staticmethod