Merge pull request #65 from pimoroni/patch-dma-priority

Always run backlight on core1.

Author: Gadgetoid

docs/presto.md

@@ -1,9 +1,18 @@
-# Presto
+# Presto <!-- omit in toc -->
 
 Most of your interaction with Presto will be through the `presto` module.
 
 It will help you set up PicoGraphics, touch, WiFi, ambient lighting and more.
 
+- [Getting Started](#getting-started)
+- [Features](#features)
+  - [Updating The Display](#updating-the-display)
+  - [Touch](#touch)
+  - [Back/Ambient Lights](#backambient-lights)
+    - [Auto LEDs](#auto-leds)
+    - [Manual LEDs](#manual-leds)
+  - [Wireless](#wireless)
+
 ## Getting Started
 
 Create a new Presto instance:
@@ -58,43 +67,22 @@ To access touch information you can use:
 
 ### Back/Ambient Lights
 
+#### Auto LEDs
+
 If you've set `ambient_light=True` then Presto will automatically update the LEDs
 to match the screen content.
 
 Note - you can disable this with `presto.auto_ambient_leds(False)`.
 
-Otherwise you can use either MicroPython's `neopixel` library or our `Plasma` to
-drive the LEDs.
+#### Manual LEDs
 
-#### Using the NeoPixel Library
-
-```python
-import neopixel
-
-NUM_LEDS = 7
-LED_PIN = 33
-
-lights = neopixel.NeoPixel(machine.Pin(LED_PIN), NUM_LEDS)
-
-lights[0] = (255, 255, 0)
-
-lights.write()
-```
-
-#### Using the Plasma Library
+With Presto's auto backlighting disabled you can control the LED colours
+manually, like so:
 
 
 ```python
-import plasma
-
-NUM_LEDS = 7
-LED_PIN = 33
-
-lights = plasma.WS2812(NUM_LEDS, 0, 0, LED_PIN)
-lights.start()
-
-lights.set_hsv(0, 0.5, 1.0, 1.0)
-lights.set_rgb(1, 255, 255, 0)
+presto.set_led_hsv(0, 0.5, 1.0, 1.0)
+presto.set_led_rgb(1, 255, 255, 0)
 ```
 
 ### Wireless

examples/backlight_basic.py

@@ -145,10 +145,6 @@ def show_message(text):
     while True:
         show_message(e)
 
-# WS2812 / NeoPixel™ LEDs used for the backlight
-bl = plasma.WS2812(7, 0, 0, 33)
-bl.start()
-
 # Centre points
 CX = WIDTH // 2
 CY = HEIGHT // 2
@@ -257,7 +253,7 @@ def get_cheerlight():
             draw_bulb(colour)
 
             for i in range(7):
-                bl.set_rgb(i, *colour)
+                presto.set_led_rgb(i, *colour)
 
             time.sleep(0.02)
 
@@ -266,7 +262,7 @@ def get_cheerlight():
             display.clear()
 
             for i in range(7):
-                bl.set_rgb(i, 0, 0, 0)
+                presto.set_led_rgb(i, 0, 0, 0)
 
             time.sleep(0.02)
 

examples/cheerlights_bulb.py

@@ -45,10 +45,6 @@
 # JPEG Dec
 j = jpegdec.JPEG(display)
 
-# Plasma setup
-bl = plasma.WS2812(7, 0, 0, 33)
-bl.start()
-
 # Where our images are located
 directory = 'gallery'
 
@@ -231,23 +227,23 @@ def clear():
         # The LEDs on the right side of the presto light up to show it is working
         if touch.x > WIDTH // 2:
             for i in LEDS_RIGHT:
-                bl.set_rgb(i, 255, 255, 255)
+                presto.set_led_rgb(i, 255, 255, 255)
             show_image(show_next=True)
             presto.update()
             last_updated = time.time()
             for i in LEDS_RIGHT:
-                bl.set_rgb(i, 0, 0, 0)
+                presto.set_led_rgb(i, 0, 0, 0)
             time.sleep(0.01)
 
         # Left half of the screen moves to the previous image
         elif touch.x < WIDTH // 2:
             for i in LEDS_LEFT:
-                bl.set_rgb(i, 255, 255, 255)
+                presto.set_led_rgb(i, 255, 255, 255)
             show_image(show_previous=True)
             presto.update()
             last_updated = time.time()
             for i in LEDS_LEFT:
-                bl.set_rgb(i, 0, 0, 0)
+                presto.set_led_rgb(i, 0, 0, 0)
             time.sleep(0.01)
 
         # Wait here until the user stops touching the screen

examples/image_gallery.py

@@ -20,9 +20,6 @@
     os.remove("/ramfs/launch.txt")
     __import__(result[:-3])
 
-bl = plasma.WS2812(7, 0, 0, 33)
-bl.start()
-
 # Setup for the Presto display
 presto = Presto(ambient_light=False)
 
@@ -357,6 +354,6 @@ def launch(self):
     # Cycle the hue of the backlight LEDs to match the icon colours
     hue = 1.0 - (move_angle % (2 * math.pi)) / (2 * math.pi)
     for i in range(7):
-        bl.set_hsv(i, hue, 1.0, 0.5)
+        presto.set_led_hsv(i, hue, 1.0, 0.5)
 
     presto.update()

examples/main.py

@@ -9,6 +9,9 @@ MP_DEFINE_CONST_FUN_OBJ_KW(Presto_partial_update_obj, 5, Presto_partial_update);
 MP_DEFINE_CONST_FUN_OBJ_2(Presto_set_backlight_obj, Presto_set_backlight);
 MP_DEFINE_CONST_FUN_OBJ_2(Presto_auto_ambient_leds_obj, Presto_auto_ambient_leds);
 
+MP_DEFINE_CONST_FUN_OBJ_KW(Presto_set_led_rgb_obj, 5, Presto_set_led_rgb);
+MP_DEFINE_CONST_FUN_OBJ_KW(Presto_set_led_hsv_obj, 3, Presto_set_led_hsv);
+
 /***** Binding of Methods *****/
 
 static const mp_rom_map_elem_t Presto_locals_dict_table[] = {
@@ -17,6 +20,8 @@ static const mp_rom_map_elem_t Presto_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_partial_update), MP_ROM_PTR(&Presto_partial_update_obj) },
     { MP_ROM_QSTR(MP_QSTR_set_backlight), MP_ROM_PTR(&Presto_set_backlight_obj) },
     { MP_ROM_QSTR(MP_QSTR_auto_ambient_leds), MP_ROM_PTR(&Presto_auto_ambient_leds_obj) },
+    { MP_ROM_QSTR(MP_QSTR_set_led_rgb), MP_ROM_PTR(&Presto_set_led_rgb_obj) },
+    { MP_ROM_QSTR(MP_QSTR_set_led_hsv), MP_ROM_PTR(&Presto_set_led_hsv_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_WIDTH), MP_ROM_INT(WIDTH/2) },
     { MP_ROM_QSTR(MP_QSTR_HEIGHT), MP_ROM_INT(HEIGHT/2) },