Merge pull request #92 from rpi-ws281x/patch-v5.0.0

Prep for v5.0.0

Author: Gadgetoid

library/CHANGELOG.txt

@@ -1,4 +1,16 @@
+5.0.0
+-----
+
+* Bumped to rpi_ws281x v1.0.0 (15330cb)
+* Full rpi_ws281x changes: https://github.com/jgarff/rpi_ws281x/compare/9be313f...15330cb
+* New: Added support for Revisions 0xa03141, 0xb03141, 0xc04141, 0xd03141 (CM4)
+* New: Added support for Revision 0xa32082 (Pi 3 B)
+* New: Added support for slices on PixelStrip
+* New: Regenerated SWIG bindings with v4.0.2
+* New: RGBW class for interfacing with pixel values
+
 4.3.4
+-----
 
 * New: Added support for Revision 0xa03115 (Pi 4, 1GB v1.5)
 

library/lib

@@ -1,72 +1,75 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.12
+# Version 4.0.2
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
+from sys import version_info as _swig_python_version_info
 
+if _swig_python_version_info < (2, 7, 0):
+    raise RuntimeError("Python 2.7 or later required")
 
-
-
-from sys import version_info
-if version_info >= (2,6,0):
-    def swig_import_helper():
-        from os.path import dirname
-        import imp
-        fp = None
-        try:
-            fp, pathname, description = imp.find_module('_rpi_ws281x', [dirname(__file__)])
-        except ImportError:
-            import _rpi_ws281x
-            return _rpi_ws281x
-        if fp is not None:
-            try:
-                _mod = imp.load_module('_rpi_ws281x', fp, pathname, description)
-            finally:
-                fp.close()
-            return _mod
-    _rpi_ws281x = swig_import_helper()
-    del swig_import_helper
+# Import the low-level C/C++ module
+if __package__ or "." in __name__:
+    from . import _rpi_ws281x
 else:
     import _rpi_ws281x
-del version_info
+
 try:
-    _swig_property = property
-except NameError:
-    pass # Python < 2.2 doesn't have 'property'.
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'SwigPyObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError(name)
+    import builtins as __builtin__
+except ImportError:
+    import __builtin__
+
 
 def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+    try:
+        strthis = "proxy of " + self.this.__repr__()
+    except __builtin__.Exception:
+        strthis = ""
+    return "<%s.%s; %s >" % (
+        self.__class__.__module__,
+        self.__class__.__name__,
+        strthis,
+    )
 
-try:
-    _object = object
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
+
+def _swig_setattr_nondynamic_instance_variable(set):
+    def set_instance_attr(self, name, value):
+        if name == "thisown":
+            self.this.own(value)
+        elif name == "this":
+            set(self, name, value)
+        elif hasattr(self, name) and isinstance(getattr(type(self), name), property):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add instance attributes to %s" % self)
+
+    return set_instance_attr
+
+
+def _swig_setattr_nondynamic_class_variable(set):
+    def set_class_attr(cls, name, value):
+        if hasattr(cls, name) and not isinstance(getattr(cls, name), property):
+            set(cls, name, value)
+        else:
+            raise AttributeError("You cannot add class attributes to %s" % cls)
+
+    return set_class_attr
+
+
+def _swig_add_metaclass(metaclass):
+    """Class decorator for adding a metaclass to a SWIG wrapped class - a slimmed down version of six.add_metaclass"""
+
+    def wrapper(cls):
+        return metaclass(cls.__name__, cls.__bases__, cls.__dict__.copy())
+
+    return wrapper
+
+
+class _SwigNonDynamicMeta(type):
+    """Meta class to enforce nondynamic attributes (no new attributes) for a class"""
+
+    __setattr__ = _swig_setattr_nondynamic_class_variable(type.__setattr__)
 
 
 WS2811_TARGET_FREQ = _rpi_ws281x.WS2811_TARGET_FREQ
@@ -86,86 +89,85 @@ class _object : pass
 WS2812_STRIP = _rpi_ws281x.WS2812_STRIP
 SK6812_STRIP = _rpi_ws281x.SK6812_STRIP
 SK6812W_STRIP = _rpi_ws281x.SK6812W_STRIP
-class ws2811_channel_t(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ws2811_channel_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ws2811_channel_t, name)
+
+
+class ws2811_channel_t(object):
+    thisown = property(
+        lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag"
+    )
     __repr__ = _swig_repr
-    __swig_setmethods__["gpionum"] = _rpi_ws281x.ws2811_channel_t_gpionum_set
-    __swig_getmethods__["gpionum"] = _rpi_ws281x.ws2811_channel_t_gpionum_get
-    if _newclass:gpionum = _swig_property(_rpi_ws281x.ws2811_channel_t_gpionum_get, _rpi_ws281x.ws2811_channel_t_gpionum_set)
-    __swig_setmethods__["invert"] = _rpi_ws281x.ws2811_channel_t_invert_set
-    __swig_getmethods__["invert"] = _rpi_ws281x.ws2811_channel_t_invert_get
-    if _newclass:invert = _swig_property(_rpi_ws281x.ws2811_channel_t_invert_get, _rpi_ws281x.ws2811_channel_t_invert_set)
-    __swig_setmethods__["count"] = _rpi_ws281x.ws2811_channel_t_count_set
-    __swig_getmethods__["count"] = _rpi_ws281x.ws2811_channel_t_count_get
-    if _newclass:count = _swig_property(_rpi_ws281x.ws2811_channel_t_count_get, _rpi_ws281x.ws2811_channel_t_count_set)
-    __swig_setmethods__["strip_type"] = _rpi_ws281x.ws2811_channel_t_strip_type_set
-    __swig_getmethods__["strip_type"] = _rpi_ws281x.ws2811_channel_t_strip_type_get
-    if _newclass:strip_type = _swig_property(_rpi_ws281x.ws2811_channel_t_strip_type_get, _rpi_ws281x.ws2811_channel_t_strip_type_set)
-    __swig_setmethods__["leds"] = _rpi_ws281x.ws2811_channel_t_leds_set
-    __swig_getmethods__["leds"] = _rpi_ws281x.ws2811_channel_t_leds_get
-    if _newclass:leds = _swig_property(_rpi_ws281x.ws2811_channel_t_leds_get, _rpi_ws281x.ws2811_channel_t_leds_set)
-    __swig_setmethods__["brightness"] = _rpi_ws281x.ws2811_channel_t_brightness_set
-    __swig_getmethods__["brightness"] = _rpi_ws281x.ws2811_channel_t_brightness_get
-    if _newclass:brightness = _swig_property(_rpi_ws281x.ws2811_channel_t_brightness_get, _rpi_ws281x.ws2811_channel_t_brightness_set)
-    __swig_setmethods__["wshift"] = _rpi_ws281x.ws2811_channel_t_wshift_set
-    __swig_getmethods__["wshift"] = _rpi_ws281x.ws2811_channel_t_wshift_get
-    if _newclass:wshift = _swig_property(_rpi_ws281x.ws2811_channel_t_wshift_get, _rpi_ws281x.ws2811_channel_t_wshift_set)
-    __swig_setmethods__["rshift"] = _rpi_ws281x.ws2811_channel_t_rshift_set
-    __swig_getmethods__["rshift"] = _rpi_ws281x.ws2811_channel_t_rshift_get
-    if _newclass:rshift = _swig_property(_rpi_ws281x.ws2811_channel_t_rshift_get, _rpi_ws281x.ws2811_channel_t_rshift_set)
-    __swig_setmethods__["gshift"] = _rpi_ws281x.ws2811_channel_t_gshift_set
-    __swig_getmethods__["gshift"] = _rpi_ws281x.ws2811_channel_t_gshift_get
-    if _newclass:gshift = _swig_property(_rpi_ws281x.ws2811_channel_t_gshift_get, _rpi_ws281x.ws2811_channel_t_gshift_set)
-    __swig_setmethods__["bshift"] = _rpi_ws281x.ws2811_channel_t_bshift_set
-    __swig_getmethods__["bshift"] = _rpi_ws281x.ws2811_channel_t_bshift_get
-    if _newclass:bshift = _swig_property(_rpi_ws281x.ws2811_channel_t_bshift_get, _rpi_ws281x.ws2811_channel_t_bshift_set)
-    __swig_setmethods__["gamma"] = _rpi_ws281x.ws2811_channel_t_gamma_set
-    __swig_getmethods__["gamma"] = _rpi_ws281x.ws2811_channel_t_gamma_get
-    if _newclass:gamma = _swig_property(_rpi_ws281x.ws2811_channel_t_gamma_get, _rpi_ws281x.ws2811_channel_t_gamma_set)
-    def __init__(self): 
-        this = _rpi_ws281x.new_ws2811_channel_t()
-        try: self.this.append(this)
-        except: self.this = this
+    gpionum = property(
+        _rpi_ws281x.ws2811_channel_t_gpionum_get,
+        _rpi_ws281x.ws2811_channel_t_gpionum_set,
+    )
+    invert = property(
+        _rpi_ws281x.ws2811_channel_t_invert_get, _rpi_ws281x.ws2811_channel_t_invert_set
+    )
+    count = property(
+        _rpi_ws281x.ws2811_channel_t_count_get, _rpi_ws281x.ws2811_channel_t_count_set
+    )
+    strip_type = property(
+        _rpi_ws281x.ws2811_channel_t_strip_type_get,
+        _rpi_ws281x.ws2811_channel_t_strip_type_set,
+    )
+    leds = property(
+        _rpi_ws281x.ws2811_channel_t_leds_get, _rpi_ws281x.ws2811_channel_t_leds_set
+    )
+    brightness = property(
+        _rpi_ws281x.ws2811_channel_t_brightness_get,
+        _rpi_ws281x.ws2811_channel_t_brightness_set,
+    )
+    wshift = property(
+        _rpi_ws281x.ws2811_channel_t_wshift_get, _rpi_ws281x.ws2811_channel_t_wshift_set
+    )
+    rshift = property(
+        _rpi_ws281x.ws2811_channel_t_rshift_get, _rpi_ws281x.ws2811_channel_t_rshift_set
+    )
+    gshift = property(
+        _rpi_ws281x.ws2811_channel_t_gshift_get, _rpi_ws281x.ws2811_channel_t_gshift_set
+    )
+    bshift = property(
+        _rpi_ws281x.ws2811_channel_t_bshift_get, _rpi_ws281x.ws2811_channel_t_bshift_set
+    )
+    gamma = property(
+        _rpi_ws281x.ws2811_channel_t_gamma_get, _rpi_ws281x.ws2811_channel_t_gamma_set
+    )
+
+    def __init__(self):
+        _rpi_ws281x.ws2811_channel_t_swiginit(self, _rpi_ws281x.new_ws2811_channel_t())
+
     __swig_destroy__ = _rpi_ws281x.delete_ws2811_channel_t
-    __del__ = lambda self : None;
-ws2811_channel_t_swigregister = _rpi_ws281x.ws2811_channel_t_swigregister
-ws2811_channel_t_swigregister(ws2811_channel_t)
-
-class ws2811_t(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ws2811_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ws2811_t, name)
+
+
+# Register ws2811_channel_t in _rpi_ws281x:
+_rpi_ws281x.ws2811_channel_t_swigregister(ws2811_channel_t)
+
+
+class ws2811_t(object):
+    thisown = property(
+        lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag"
+    )
     __repr__ = _swig_repr
-    __swig_setmethods__["render_wait_time"] = _rpi_ws281x.ws2811_t_render_wait_time_set
-    __swig_getmethods__["render_wait_time"] = _rpi_ws281x.ws2811_t_render_wait_time_get
-    if _newclass:render_wait_time = _swig_property(_rpi_ws281x.ws2811_t_render_wait_time_get, _rpi_ws281x.ws2811_t_render_wait_time_set)
-    __swig_setmethods__["device"] = _rpi_ws281x.ws2811_t_device_set
-    __swig_getmethods__["device"] = _rpi_ws281x.ws2811_t_device_get
-    if _newclass:device = _swig_property(_rpi_ws281x.ws2811_t_device_get, _rpi_ws281x.ws2811_t_device_set)
-    __swig_setmethods__["rpi_hw"] = _rpi_ws281x.ws2811_t_rpi_hw_set
-    __swig_getmethods__["rpi_hw"] = _rpi_ws281x.ws2811_t_rpi_hw_get
-    if _newclass:rpi_hw = _swig_property(_rpi_ws281x.ws2811_t_rpi_hw_get, _rpi_ws281x.ws2811_t_rpi_hw_set)
-    __swig_setmethods__["freq"] = _rpi_ws281x.ws2811_t_freq_set
-    __swig_getmethods__["freq"] = _rpi_ws281x.ws2811_t_freq_get
-    if _newclass:freq = _swig_property(_rpi_ws281x.ws2811_t_freq_get, _rpi_ws281x.ws2811_t_freq_set)
-    __swig_setmethods__["dmanum"] = _rpi_ws281x.ws2811_t_dmanum_set
-    __swig_getmethods__["dmanum"] = _rpi_ws281x.ws2811_t_dmanum_get
-    if _newclass:dmanum = _swig_property(_rpi_ws281x.ws2811_t_dmanum_get, _rpi_ws281x.ws2811_t_dmanum_set)
-    __swig_setmethods__["channel"] = _rpi_ws281x.ws2811_t_channel_set
-    __swig_getmethods__["channel"] = _rpi_ws281x.ws2811_t_channel_get
-    if _newclass:channel = _swig_property(_rpi_ws281x.ws2811_t_channel_get, _rpi_ws281x.ws2811_t_channel_set)
-    def __init__(self): 
-        this = _rpi_ws281x.new_ws2811_t()
-        try: self.this.append(this)
-        except: self.this = this
+    render_wait_time = property(
+        _rpi_ws281x.ws2811_t_render_wait_time_get,
+        _rpi_ws281x.ws2811_t_render_wait_time_set,
+    )
+    device = property(_rpi_ws281x.ws2811_t_device_get, _rpi_ws281x.ws2811_t_device_set)
+    rpi_hw = property(_rpi_ws281x.ws2811_t_rpi_hw_get, _rpi_ws281x.ws2811_t_rpi_hw_set)
+    freq = property(_rpi_ws281x.ws2811_t_freq_get, _rpi_ws281x.ws2811_t_freq_set)
+    dmanum = property(_rpi_ws281x.ws2811_t_dmanum_get, _rpi_ws281x.ws2811_t_dmanum_set)
+    channel = property(
+        _rpi_ws281x.ws2811_t_channel_get, _rpi_ws281x.ws2811_t_channel_set
+    )
+
+    def __init__(self):
+        _rpi_ws281x.ws2811_t_swiginit(self, _rpi_ws281x.new_ws2811_t())
+
     __swig_destroy__ = _rpi_ws281x.delete_ws2811_t
-    __del__ = lambda self : None;
-ws2811_t_swigregister = _rpi_ws281x.ws2811_t_swigregister
-ws2811_t_swigregister(ws2811_t)
+
+
+# Register ws2811_t in _rpi_ws281x:
+_rpi_ws281x.ws2811_t_swigregister(ws2811_t)
 
 WS2811_SUCCESS = _rpi_ws281x.WS2811_SUCCESS
 WS2811_ERROR_GENERIC = _rpi_ws281x.WS2811_ERROR_GENERIC
@@ -184,37 +186,38 @@ def __init__(self):
 WS2811_ERROR_SPI_TRANSFER = _rpi_ws281x.WS2811_ERROR_SPI_TRANSFER
 WS2811_RETURN_STATE_COUNT = _rpi_ws281x.WS2811_RETURN_STATE_COUNT
 
-def ws2811_init(*args):
-  return _rpi_ws281x.ws2811_init(*args)
-ws2811_init = _rpi_ws281x.ws2811_init
 
-def ws2811_fini(*args):
-  return _rpi_ws281x.ws2811_fini(*args)
-ws2811_fini = _rpi_ws281x.ws2811_fini
+def ws2811_init(ws2811):
+    return _rpi_ws281x.ws2811_init(ws2811)
+
+
+def ws2811_fini(ws2811):
+    return _rpi_ws281x.ws2811_fini(ws2811)
+
+
+def ws2811_render(ws2811):
+    return _rpi_ws281x.ws2811_render(ws2811)
+
+
+def ws2811_wait(ws2811):
+    return _rpi_ws281x.ws2811_wait(ws2811)
+
+
+def ws2811_get_return_t_str(state):
+    return _rpi_ws281x.ws2811_get_return_t_str(state)
 
-def ws2811_render(*args):
-  return _rpi_ws281x.ws2811_render(*args)
-ws2811_render = _rpi_ws281x.ws2811_render
 
-def ws2811_wait(*args):
-  return _rpi_ws281x.ws2811_wait(*args)
-ws2811_wait = _rpi_ws281x.ws2811_wait
+def ws2811_set_custom_gamma_factor(ws2811, gamma_factor):
+    return _rpi_ws281x.ws2811_set_custom_gamma_factor(ws2811, gamma_factor)
 
-def ws2811_get_return_t_str(*args):
-  return _rpi_ws281x.ws2811_get_return_t_str(*args)
-ws2811_get_return_t_str = _rpi_ws281x.ws2811_get_return_t_str
 
-def ws2811_led_get(*args):
-  return _rpi_ws281x.ws2811_led_get(*args)
-ws2811_led_get = _rpi_ws281x.ws2811_led_get
+def ws2811_led_get(channel, lednum):
+    return _rpi_ws281x.ws2811_led_get(channel, lednum)
 
-def ws2811_led_set(*args):
-  return _rpi_ws281x.ws2811_led_set(*args)
-ws2811_led_set = _rpi_ws281x.ws2811_led_set
 
-def ws2811_channel_get(*args):
-  return _rpi_ws281x.ws2811_channel_get(*args)
-ws2811_channel_get = _rpi_ws281x.ws2811_channel_get
-# This file is compatible with both classic and new-style classes.
+def ws2811_led_set(channel, lednum, color):
+    return _rpi_ws281x.ws2811_led_set(channel, lednum, color)
 
 
+def ws2811_channel_get(ws, channelnum):
+    return _rpi_ws281x.ws2811_channel_get(ws, channelnum)

library/rpi_ws281x.py

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