Fixes for #3 and #4

Author: Gadgetoid

library/CHANGELOG.txt

@@ -0,0 +1,10 @@
+3.1.0
+-----
+
+* New: Exposed all contents of ws for easy access to strip_type constants
+* Fix: Matched functionality of upstream legacy library by supporting strip_type
+
+3.0.7
+-----
+
+* New: Added support for Pi 3B+

library/neopixel/__init__.py

@@ -1,2 +1,3 @@
 # Included for backwards-compatibility with old import name
-from rpi_ws281x import __version__, PixelStrip, Adafruit_NeoPixel, Color
+from rpi_ws281x import __version__, PixelStrip, Adafruit_NeoPixel, Color, ws
+from _rpi_ws281x import *

library/rpi_ws281x/__init__.py

@@ -1,4 +1,5 @@
 # New canonical package, to support `import rpi_ws281x`
-from .rpi_ws281x import PixelStrip, Adafruit_NeoPixel, Color
+from .rpi_ws281x import PixelStrip, Adafruit_NeoPixel, Color, ws
+from _rpi_ws281x import *
 
 __version__ = '3.0.6'

library/rpi_ws281x/rpi_ws281x.py

@@ -49,7 +49,8 @@ def __setitem__(self, pos, value):
 
 
 class PixelStrip(object):
-    def __init__(self, num, pin, freq_hz=800000, dma=10, invert=False, brightness=128, channel=0, gamma=None):
+    def __init__(self, num, pin, freq_hz=800000, dma=10, invert=False,
+            brightness=255, channel=0, strip_type=ws.WS2811_STRIP_RGB, gamma=None):
         """Class to represent a SK6812/WS281x LED display.  Num should be the
         number of pixels in the display, and pin should be the GPIO pin connected
         to the display signal line (must be a PWM pin like 18!).  Optional
@@ -60,7 +61,12 @@ def __init__(self, num, pin, freq_hz=800000, dma=10, invert=False, brightness=12
         """
 
         if gamma is None:
-            gamma = list(range(256))
+            # Support gamma in place of strip_type for back-compat with
+            # previous version of forked library
+            if type(strip_type) is list and len(strip_type) == 255:
+                gamma = strip_type
+            else:
+                gamma = list(range(256))
 
         self._gamma = gamma
 
@@ -82,7 +88,7 @@ def __init__(self, num, pin, freq_hz=800000, dma=10, invert=False, brightness=12
         ws.ws2811_channel_t_gpionum_set(self._channel, pin)
         ws.ws2811_channel_t_invert_set(self._channel, 0 if not invert else 1)
         ws.ws2811_channel_t_brightness_set(self._channel, brightness)
-        ws.ws2811_channel_t_strip_type_set(self._channel, ws.WS2811_STRIP_GRB)
+        ws.ws2811_channel_t_strip_type_set(self._channel, strip_type)
 
         # Initialize the controller
         ws.ws2811_t_freq_set(self._leds, freq_hz)

library/setup.py

@@ -17,7 +17,7 @@ def run(self):
         build_py.run(self)
 
 setup(name              = 'rpi_ws281x',
-      version           = '3.0.7',
+      version           = '3.1.0',
       author            = 'Jeremy Garff <[email protected]>, Phil Howard <[email protected]>',
       author_email      = '[email protected]',
       description       = 'Userspace Raspberry Pi PWM/PCM/SPI library for SK6812 and WS281X LEDs.',