Merge branch 'master' into master

Author: ladyada

Adafruit_pIRKey/NEC_keyboard_example.py

@@ -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/raw_code_keyboard/main.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)

Arcade_Button_Control_Box/Arcade_Button_Control_Box.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 = []

AutoSunglasses/code.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)

CPB_ANCS/code.py

@@ -12,7 +12,7 @@
 import displayio
 import adafruit_ble
 from adafruit_ble.advertising.standard import SolicitServicesAdvertisement
-from adafruit_ble.services.apple import AppleNotificationService
+from adafruit_ble_apple_notification_center import AppleNotificationCenterService
 from adafruit_gizmo import tft_gizmo
 from audiocore import WaveFile
 from audiopwmio import PWMAudioOut as AudioOut
@@ -34,7 +34,7 @@
     "com.apple.mobilephone": "/ancs_phone.bmp"
 }
 
-BLACKLIST = []
+BLOCKLIST = []
 DELAY_AFTER_PRESS = 15
 DEBOUNCE = 0.1
 DIM_TIMEOUT = 20   # Amount of timeout to turn off backlight
@@ -54,11 +54,11 @@ def play_sound():
 
 def find_connection():
     for connection in radio.connections:
-        if AppleNotificationService not in connection:
+        if AppleNotificationCenterService not in connection:
             continue
         if not connection.paired:
             connection.pair()
-        return connection, connection[AppleNotificationService]
+        return connection, connection[AppleNotificationCenterService]
     return None, None
 
 class Dimmer:
@@ -86,7 +86,7 @@ def check_timeout(self):
 radio = adafruit_ble.BLERadio()
 advertisement = SolicitServicesAdvertisement()
 advertisement.complete_name = "CIRCUITPY"
-advertisement.solicited_services.append(AppleNotificationService)
+advertisement.solicited_services.append(AppleNotificationCenterService)
 
 def wrap_in_tilegrid(open_file):
     odb = displayio.OnDiskBitmap(open_file)
@@ -123,7 +123,7 @@ def wrap_in_tilegrid(open_file):
             current_notifications = notification_service.active_notifications
             for notif_id in current_notifications:
                 notification = current_notifications[notif_id]
-                if notification.app_id not in APP_ICONS or notification.app_id in BLACKLIST:
+                if notification.app_id not in APP_ICONS or notification.app_id in BLOCKLIST:
                     continue
                 all_ids.append(notif_id)
 

CPB_ANCS/print_code.py

@@ -0,0 +1,63 @@
+"""This demo shows the latest notification from a connected Apple device on the REPL and Gizmo"""
+import time
+import adafruit_ble
+from adafruit_ble.advertising.standard import SolicitServicesAdvertisement
+from adafruit_ble_apple_notification_center import AppleNotificationCenterService
+from adafruit_gizmo import tft_gizmo
+
+# This is a whitelist of apps to show notifications from.
+#APPS = ["com.tinyspeck.chatlyio", "com.atebits.Tweetie2"]
+APPS = []
+
+DELAY_AFTER_PRESS = 15
+DEBOUNCE = 0.1
+
+def find_connection():
+    for connection in radio.connections:
+        if AppleNotificationCenterService not in connection:
+            continue
+        if not connection.paired:
+            connection.pair()
+        return connection, connection[AppleNotificationCenterService]
+    return None, None
+
+# Start advertising before messing with the display so that we can connect immediately.
+radio = adafruit_ble.BLERadio()
+advertisement = SolicitServicesAdvertisement()
+advertisement.complete_name = "CIRCUITPY"
+advertisement.solicited_services.append(AppleNotificationCenterService)
+
+display = tft_gizmo.TFT_Gizmo()
+
+current_notification = None
+new_ids = []
+displayed_ids = []
+active_connection, notification_service = find_connection()
+while True:
+    if not active_connection:
+        radio.start_advertising(advertisement)
+
+    while not active_connection:
+        print("waiting for connection...")
+        active_connection, notification_service = find_connection()
+        time.sleep(0.1)
+
+    while active_connection.connected:
+        current_notifications = notification_service.active_notifications
+        for notification_id in current_notifications:
+            if notification_id in displayed_ids:
+                continue # already seen!
+            notification = current_notifications[notification_id]
+            print('-'*36)
+            category = str(notification).split(" ", 1)[0]
+            print("Msg #%d - Category %s" % (notification.id, category))
+            print("From app:", notification.app_id)
+            if notification.title:
+                print("Title:", notification.title)
+            if notification.subtitle:
+                print("Subtitle:", notification.subtitle)
+            if notification.message:
+                print("Message:", notification.message)
+            displayed_ids.append(id)
+    active_connection = None
+    notification_service = None

CPB_Magic_Light_Mixer/cpb_magic_light_mixer.py

@@ -0,0 +1,93 @@
+# Magic Light Bulb remote color mixer
+# Sends RGB color values, read from three faders on CPB to the bulb
+# https://www.magiclightbulbs.com/collections/bluetooth-bulbs
+
+import adafruit_ble
+from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
+from adafruit_ble_magic_light import MagicLightService
+import _bleio
+import board
+from analogio import AnalogIn
+from adafruit_circuitplayground import cp
+
+
+def find_connection():
+    for connection in radio.connections:
+        if MagicLightService not in connection:  # Filter services
+            continue
+        return connection, connection[MagicLightService]
+    return None, None
+
+radio = adafruit_ble.BLERadio()
+
+
+def scale(value):
+    # Scale a value from 0-65535 (AnalogIn range) to 0-255 (RGB range)
+    return int(value / 65535 * 255)
+a4 = AnalogIn(board.A4)  # red slider
+a5 = AnalogIn(board.A5)  # green slider
+a6 = AnalogIn(board.A6)  # blue slider
+
+cp.pixels.brightness = 0.1
+dimmer = 1.0
+
+active_connection, bulb = find_connection()  # In case already connected
+
+while True:
+    if not active_connection:  # There's no connection, so let's scan for one
+        cp.pixels[0] = (60, 40, 0)  # set CPB NeoPixel 0 to yellow while searching
+        print("Scanning for Magic Light...")
+        # Scan and filter for advertisements with ProvideServicesAdvertiesment type
+        for advertisement in radio.start_scan(ProvideServicesAdvertisement):
+            # Filter further for advertisements with MagicLightService
+            if MagicLightService in advertisement.services:
+                active_connection = radio.connect(advertisement)
+                print("Connected to Magic Light")
+                cp.pixels[0] = (0, 0, 255)  # Set NeoPixel 0 to blue when connected
+                # Play a happy tone
+                cp.play_tone(440, 0.1)
+                cp.play_tone(880, 0.1)
+                print("Adjust slide potentiometers to mix RGB colors")
+                try:
+                    bulb = active_connection[MagicLightService]
+                except _bleio.ConnectionError:
+                    print("disconnected")
+                    continue
+                break
+        radio.stop_scan()  # Now that we're connected, stop scanning
+
+    while active_connection.connected:  # Connected, now we can set attrs to change colors
+        # Toggle slide switch to go to half or full brightness
+        if cp.switch:
+            cp.red_led = True
+            dimmer = 0.5
+        else:
+            cp.red_led = False
+            dimmer = 1.0
+
+        # Press the 'A' button to momentarily black the bulb
+        if cp.button_a:
+            dimmer = 0.0
+
+        r = scale(a4.value * dimmer)
+        g = scale(a5.value * dimmer)
+        b = scale(a6.value * dimmer)
+
+        # Press the 'B' button to momentarily white the bulb
+        if cp.button_b:
+            r, g, b = (255, 255, 255)
+
+        color = (r, g, b)
+
+        try:
+            bulb[0] = color  # Send color to bulb's color characteristic
+        except _bleio.ConnectionError:
+            print("disconnected")
+            continue
+        cp.pixels[2] = (r, 0, 0)
+        cp.pixels[3] = (0, g, 0)
+        cp.pixels[4] = (0, 0, b)
+        cp.pixels[7] = (color)
+
+    active_connection = None  # Not connected, start scanning again
+    cp.pixels[0] = (60, 40, 0)