more cleanup, remove helper module

Author: jackw01

README.md

@@ -40,9 +40,8 @@ Python 3.6 or newer is required.
 4. `cd ledcontrol/driver/rpi_ws281x/`
 5. `scons`
 6. `cd ../../..`
-7. `swig -python ./ledcontrol/driver/ledcontrol_rpi_ws281x_driver.i`
-8. `sudo python3 setup.py develop`
-9. `sudo ledcontrol --led_count 150` (add `--led_pixel_order GRBW` if using RGBW LEDs)
+7. `sudo python3 setup.py develop`
+8. `sudo ledcontrol --led_count 150` (add `--led_pixel_order GRBW` if using RGBW LEDs)
 
 ### Command Line Configuration Arguments
 Web server and LED hardware parameters must be specified as command line arguments when running ledcontrol.
@@ -248,7 +247,7 @@ void mainImage(out vec4 fragColor, in vec2 fragCoord) {
 ## Development
 To build the C extension module:
 ```
-swig -python ./ledcontrol/rpi_ws281x/lib/rpi_ws281x.i && sudo python3 setup.py develop
+swig -python ./ledcontrol/driver/ledcontrol_rpi_ws281x_driver.i && sudo python3 setup.py develop
 ```
 
 ## License

ledcontrol/animationcontroller.py

@@ -11,7 +11,7 @@
 
 import ledcontrol.animationpatterns as animpatterns
 import ledcontrol.colorpalettes as colorpalettes
-import ledcontrol.driver as rpi_ws281x
+import ledcontrol.driver as driver
 import ledcontrol.utils as utils
 
 class RepeatedTimer:
@@ -157,17 +157,17 @@ def getiter(obj):
             'hsv': animpatterns.ColorMode.hsv,
             'rgb': animpatterns.ColorMode.rgb,
             'clamp': utils.clamp,
-            'wave_pulse': rpi_ws281x.wave_pulse,
-            'wave_triangle': rpi_ws281x.wave_triangle,
-            'wave_sine': rpi_ws281x.wave_sine,
-            'wave_cubic': rpi_ws281x.wave_cubic,
-            'plasma_sines': rpi_ws281x.plasma_sines,
-            'plasma_sines_octave': rpi_ws281x.plasma_sines_octave,
-            'perlin_noise_3d': rpi_ws281x.perlin_noise_3d,
+            'wave_pulse': driver.wave_pulse,
+            'wave_triangle': driver.wave_triangle,
+            'wave_sine': driver.wave_sine,
+            'wave_cubic': driver.wave_cubic,
+            'plasma_sines': driver.plasma_sines,
+            'plasma_sines_octave': driver.plasma_sines_octave,
+            'perlin_noise_3d': driver.perlin_noise_3d,
             'impulse_exp': utils.impulse_exp,
             'fract': utils.fract,
-            'blackbody_to_rgb': rpi_ws281x.blackbody_to_rgb,
-            'blackbody_correction_rgb': rpi_ws281x.blackbody_correction_rgb,
+            'blackbody_to_rgb': driver.blackbody_to_rgb,
+            'blackbody_correction_rgb': driver.blackbody_correction_rgb,
         }
         restricted_locals = {}
         arg_names = ['t', 'dt', 'x', 'y', 'prev_state']
@@ -192,7 +192,7 @@ def reset_prev_states(self):
 
     def calculate_color_correction(self):
         'Calculate and store color temperature correction'
-        rgb = rpi_ws281x.blackbody_to_rgb(self.params['master_color_temp'])
+        rgb = driver.blackbody_to_rgb(self.params['master_color_temp'])
         c = [self.correction_original[0] * int(rgb[0] * 255) // 255,
              self.correction_original[1] * int(rgb[1] * 255) // 255,
              self.correction_original[2] * int(rgb[2] * 255) // 255]
@@ -345,24 +345,32 @@ def update_leds(self):
 
         # Write colors to LEDs
         if mode == animpatterns.ColorMode.hsv:
-            self.led_controller.leds.set_all_pixels_hsv_float(
+            self.led_controller.set_all_pixels_hsv_float(
                 [(c[0][0] % 1, c[0][1], c[0][2] * c[1]) for c in s_2],
                 self.correction,
                 self.params['master_saturation'],
                 self.params['master_brightness'],
-                self.params['master_gamma'],
-                self.led_controller.has_white
+                self.params['master_gamma']
             )
         elif mode == animpatterns.ColorMode.rgb:
-            self.led_controller.leds.set_all_pixels_rgb_float(
+            self.led_controller.set_all_pixels_rgb_float(
                 [(c[0][0] * c[1], c[0][1] * c[1], c[0][2] * c[1]) for c in s_2],
                 self.correction,
                 self.params['master_saturation'],
                 self.params['master_brightness'],
-                self.params['master_gamma'],
-                self.led_controller.has_white
+                self.params['master_gamma']
             )
 
-    def end_animation_thread(self):
+    def clear_leds(self):
+        'Turn all LEDs off'
+        self.led_controller.set_all_pixels_rgb_float(
+            [(0, 0, 0) for i in range(self.led_count)],
+            self.correction,
+            self.params['master_saturation'],
+            self.params['master_brightness'],
+            self.params['master_gamma']
+        )
+
+    def end_animation(self):
         'Stop rendering in the animation thread'
         self.timer.stop()

ledcontrol/animationpatterns.py

@@ -4,7 +4,7 @@
 from random import random
 from enum import Enum
 
-import ledcontrol.driver as rpi_ws281x
+import ledcontrol.driver as driver
 import ledcontrol.utils as utils
 
 ColorMode = Enum('ColorMode', ['hsv', 'rgb'])
@@ -253,25 +253,25 @@ def pattern(t, dt, x, y, prev_state):
 # return brightness, colorRGB
 
 def sine_1d(t, dt, x, y, prev_state, in_color):
-    return in_color, rpi_ws281x.wave_sine(t + x)
+    return in_color, driver.wave_sine(t + x)
 
 def cubic_1d(t, dt, x, y, prev_state, in_color):
-    return in_color, rpi_ws281x.wave_cubic(t + x)
+    return in_color, driver.wave_cubic(t + x)
 
 def ramp_1d(t, dt, x, y, prev_state, in_color):
     return in_color, (t + x) % 1 # test ramp^2
 
 def bounce_linear_1d(t, dt, x, y, prev_state, in_color):
-    return in_color, rpi_ws281x.wave_sine(x + rpi_ws281x.wave_triangle(t))
+    return in_color, driver.wave_sine(x + driver.wave_triangle(t))
 
 def bounce_sine_1d(t, dt, x, y, prev_state, in_color):
-    return in_color, rpi_ws281x.wave_sine(x + rpi_ws281x.wave_sine(t))
+    return in_color, driver.wave_sine(x + driver.wave_sine(t))
 
 def bounce_cubic_1d(t, dt, x, y, prev_state, in_color):
-    return in_color, rpi_ws281x.wave_sine(x + rpi_ws281x.wave_cubic(t))
+    return in_color, driver.wave_sine(x + driver.wave_cubic(t))
 
 def perlin_noise_2d(t, dt, x, y, prev_state, in_color):
-    return in_color, rpi_ws281x.perlin_noise_3d(x, y, t)
+    return in_color, driver.perlin_noise_3d(x, y, t)
 
 def twinkle_pulse_1d(t, dt, x, y, prev_state, in_color):
     v = prev_state[1] - dt

ledcontrol/app.py

@@ -226,8 +226,8 @@ def auto_save_settings():
 
     controller.begin_animation_thread()
     atexit.register(save_settings)
-    atexit.register(leds.clear)
-    atexit.register(controller.end_animation_thread)
+    atexit.register(controller.clear_leds)
+    atexit.register(controller.end_animation)
     auto_save_settings()
 
     return app

ledcontrol/driver/__init__.py

@@ -1,32 +1,8 @@
 # led-control WS2812B LED Controller Server
-# Copyright 2019 jackw01. Released under the MIT License (see LICENSE for details).
+# Copyright 2020 jackw01. Released under the MIT License (see LICENSE for details).
 
-import _ledcontrol_rpi_ws281x_driver as rpi_ws281x
+# Import the extension module
+from _ledcontrol_rpi_ws281x_driver import *
 
-from .rpi_ws281x_helper import PixelStrip, Color
-#from .lib.rpi_ws281x import (
-#    blackbody_to_rgb,
-#    blackbody_correction_rgb,
-#    wave_pulse,
-#    wave_triangle,
-#    wave_sine,
-#    wave_cubic,
-#    plasma_sines,
-#    plasma_sines_octave,
-#    perlin_noise_3d,
-#)
 
-print(dir(rpi_ws281x))
 
-# For some reason this stopped working the normal way
-blackbody_to_rgb = rpi_ws281x.blackbody_to_rgb
-blackbody_correction_rgb = rpi_ws281x.blackbody_correction_rgb
-wave_pulse = rpi_ws281x.wave_pulse
-wave_triangle = rpi_ws281x.wave_triangle
-wave_sine = rpi_ws281x.wave_sine
-wave_cubic = rpi_ws281x.wave_cubic
-plasma_sines = rpi_ws281x.plasma_sines
-plasma_sines_octave = rpi_ws281x.plasma_sines_octave
-perlin_noise_3d = rpi_ws281x.perlin_noise_3d
-
-__version__ = '4.2.2'