diff --git a/Adafruit_pIRKey/NEC_keyboard_example.py b/Adafruit_pIRKey/NEC_keyboard_example.py index 799b4831a..e190d0999 100644 --- a/Adafruit_pIRKey/NEC_keyboard_example.py +++ b/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 diff --git a/Adafruit_pIRKey/raw_code_keyboard/main.py b/Adafruit_pIRKey/raw_code_keyboard/main.py index 28a241dc9..95088c53a 100644 --- a/Adafruit_pIRKey/raw_code_keyboard/main.py +++ b/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) diff --git a/Arcade_Button_Control_Box/Arcade_Button_Control_Box.py b/Arcade_Button_Control_Box/Arcade_Button_Control_Box.py index 0e59b8e07..0c73e8bea 100644 --- a/Arcade_Button_Control_Box/Arcade_Button_Control_Box.py +++ b/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 = [] diff --git a/CPX_GBoard/arcade_hid.py b/CPX_GBoard/arcade_hid.py index 54e6d5eb4..bf91a6583 100644 --- a/CPX_GBoard/arcade_hid.py +++ b/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(): diff --git a/CPX_GBoard/touch_hid.py b/CPX_GBoard/touch_hid.py index cb29a5877..4fb424459 100644 --- a/CPX_GBoard/touch_hid.py +++ b/CPX_GBoard/touch_hid.py @@ -12,6 +12,7 @@ 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 @@ -19,7 +20,7 @@ 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) diff --git a/CPX_GBoard/universal.py b/CPX_GBoard/universal.py index fb0e16a18..fa18c0a7c 100644 --- a/CPX_GBoard/universal.py +++ b/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) diff --git a/CircuitPython_Essentials/CircuitPython_HID_Keyboard.py b/CircuitPython_Essentials/CircuitPython_HID_Keyboard.py index 96a4537be..193be8c7a 100644 --- a/CircuitPython_Essentials/CircuitPython_HID_Keyboard.py +++ b/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 diff --git a/CircuitPython_Essentials/CircuitPython_HID_Mouse.py b/CircuitPython_Essentials/CircuitPython_HID_Mouse.py index 28e33a4c9..97476092d 100644 --- a/CircuitPython_Essentials/CircuitPython_HID_Mouse.py +++ b/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) diff --git a/Crank_USB_HID/code.py b/Crank_USB_HID/code.py index 068022642..fb990b477 100755 --- a/Crank_USB_HID/code.py +++ b/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' diff --git a/Foul_Fowl/main.py b/Foul_Fowl/main.py index 22e879a84..3d61d7bd8 100644 --- a/Foul_Fowl/main.py +++ b/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) diff --git a/GemmaM0_Password_Vault/main.py b/GemmaM0_Password_Vault/main.py index 5efb93512..5d9d0e4ac 100644 --- a/GemmaM0_Password_Vault/main.py +++ b/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: diff --git a/GemmaM0_Radio_Tuning_Knob/main.py b/GemmaM0_Radio_Tuning_Knob/main.py index 04ec636f8..38f124825 100644 --- a/GemmaM0_Radio_Tuning_Knob/main.py +++ b/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 diff --git a/Giant_Mechanical_Keyboard/code.py b/Giant_Mechanical_Keyboard/code.py index 407bcc088..990d98dde 100644 --- a/Giant_Mechanical_Keyboard/code.py +++ b/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) diff --git a/Introducing_CircuitPlaygroundExpress/CircuitPlaygroundExpress_HIDKeyboard.py b/Introducing_CircuitPlaygroundExpress/CircuitPlaygroundExpress_HIDKeyboard.py index 0b9985d58..bd9a26779 100644 --- a/Introducing_CircuitPlaygroundExpress/CircuitPlaygroundExpress_HIDKeyboard.py +++ b/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) diff --git a/Introducing_Gemma_M0/Gemma_HIDkeyboard.py b/Introducing_Gemma_M0/Gemma_HIDkeyboard.py index 52aa9cabc..f03064c25 100644 --- a/Introducing_Gemma_M0/Gemma_HIDkeyboard.py +++ b/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) diff --git a/Launch_Deck_Trellis_M4/launch_deck_trellis_m4.py b/Launch_Deck_Trellis_M4/launch_deck_trellis_m4.py index 8ecf2c7c8..10a2494ac 100644 --- a/Launch_Deck_Trellis_M4/launch_deck_trellis_m4.py +++ b/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: diff --git a/Make_It_A-Mouse/cpx-mouse-buttons.py b/Make_It_A-Mouse/cpx-mouse-buttons.py index e4b8426e3..a220c7c55 100644 --- a/Make_It_A-Mouse/cpx-mouse-buttons.py +++ b/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: diff --git a/Make_It_A-Mouse/mouse-cursor.py b/Make_It_A-Mouse/mouse-cursor.py index b36558404..973e89f41 100644 --- a/Make_It_A-Mouse/mouse-cursor.py +++ b/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: diff --git a/Make_It_A_Keyboard/keyboard-multimedia.py b/Make_It_A_Keyboard/keyboard-multimedia.py index 54ada73db..bcc48d4c1 100644 --- a/Make_It_A_Keyboard/keyboard-multimedia.py +++ b/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: diff --git a/Make_It_A_Keyboard/keycodes.py b/Make_It_A_Keyboard/keycodes.py index a93552f89..9791af61c 100644 --- a/Make_It_A_Keyboard/keycodes.py +++ b/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: diff --git a/Make_It_A_Keyboard/strings.py b/Make_It_A_Keyboard/strings.py index c95a8eb05..97b769b48 100644 --- a/Make_It_A_Keyboard/strings.py +++ b/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: diff --git a/Make_It_Log/time-light-temp.py b/Make_It_Log/time-light-temp.py index 26a1c00d7..e07ac5877 100644 --- a/Make_It_Log/time-light-temp.py +++ b/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" diff --git a/Minecraft_Gesture_Controller/main.py b/Minecraft_Gesture_Controller/main.py index 2882d0099..406deaab2 100644 --- a/Minecraft_Gesture_Controller/main.py +++ b/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 diff --git a/Rotary_Encoder/rotary_encoder_volume.py b/Rotary_Encoder/rotary_encoder_volume.py index 3aca397bb..52a8664fa 100755 --- a/Rotary_Encoder/rotary_encoder_volume.py +++ b/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