Merge branch 'master' into patch-1

Author: ladyada

.gitignore

@@ -3,3 +3,4 @@ Hue_Controller/secrets.h
 .idea
 *.DS_Store
 CircuitPython_Logger/secrets\.py
+.python-version

Adafruit_ESP32_Arduino_Demos/SerialESPPassthrough/Airlift-BitsyWing-FeatherWing-Passthru.UF2

@@ -10,12 +10,13 @@
 import adafruit_dotstar
 import pulseio
 import board
+import usb_hid
 
 led = adafruit_dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1)
 
 # The keyboard object!
 time.sleep(1)  # Sleep for a bit to avoid a race condition on some systems
-keyboard = Keyboard()
+keyboard = Keyboard(usb_hid.devices)
 keyboard_layout = KeyboardLayoutUS(keyboard)  # We're in the US :)
 
 # our infrared pulse decoder helpers

Adafruit_pIRKey/NEC_keyboard_example.py

@@ -8,10 +8,11 @@
 import adafruit_dotstar
 import adafruit_irremote
 import time
+import usb_hid
 
 # The keyboard object!
 time.sleep(1)  # Sleep for a bit to avoid a race condition on some systems
-keyboard = Keyboard()
+keyboard = Keyboard(usb_hid.devices)
 keyboard_layout = KeyboardLayoutUS(keyboard)  # We're in the US :)
 
 led = adafruit_dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1)

Adafruit_pIRKey/raw_code_keyboard/main.py

@@ -4,6 +4,7 @@
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keycode import Keycode
 import board
+import usb_hid
 
 # A simple neat keyboard demo in circuitpython
 
@@ -16,7 +17,7 @@
 controlkey = Keycode.LEFT_CONTROL
 
 # the keyboard object!
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 # our array of button objects
 buttons = []
 leds = []

Arcade_Button_Control_Box/Arcade_Button_Control_Box.py

@@ -14,13 +14,15 @@
 
 import time
 import board
-import simpleio
+import pulseio
 from adafruit_circuitplayground.express import cpx
+from adafruit_motor import servo
 
-servo = simpleio.Servo(board.A1)
+pwm = pulseio.PWMOut(board.A1, duty_cycle=2 ** 15, frequency=50)
+my_servo = servo.Servo(pwm)
 
 cpx.pixels.fill((0, 0, 0))
-servo.angle = 90
+my_servo.angle = 90
 
 while True:
     light_level = cpx.light
@@ -30,8 +32,8 @@
     else:
         cpx.pixels.fill((0, 0, 0))
         if light_level < 200:
-            servo.angle = 90
+            my_servo.angle = 90
         else:
-            servo.angle = 0
+            my_servo.angle = 0
 
     time.sleep(0.25)

AutoSunglasses/code.py

@@ -0,0 +1,169 @@
+"""
+Heart Rate Trainer
+Read heart rate data from a heart rate peripheral using the standard BLE
+Heart Rate service.
+Displays BPM value to Seven Segment FeatherWing
+Displays percentage of max heart rate on another 7Seg FeatherWing
+"""
+
+import time
+import board
+
+import adafruit_ble
+from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
+from adafruit_ble.services.standard.device_info import DeviceInfoService
+from adafruit_ble_heart_rate import HeartRateService
+
+from adafruit_ht16k33.segments import Seg7x4
+
+from digitalio import DigitalInOut, Direction
+
+# Feather on-board status LEDs setup
+red_led = DigitalInOut(board.RED_LED)
+red_led.direction = Direction.OUTPUT
+red_led.value = True
+
+blue_led = DigitalInOut(board.BLUE_LED)
+blue_led.direction = Direction.OUTPUT
+blue_led.value = False
+
+# target heart rate for interval training
+# Change this number depending on your max heart rate, usually figured
+# as (220 - your age).
+max_rate = 180
+
+# Seven Segment FeatherWing setup
+i2c = board.I2C()
+display_A = Seg7x4(i2c, address=0x70)  # this will be the BPM display
+display_A.brightness = 15
+display_A.fill(0)  # Clear the display
+# Second display has A0 address jumpered
+display_B = Seg7x4(i2c, address=0x71)  # this will be the % target display
+display_B.brightness = 15
+display_B.fill(0)  # Clear the display
+
+# display_A "b.P.M."
+display_A.set_digit_raw(0, 0b11111100)
+display_A.set_digit_raw(1, 0b11110011)
+display_A.set_digit_raw(2, 0b00110011)
+display_A.set_digit_raw(3, 0b10100111)
+# display_B "Prct"
+display_B.set_digit_raw(0, 0b01110011)
+display_B.set_digit_raw(1, 0b01010000)
+display_B.set_digit_raw(2, 0b01011000)
+display_B.set_digit_raw(3, 0b01000110)
+time.sleep(3)
+
+display_A.fill(0)
+for h in range(4):
+    display_A.set_digit_raw(h, 0b10000000)
+# display_B show maximum heart rate value
+display_B.fill(0)
+display_B.print(max_rate)
+time.sleep(2)
+
+# PyLint can't find BLERadio for some reason so special case it here.
+ble = adafruit_ble.BLERadio()    # pylint: disable=no-member
+
+hr_connection = None
+
+def display_SCAN():
+    display_A.fill(0)
+    display_A.set_digit_raw(0, 0b01101101)
+    display_A.set_digit_raw(1, 0b00111001)
+    display_A.set_digit_raw(2, 0b01110111)
+    display_A.set_digit_raw(3, 0b00110111)
+
+
+def display_bLE():
+    display_B.fill(0)
+    display_B.set_digit_raw(0, 0b00000000)
+    display_B.set_digit_raw(1, 0b01111100)
+    display_B.set_digit_raw(2, 0b00111000)
+    display_B.set_digit_raw(3, 0b01111001)
+
+def display_dots():  # "...."
+    for j in range(4):
+        display_A.set_digit_raw(j, 0b10000000)
+        display_B.set_digit_raw(j, 0b10000000)
+
+def display_dashes():  # "----"
+    for k in range(4):
+        display_A.set_digit_raw(k, 0b01000000)
+        display_B.set_digit_raw(k, 0b01000000)
+
+# Start with a fresh connection.
+if ble.connected:
+    display_SCAN()
+    display_bLE()
+    time.sleep(1)
+
+    for connection in ble.connections:
+        if HeartRateService in connection:
+            connection.disconnect()
+        break
+
+while True:
+    print("Scanning...")
+    red_led.value = True
+    blue_led.value = False
+    display_SCAN()
+    display_bLE()
+    time.sleep(1)
+
+
+    for adv in ble.start_scan(ProvideServicesAdvertisement, timeout=5):
+        if HeartRateService in adv.services:
+            print("found a HeartRateService advertisement")
+            hr_connection = ble.connect(adv)
+            display_dots()
+            time.sleep(2)
+            print("Connected")
+            blue_led.value = True
+            red_led.value = False
+            break
+
+    # Stop scanning whether or not we are connected.
+    ble.stop_scan()
+    print("Stopped scan")
+    red_led.value = False
+    blue_led.value = True
+    time.sleep(0.5)
+
+    if hr_connection and hr_connection.connected:
+        print("Fetch connection")
+        if DeviceInfoService in hr_connection:
+            dis = hr_connection[DeviceInfoService]
+            try:
+                manufacturer = dis.manufacturer
+            except AttributeError:
+                manufacturer = "(Manufacturer Not specified)"
+            try:
+                model_number = dis.model_number
+            except AttributeError:
+                model_number = "(Model number not specified)"
+            print("Device:", manufacturer, model_number)
+        else:
+            print("No device information")
+        hr_service = hr_connection[HeartRateService]
+        print("Location:", hr_service.location)
+
+        while hr_connection.connected:
+            values = hr_service.measurement_values
+            print(values)  # returns the full heart_rate data set
+            if values:
+                bpm = (values.heart_rate)
+                if bpm is not 0:
+                    pct_target = (round(100*(bpm/max_rate)))
+                display_A.fill(0)  # clear the display
+                display_B.fill(0)
+                if values.heart_rate is 0:
+                    display_dashes()
+                else:
+                    display_A.fill(0)
+                    display_B.print(pct_target)
+                    time.sleep(0.1)
+                    display_A.print(bpm)
+
+            time.sleep(0.9)
+            display_A.set_digit_raw(0, 0b00000000)

BLE_Heart_Rate_Trainer/ble_heart_rate_trainer.py

@@ -0,0 +1,134 @@
+"""
+This example solicits that apple devices that provide notifications connect to it, initiates
+pairing, prints existing notifications and then prints any new ones as they arrive.
+"""
+
+import time
+import displayio
+import terminalio
+from adafruit_gizmo import tft_gizmo
+from adafruit_display_text.label import Label
+from adafruit_display_shapes.rect import Rect
+from adafruit_bitmap_font import bitmap_font
+import adafruit_ble
+from adafruit_ble.advertising.standard import SolicitServicesAdvertisement
+from adafruit_ble_apple_media import AppleMediaService
+from adafruit_ble_apple_media import UnsupportedCommand
+from adafruit_circuitplayground import cp
+
+BACKGROUND_COLOR = 0x49523b  # Gray
+TEXT_COLOR = 0xFF0000  # Red
+BORDER_COLOR = 0xAAAAAA  # Light Gray
+STATUS_COLOR = BORDER_COLOR
+
+# PyLint can't find BLERadio for some reason so special case it here.
+radio = adafruit_ble.BLERadio() # pylint: disable=no-member
+radio.name = "Now Playing Gizmo"
+a = SolicitServicesAdvertisement()
+a.solicited_services.append(AppleMediaService)
+radio.start_advertising(a)
+
+def wrap_in_tilegrid(open_file):
+    odb = displayio.OnDiskBitmap(open_file)
+    return displayio.TileGrid(odb, pixel_shader=displayio.ColorConverter())
+
+def make_background(width, height, color):
+    color_bitmap = displayio.Bitmap(width, height, 1)
+    color_palette = displayio.Palette(1)
+    color_palette[0] = color
+
+    return displayio.TileGrid(color_bitmap,
+                              pixel_shader=color_palette,
+                              x=0, y=0)
+
+def load_font(fontname, text):
+    font = bitmap_font.load_font(fontname)
+    font.load_glyphs(text.encode('utf-8'))
+    return font
+
+def make_label(text, x, y, color, max_glyphs=30, font=terminalio.FONT):
+    if isinstance(font, str):
+        font = load_font(font, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.,?()")
+    text_area = Label(font, text=text, color=color, max_glyphs=max_glyphs)
+    text_area.x = x
+    text_area.y = y
+    return text_area
+
+def set_label(label, value, max_length):
+    text = "{}".format(value)
+    if len(text) > max_length:
+        text = text[:max_length-3] + "..."
+    label.text = text
+
+def set_status(label, action_text, player):
+    label.text = "{} on {}".format(action_text, player)
+    _, _, label_width, _ = label.bounding_box
+    label.x = display.width - 10 - label_width
+
+display = tft_gizmo.TFT_Gizmo()
+group = displayio.Group(max_size=20)
+display.show(group)
+
+while True:
+    if not radio.connected:
+        group.append(wrap_in_tilegrid(open("/graphic_tfts_ams_connect.bmp", "rb")))
+
+        while not radio.connected:
+            pass
+
+        group.pop()
+    print("connected")
+
+    known_notifications = set()
+
+    # Draw the text fields
+    print("Loading Font Glyphs...")
+    group.append(wrap_in_tilegrid(open("/graphic_tfts_ams_loading.bmp", "rb")))
+    title_label = make_label("None", 12, 30, TEXT_COLOR, font="/fonts/Arial-Bold-18.bdf")
+    artist_label = make_label("None", 12, 70, TEXT_COLOR, font="/fonts/Arial-16.bdf")
+    album_label = make_label("None", 12, 184, TEXT_COLOR, font="/fonts/Arial-16.bdf")
+    status_label = make_label("None", 80, 220, STATUS_COLOR, font="/fonts/Arial-16.bdf")
+    group.pop()
+    group.append(make_background(240, 240, BACKGROUND_COLOR))
+    border = Rect(4, 4, 232, 200, outline=BORDER_COLOR, stroke=2)
+    group.append(title_label)
+    group.append(artist_label)
+    group.append(album_label)
+    group.append(status_label)
+    group.append(border)
+
+    while radio.connected:
+        for connection in radio.connections:
+            try:
+                if not connection.paired:
+                    connection.pair()
+                    print("paired")
+
+                ams = connection[AppleMediaService]
+            except (RuntimeError, UnsupportedCommand, AttributeError):
+                # Skip Bad Packets, unknown commands, etc.
+                continue
+            set_label(title_label, ams.title, 18)
+            set_label(album_label, ams.album, 21)
+            set_label(artist_label, ams.artist, 21)
+            action = "?"
+            if ams.playing:
+                action = "Playing"
+            elif ams.paused:
+                action = "Paused"
+            set_status(status_label, action, ams.player_name)
+        if cp.button_a:
+            ams.toggle_play_pause()
+            time.sleep(0.1)
+
+        if cp.button_b:
+            if cp.switch:
+                ams.previous_track()
+            else:
+                ams.next_track()
+            time.sleep(0.1)
+
+    print("disconnected")
+    # Remove all layers
+    while len(group):
+        group.pop()