Merge pull request #981 from tannewt/swap_hid_api

Provide USB HID devices directly rather than implicitly.

Author: kattni

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

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'

Foul_Fowl/main.py

@@ -9,6 +9,7 @@
 import time
 
 import board
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
 from adafruit_hid.keycode import Keycode
@@ -30,7 +31,7 @@
 buttons = []
 
 # the keyboard object!
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 # we're americans :)
 layout = KeyboardLayoutUS(kbd)
 

GemmaM0_Password_Vault/main.py

@@ -5,6 +5,7 @@
 
 import board
 import touchio
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
 from digitalio import DigitalInOut, Direction
@@ -19,7 +20,7 @@
 # the keyboard object
 # sleep for a bit to avoid a race condition on some systems
 time.sleep(1)
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 layout = KeyboardLayoutUS(kbd)
 
 while True:

GemmaM0_Radio_Tuning_Knob/main.py

@@ -5,6 +5,7 @@
 import time
 
 import board
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keycode import Keycode
 from analogio import AnalogIn
@@ -41,7 +42,7 @@ def spamKey(code):
                 Keycode.LEFT_BRACKET]
     spamRate = [0.01, 0.05, 0.125, 0.25, 0.5,
                 0.5, 0.5, 0.25, 0.125, 0.05, 0.01]
-    kbd = Keyboard()
+    kbd = Keyboard(usb_hid.devices)
     kbd.press(knobkeys[code])  # which keycode is entered
     kbd.release_all()
     time.sleep(spamRate[code])  # how fast the key is spammed

Giant_Mechanical_Keyboard/code.py

@@ -10,6 +10,7 @@
 
 import board
 import neopixel
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
 from adafruit_hid.keycode import Keycode
@@ -34,7 +35,7 @@
 buttonspressedlast = [False, False, False]
 
 # the keyboard object!
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 # we're americans :)
 layout = KeyboardLayoutUS(kbd)
 

Introducing_CircuitPlaygroundExpress/CircuitPlaygroundExpress_HIDKeyboard.py

@@ -3,6 +3,7 @@
 import time
 
 import board
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
 from adafruit_hid.keycode import Keycode
@@ -21,7 +22,7 @@
 # the keyboard object!
 # sleep for a bit to avoid a race condition on some systems
 time.sleep(1)
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 # we're americans :)
 layout = KeyboardLayoutUS(kbd)
 

Introducing_Gemma_M0/Gemma_HIDkeyboard.py

@@ -3,6 +3,7 @@
 import time
 
 import board
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
 from adafruit_hid.keycode import Keycode
@@ -21,7 +22,7 @@
 # the keyboard object!
 # sleep for a bit to avoid a race condition on some systems
 time.sleep(1)
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 # we're americans :)
 layout = KeyboardLayoutUS(kbd)
 

Launch_Deck_Trellis_M4/launch_deck_trellis_m4.py

@@ -5,6 +5,7 @@
 import time
 import random
 import adafruit_trellism4
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keycode import Keycode
 from adafruit_hid.consumer_control import ConsumerControl
@@ -80,8 +81,8 @@
 
 TOTAL_SNORE = SNORE_PAUSE + SNORE_UP + SNORE_DOWN
 
-kbd = Keyboard()
-cc = ConsumerControl()
+kbd = Keyboard(usb_hid.devices)
+cc = ConsumerControl(usb_hid.devices)
 
 trellis = adafruit_trellism4.TrellisM4Express(rotation=ROTATION)
 for button in keymap:

Make_It_A-Mouse/cpx-mouse-buttons.py

@@ -1,7 +1,8 @@
+import usb_hid
 from adafruit_circuitplayground.express import cpx
 from adafruit_hid.mouse import Mouse
 
-m = Mouse()
+m = Mouse(usb_hid.devices)
 
 while True:
     if cpx.button_a:

Make_It_A-Mouse/mouse-cursor.py

@@ -1,7 +1,8 @@
+import usb_hid
 from adafruit_circuitplayground.express import cpx
 from adafruit_hid.mouse import Mouse
 
-m = Mouse()
+m = Mouse(usb_hid.devices)
 cpx.adjust_touch_threshold(200)
 
 while True:

Make_It_A_Keyboard/keyboard-multimedia.py

@@ -1,8 +1,9 @@
+import usb_hid
 from adafruit_circuitplayground.express import cpx
 from adafruit_hid.consumer_control import ConsumerControl
 from adafruit_hid.consumer_control_code import ConsumerControlCode
 
-cc = ConsumerControl()
+cc = ConsumerControl(usb_hid.devices)
 
 while True:
     if cpx.button_a:

Make_It_A_Keyboard/keycodes.py

@@ -1,8 +1,9 @@
+import usb_hid
 from adafruit_circuitplayground.express import cpx
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keycode import Keycode
 
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 
 while True:
     if cpx.button_a:

Make_It_A_Keyboard/strings.py

@@ -1,8 +1,9 @@
+import usb_hid
 from adafruit_circuitplayground.express import cpx
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
 
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 layout = KeyboardLayoutUS(kbd)
 
 while True:

Make_It_Log/time-light-temp.py

@@ -8,6 +8,7 @@
 from digitalio import DigitalInOut, Direction, Pull
 import analogio
 import board
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keycode import Keycode
 from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
@@ -26,7 +27,7 @@
 # Set the keyboard object!
 # Sleep for a bit to avoid a race condition on some systems
 time.sleep(1)
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 layout = KeyboardLayoutUS(kbd)  # US is only current option...
 
 led = DigitalInOut(board.D13)   # Set up red LED "D13"

Minecraft_Gesture_Controller/main.py

@@ -19,6 +19,7 @@
 # General purpose libraries
 import touchio
 # Libraries for HID Keyboard & Mouse
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
 from adafruit_hid.keycode import Keycode
@@ -37,11 +38,11 @@
 # Keyboard & Mouse Setup
 
 # The keyboard object!
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 # we're americans :)
 layout = KeyboardLayoutUS(kbd)
 # The mouse object!
-mouse = Mouse()
+mouse = Mouse(usb_hid.devices)
 
 # Accelerometer Setup
 

Rotary_Encoder/rotary_encoder_volume.py

@@ -1,6 +1,7 @@
 import rotaryio
 import board
 import digitalio
+import usb_hid
 from adafruit_hid.consumer_control import ConsumerControl
 from adafruit_hid.consumer_control_code import ConsumerControlCode
 
@@ -10,7 +11,7 @@
 
 encoder = rotaryio.IncrementalEncoder(board.D10, board.D9)
 
-cc = ConsumerControl()
+cc = ConsumerControl(usb_hid.devices)
 
 button_state = None
 last_position = encoder.position