untangle color order in fast and fadecandy

mpf/platforms/fast/fast_led.py

@@ -25,7 +25,9 @@ def current_color(self):
         """Return current color."""
         result = ""
         self.dirty = False
-        for color in self.colors:
+        # send this as grb because the hardware will twist it again
+        for index in [1, 0, 2]:
+            color = self.colors[index]
             if callable(color):
                 brightness, fade_ms = color(self.hardware_fade_ms)
                 result += hex(int(brightness * 255))[2:].zfill(2)

mpf/platforms/openpixel.py

@@ -183,6 +183,12 @@ def tick(self, dt):
 
             self.dirty = False
 
+    def _add_pixel(self, msg, max_fade_ms, brightness):
+        if callable(brightness):
+            brightness = brightness(max_fade_ms)[0] * 255
+        brightness = min(255, max(0, int(brightness)))
+        msg.append(brightness)
+
     def update_pixels(self, pixels, channel=0):
         """Send the list of pixel colors to the OPC server.
 
@@ -209,11 +215,14 @@ def update_pixels(self, pixels, channel=0):
         len_lo_byte = (len(pixels)) % 256
         header = bytes([channel, 0, len_hi_byte, len_lo_byte])
         msg.extend(header)
-        for brightness in pixels:
-            if callable(brightness):
-                brightness = brightness(max_fade_ms)[0] * 255
-            brightness = min(255, max(0, int(brightness)))
-            msg.append(brightness)
+        for i in range(int(len(pixels) / 3)):
+            # send GRB because that is the default color order for WS2812
+
+            self._add_pixel(msg, max_fade_ms, pixels[i * 3 + 1])
+            self._add_pixel(msg, max_fade_ms, pixels[i * 3])
+            self._add_pixel(msg, max_fade_ms, pixels[i * 3 + 2])
+
+
         self.send(bytes(msg))
 
     def send(self, message):

mpf/tests/machine_files/fast/config/config.yaml

@@ -117,5 +117,7 @@ lights:
     subtype: gi
   test_led:
     number: 2-23
+    type: grb
   test_led2:
-    number: 2-25
+    number: 2-25
+    type: grb

mpf/tests/machine_files/openpixel/config/config.yaml

@@ -3,7 +3,10 @@
 lights:
   test_led:
     number: 99
+    type: grb
   test_led2:
     number: 0-20
+    type: grb
   test_led3:
-    number: 1-99
+    number: 1-99
+    type: grb