changeset 1127:2d6e606cc475

switch neopixel libs. lost the r/g/b remapping feature Ignore-this: d18b5118d63f42db7ee6e6defefa90f2 darcs-hash:b770efaccd10a2e5fdb7626359375c84fedb9ea0
author drewp <drewp@bigasterisk.com>
date Fri, 20 Oct 2017 02:19:53 -0700
parents 82046a1c75f3
children c06b631479af
files service/piNode/devices.py service/piNode/requirements.txt
diffstat 2 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/service/piNode/devices.py	Mon Jul 03 19:50:38 2017 -0700
+++ b/service/piNode/devices.py	Fri Oct 20 02:19:53 2017 -0700
@@ -12,10 +12,7 @@
 except ImportError:
     pigpio = None
 import w1thermsensor
-try:
-    import neopixel
-except ImportError:
-    neopixel = None
+import rpi_ws281x
 
 def setupPwm(pi, pinNumber, hz=8000):
     pi.set_mode(pinNumber, pigpio.OUTPUT)
@@ -510,7 +507,7 @@
                         'ledType': 'WS2812',
                         'colorOrder': colorOrder
         }
-        self.neo = neopixel.Adafruit_NeoPixel(len(self.values), pin=18, strip_type=stripType)
+        self.neo = rpi_ws281x.Adafruit_NeoPixel(len(self.values), pin=18)
         self.neo.begin()
 
     def getColorOrder(self, graph, uri):
@@ -519,7 +516,7 @@
         head, tail = str(colorOrder).rsplit('/', 1)
         if head != str(ROOM['ledColorOrder']):
             raise NotImplementedError('%r colorOrder %r' % (uri, colorOrder))
-        stripType = getattr(neopixel.ws, 'WS2811_STRIP_%s' % tail)
+        stripType = None
         return colorOrder, stripType
         
     def _rgbFromHex(self, h):
--- a/service/piNode/requirements.txt	Mon Jul 03 19:50:38 2017 -0700
+++ b/service/piNode/requirements.txt	Fri Oct 20 02:19:53 2017 -0700
@@ -1,3 +1,4 @@
+cryptography==1.8.2
 rdflib==4.2.1
 rdflib-jsonld==0.3
 cyclone
@@ -10,3 +11,4 @@
 git+git://github.com/adafruit/Adafruit_Nokia_LCD#egg=Nokia_LCD
 RPi.GPIO==0.6.2
 influxdb==3.0.0
+rpi_ws281x==3.0.3