Merge branch 'adafruit:main' into claycooper-group-prop-deprecation-fix

Author: claycooper

CircuitPython_Templates/asyncio/code.py

@@ -0,0 +1,97 @@
+# SPDX-FileCopyrightText: Copyright (c) 2022 Dan Halbert for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2022 Kattni Rembor for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""
+CircuitPython asyncio example for two NeoPixel rings and one button.
+REMOVE THIS LINE AND THE REST OF THIS DOCSTRING BEFORE SUBMITTING TO LEARN
+THERE ARE TWO POSSIBLE THINGS IN THE CODE TO UPDATE.
+
+One: Update BUTTON to the pin that matches the pin to which the button is connected.
+
+For example, on the QT Py RP2040, you would leave it as BUTTON to use the built-in Boot button.
+On the FunHouse, you would update BUTTON to BUTTON_UP to use the built-in up button.
+On the Feather M4 Express, you would wire the external button to A0, and update BUTTON to A0.
+
+Two: THIS IS ONLY NECESSARY IF THE BUILT-IN BUTTON IS ACTIVE HIGH. For example the built-in
+buttons on the Circuit Playground Bluefruit and the MagTag are active high.
+If your button is ACTIVE HIGH, under "async def monitor_button(button, animation_controls)",
+update the following line of code:
+    with keypad.Keys((button,), value_when_pressed=False, pull=True) as key:
+To the following:
+    with keypad.Keys((button,), value_when_pressed=True, pull=True) as key:
+"""
+import asyncio
+import board
+import neopixel
+import keypad
+from rainbowio import colorwheel
+
+button_pin = board.BUTTON  # The pin the button is connected to.
+num_pixels = 16  # The number of NeoPixels on a single ring.
+brightness = 0.2  # The LED brightness.
+
+# Set up NeoPixel rings.
+ring_one = neopixel.NeoPixel(board.A1, num_pixels, brightness=brightness, auto_write=False)
+ring_two = neopixel.NeoPixel(board.A2, num_pixels, brightness=brightness, auto_write=False)
+
+
+class AnimationControls:
+    """The controls to allow you to vary the rainbow and blink animations."""
+    def __init__(self):
+        self.reverse = False
+        self.wait = 0.0
+        self.delay = 0.5
+
+
+async def rainbow_cycle(animation_controls):
+    """Rainbow cycle animation on ring one."""
+    while True:
+        for j in range(255, -1, -1) if animation_controls.reverse else range(0, 256, 1):
+            for i in range(num_pixels):
+                rc_index = (i * 256 // num_pixels) + j
+                ring_one[i] = colorwheel(rc_index & 255)
+            ring_one.show()
+            await asyncio.sleep(animation_controls.wait)
+
+
+async def blink(animation_controls):
+    """Blink animation on ring two."""
+    while True:
+        ring_two.fill((0, 0, 255))
+        ring_two.show()
+        await asyncio.sleep(animation_controls.delay)
+        ring_two.fill((0, 0, 0))
+        ring_two.show()
+        await asyncio.sleep(animation_controls.delay)
+        await asyncio.sleep(animation_controls.wait)
+
+
+async def monitor_button(button, animation_controls):
+    """Monitor button that reverses rainbow direction and changes blink speed.
+    Assume button is active low.
+    """
+    with keypad.Keys((button,), value_when_pressed=False, pull=True) as key:
+        while True:
+            key_event = key.events.get()
+            if key_event:
+                if key_event.pressed:
+                    animation_controls.reverse = True
+                    animation_controls.delay = 0.1
+                elif key_event.released:
+                    animation_controls.reverse = False
+                    animation_controls.delay = 0.5
+            # Let another task run.
+            await asyncio.sleep(0)
+
+
+async def main():
+    animation_controls = AnimationControls()
+    buttons_task = asyncio.create_task(monitor_button(button_pin, animation_controls))
+    animation_task = asyncio.create_task(rainbow_cycle(animation_controls))
+    blink_task = asyncio.create_task(blink(animation_controls))
+
+    # This will run forever, because no tasks ever finish.
+    await asyncio.gather(buttons_task, animation_task, blink_task)
+
+asyncio.run(main())

FunHouse_Arduino_Demos/selftest/selftest.ino

@@ -10,6 +10,7 @@
 
 #define NUM_DOTSTAR 5
 #define BG_COLOR ST77XX_BLACK
+#define ST77XX_GREY 0x8410   // Colors are in RGB565 format
 
 // display!
 Adafruit_ST7789 tft = Adafruit_ST7789(TFT_CS, TFT_DC, TFT_RESET);
@@ -125,23 +126,23 @@ void loop() {
   tft.setTextColor(ST77XX_YELLOW);
   tft.print("Buttons: ");
   if (! digitalRead(BUTTON_DOWN)) {  
-    tft.setTextColor(0x808080);
+    tft.setTextColor(ST77XX_GREY);
   } else {
     Serial.println("DOWN pressed");
     tft.setTextColor(ST77XX_WHITE);
   }
   tft.print("DOWN ");
 
   if (! digitalRead(BUTTON_SELECT)) {  
-    tft.setTextColor(0x808080);
+    tft.setTextColor(ST77XX_GREY);
   } else {
     Serial.println("SELECT pressed");
     tft.setTextColor(ST77XX_WHITE);
   }
   tft.print("SEL ");
 
   if (! digitalRead(BUTTON_UP)) {  
-    tft.setTextColor(0x808080);
+    tft.setTextColor(ST77XX_GREY);
   } else {
     Serial.println("UP pressed");
     tft.setTextColor(ST77XX_WHITE);
@@ -156,7 +157,7 @@ void loop() {
   tft.print("Captouch 6: ");
   touchread = touchRead(6);
   if (touchread < 10000 ) {  
-    tft.setTextColor(0x808080, BG_COLOR);
+    tft.setTextColor(ST77XX_GREY, BG_COLOR);
   } else {
     tft.setTextColor(ST77XX_WHITE, BG_COLOR);
   }
@@ -169,7 +170,7 @@ void loop() {
   tft.print("Captouch 7: ");
   touchread = touchRead(7);
   if (touchread < 20000 ) {  
-    tft.setTextColor(0x808080, BG_COLOR);
+    tft.setTextColor(ST77XX_GREY, BG_COLOR);
   } else {
     tft.setTextColor(ST77XX_WHITE, BG_COLOR);
   }
@@ -183,7 +184,7 @@ void loop() {
   tft.print("Captouch 8: ");
   touchread = touchRead(8);
   if (touchread < 20000 ) {  
-    tft.setTextColor(0x808080, BG_COLOR);
+    tft.setTextColor(ST77XX_GREY, BG_COLOR);
   } else {
     tft.setTextColor(ST77XX_WHITE, BG_COLOR);
   }
@@ -248,10 +249,10 @@ void loop() {
   /************************** Beep! */
   if (digitalRead(BUTTON_SELECT)) {  
      Serial.println("** Beep! ***");
-     tone(SPEAKER, 988, 100);  // tone1 - B5
-     tone(SPEAKER, 1319, 200); // tone2 - E6
+     fhtone(SPEAKER, 988.0, 100.0);  // tone1 - B5
+     fhtone(SPEAKER, 1319.0, 200.0); // tone2 - E6
      delay(100);
-     //tone(SPEAKER, 2000, 100);
+     //fhtone(SPEAKER, 2000.0, 100.0);
   }
 
   /************************** LEDs */
@@ -269,7 +270,7 @@ void loop() {
 }
 
 
-void tone(uint8_t pin, float frequency, float duration) {
+void fhtone(uint8_t pin, float frequency, float duration) {
   ledcSetup(1, frequency, 8);
   ledcAttachPin(pin, 1);
   ledcWrite(1, 128);

FunHouse_Arduino_Demos/shipping_demo/shipping_demo.ino

@@ -9,7 +9,8 @@
 #include <Adafruit_AHTX0.h>
 
 #define NUM_DOTSTAR 5
-#define BG_COLOR ST77XX_BLACK
+#define BG_COLOR ST77XX_BLACK  // Set background to black
+#define ST77XX_GREY 0x8410     // define mid-grey in RGB565
 
 // display!
 Adafruit_ST7789 tft = Adafruit_ST7789(TFT_CS, TFT_DC, TFT_RESET);
@@ -124,23 +125,23 @@ void loop() {
   tft.setTextColor(ST77XX_YELLOW);
   tft.print("Buttons: ");
   if (! digitalRead(BUTTON_DOWN)) {  
-    tft.setTextColor(0x808080);
+    tft.setTextColor(ST77XX_GREY);
   } else {
     Serial.println("DOWN pressed");
     tft.setTextColor(ST77XX_WHITE);
   }
   tft.print("DOWN ");
 
   if (! digitalRead(BUTTON_SELECT)) {  
-    tft.setTextColor(0x808080);
+    tft.setTextColor(ST77XX_GREY);
   } else {
     Serial.println("SELECT pressed");
     tft.setTextColor(ST77XX_WHITE);
   }
   tft.print("SEL ");
 
   if (! digitalRead(BUTTON_UP)) {  
-    tft.setTextColor(0x808080);
+    tft.setTextColor(ST77XX_GREY);
   } else {
     Serial.println("UP pressed");
     tft.setTextColor(ST77XX_WHITE);
@@ -155,7 +156,7 @@ void loop() {
   tft.print("Captouch 6: ");
   touchread = touchRead(6);
   if (touchread < 10000 ) {  
-    tft.setTextColor(0x808080, BG_COLOR);
+    tft.setTextColor(ST77XX_GREY, BG_COLOR);
   } else {
     tft.setTextColor(ST77XX_WHITE, BG_COLOR);
   }
@@ -168,7 +169,7 @@ void loop() {
   tft.print("Captouch 7: ");
   touchread = touchRead(7);
   if (touchread < 20000 ) {  
-    tft.setTextColor(0x808080, BG_COLOR);
+    tft.setTextColor(ST77XX_GREY, BG_COLOR);
   } else {
     tft.setTextColor(ST77XX_WHITE, BG_COLOR);
   }
@@ -182,7 +183,7 @@ void loop() {
   tft.print("Captouch 8: ");
   touchread = touchRead(8);
   if (touchread < 20000 ) {  
-    tft.setTextColor(0x808080, BG_COLOR);
+    tft.setTextColor(ST77XX_GREY, BG_COLOR);
   } else {
     tft.setTextColor(ST77XX_WHITE, BG_COLOR);
   }
@@ -247,10 +248,10 @@ void loop() {
   /************************** Beep! */
   if (digitalRead(BUTTON_SELECT)) {  
      Serial.println("** Beep! ***");
-     tone(SPEAKER, 988, 100);  // tone1 - B5
-     tone(SPEAKER, 1319, 200); // tone2 - E6
+     fhtone(SPEAKER, 988.0, 100.0);  // tone1 - B5
+     fhtone(SPEAKER, 1319.0, 200.0); // tone2 - E6
      delay(100);
-     //tone(SPEAKER, 2000, 100);
+     //fhtone(SPEAKER, 2000.0, 100.0);
   }
 
   /************************** LEDs */
@@ -268,7 +269,7 @@ void loop() {
 }
 
 
-void tone(uint8_t pin, float frequecy, float duration) {
+void fhtone(uint8_t pin, float frequecy, float duration) {
   ledcSetup(1, frequecy * 80, 8);
   ledcAttachPin(pin, 1);
   ledcWrite(1, 128);

MIDI_Foot_Pedal/code.py

@@ -0,0 +1,45 @@
+# SPDX-FileCopyrightText: 2022 Liz Clark for Adafruit Industries
+# SPDX-License-Identifier: MIT
+
+import board
+import usb_midi
+import adafruit_midi
+import simpleio
+from analogio import AnalogIn
+from adafruit_midi.control_change import ControlChange
+
+#  midi setup
+midi = adafruit_midi.MIDI(
+    midi_in=usb_midi.ports[0], in_channel=0, midi_out=usb_midi.ports[1], out_channel=0
+)
+
+#  potentiometer setup
+mod_pot = AnalogIn(board.A0)
+
+#  function to read analog input
+def val(pin):
+    return pin.value
+
+#  variables for last read value
+#  defaults to 0
+#  no pitchbend is 8192
+mod_val2 = 0
+
+while True:
+
+    #  uncomment below to print potentiometer values in the REPL
+    #  print("{}".format(mod_pot.value))
+
+    #  map range of potentiometer input to midi values
+    mod_val1 = round(simpleio.map_range(val(mod_pot), 41200, 58500, 0, 127))
+
+    #  if modulation value is updated...
+    if abs(mod_val1 - mod_val2) > 2:
+        #  update mod_val2
+        mod_val2 = mod_val1
+        #  create integer
+        modulation = int(mod_val2)
+        #  create CC message
+        modWheel = ControlChange(1, modulation)
+        #  send CC message
+        midi.send(modWheel)

PyPortal_User_Interface/code.py

@@ -64,12 +64,20 @@ def set_backlight(val):
     board.DISPLAY.brightness = val
 
 # Set the Backlight
-set_backlight(0.3)
+if board.board_id == "pyportal_titano":
+    # 0.3 brightness does not cause the display to be visible on the Titano
+    set_backlight(1)
+else:
+    set_backlight(0.3)
 
 # Touchscreen setup
 # ------Rotate 270:
-screen_width = 240
-screen_height = 320
+if board.board_id == "pyportal_titano":
+    screen_width = 320
+    screen_height = 480
+else:
+    screen_width = 240
+    screen_height = 320
 ts = adafruit_touchscreen.Touchscreen(board.TOUCH_YD, board.TOUCH_YU,
                                       board.TOUCH_XR, board.TOUCH_XL,
                                       calibration=((5200, 59000),