Merge branch 'master' into master

Author: TonyLHansen

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 = []

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)

CPX_GBoard/arcade_hid.py

@@ -13,6 +13,7 @@
 """
 
 import board
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keycode import Keycode
 from digitalio import DigitalInOut, Direction, Pull
@@ -28,7 +29,7 @@
 button_b.direction = Direction.INPUT
 button_b.pull = Pull.UP
 
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 
 
 def touch_a():

CPX_GBoard/touch_hid.py

@@ -12,14 +12,15 @@
 All text above must be included in any redistribution.
 """
 
+import usb_hid
 from adafruit_circuitplayground.express import cpx
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keycode import Keycode
 
 DOT_DURATION = 0.25
 DASH_DURATION = 0.5
 
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 
 # You can adjust this to get the level of sensitivity you want.
 cpx.adjust_touch_threshold(100)

CPX_GBoard/universal.py

@@ -20,9 +20,10 @@
 # from digitalio import DigitalInOut, Direction, Pull
 # import board
 
-# Uncomment the next 2 lines if you want to use HID output
+# Uncomment the next 3 lines if you want to use HID output
 # from adafruit_hid.keyboard import Keyboard
 # from adafruit_hid.keycode import Keycode
+# import usb_hid
 
 DOT_DURATION = 0.20
 DASH_DURATION = 0.5
@@ -40,7 +41,7 @@
 # button_b.pull = Pull.UP
 
 # Uncomment the next  line if you want to use HID output
-# kbd = Keyboard()
+# kbd = Keyboard(usb_hid.devices)
 
 
 

CircuitPython_Essentials/CircuitPython_HID_Keyboard.py

@@ -4,6 +4,7 @@
 
 import board
 import digitalio
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
 from adafruit_hid.keycode import Keycode
@@ -20,7 +21,7 @@
 
 # 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 :)
 
 # Make all pin objects inputs with pullups

CircuitPython_Essentials/CircuitPython_HID_Mouse.py

@@ -3,9 +3,10 @@
 import analogio
 import board
 import digitalio
+import usb_hid
 from adafruit_hid.mouse import Mouse
 
-mouse = Mouse()
+mouse = Mouse(usb_hid.devices)
 
 x_axis = analogio.AnalogIn(board.A0)
 y_axis = analogio.AnalogIn(board.A1)

Crank_USB_HID/code.py

@@ -11,6 +11,7 @@
 from adafruit_hid.consumer_control import ConsumerControl
 from adafruit_hid.consumer_control_code import ConsumerControlCode
 import neopixel
+import usb_hid
 
 DOT_COLOR = 0xFF0000              # set to your favorite webhex color
 PRESSED_DOT_COLOR = 0x008080      # set to your second-favorite color
@@ -35,7 +36,8 @@
 rot_b.pull = Pull.UP
 
 # Used to do HID output, see below
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
+consumer_control = ConsumerControl(usb_hid.devices)
 
 # time keeper, so we know when to turn off the LED
 timestamp = time.monotonic()
@@ -111,12 +113,12 @@
 
     # Check if rotary encoder went up
     if encoder_direction == 1:
-        ConsumerControl().send(ConsumerControlCode.VOLUME_DECREMENT) #Turn Down Volume
+        consumer_control.send(ConsumerControlCode.VOLUME_DECREMENT) #Turn Down Volume
     #    kbd.press(Keycode.LEFT_ARROW)
     #    kbd.release_all()
     # Check if rotary encoder went down
     if encoder_direction == -1:
-        ConsumerControl().send(ConsumerControlCode.VOLUME_INCREMENT) #Turn Up Volume
+        consumer_control.send(ConsumerControlCode.VOLUME_INCREMENT) #Turn Up Volume
     #    kbd.press(Keycode.RIGHT_ARROW)
     #    kbd.release_all()
     # Button was 'just pressed'