Merge pull request adafruit#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)