Skip to content

Temporary USB host fix #10220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
url = https://github.com/adafruit/nrfx.git
[submodule "lib/tinyusb"]
path = lib/tinyusb
url = https://github.com/hathach/tinyusb.git
branch = master
url = https://github.com/tannewt/tinyusb.git
branch = only_native_keyboard
fetchRecurseSubmodules = false
[submodule "tools/huffman"]
path = tools/huffman
Expand Down
2 changes: 1 addition & 1 deletion lib/tinyusb
3 changes: 0 additions & 3 deletions ports/raspberrypi/boards/adafruit_fruit_jam/mpconfigboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ CHIP_PACKAGE = B
CHIP_FAMILY = rp2

EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"

# CIRCUITPY_DISPLAY_FONT = $(TOP)/tools/fonts/unifont-16.0.02-all.bdf
# CIRCUITPY_FONT_EXTRA_CHARACTERS = "🖮🖱️"
2 changes: 1 addition & 1 deletion shared-bindings/usb/core/__init__.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static mp_obj_t _next_device(usb_core_devices_obj_t *iter) {

// We passed the filters. Now make a properly allocated object to
// return to the user.
usb_core_device_obj_t *self = mp_obj_malloc(usb_core_device_obj_t, &usb_core_device_type);
usb_core_device_obj_t *self = mp_obj_malloc_with_finaliser(usb_core_device_obj_t, &usb_core_device_type);

common_hal_usb_core_device_construct(self, i);
iter->next_index = i + 1;
Expand Down