From aae26fb1db7c0fab7f13be9b92399f950a710001 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 10 Mar 2025 20:13:06 -0500 Subject: [PATCH] add set_configuration() to fix existing basic_mouse demo, add new displayio_mouse demo. --- tests/circuitpython-manual/usb/basic_mouse.py | 2 + .../usb/displayio_mouse.py | 67 ++++++++++++++++++ .../circuitpython-manual/usb/mouse_cursor.bmp | Bin 0 -> 198 bytes 3 files changed, 69 insertions(+) create mode 100644 tests/circuitpython-manual/usb/displayio_mouse.py create mode 100644 tests/circuitpython-manual/usb/mouse_cursor.bmp diff --git a/tests/circuitpython-manual/usb/basic_mouse.py b/tests/circuitpython-manual/usb/basic_mouse.py index a3228610a43ea..156895fd25d76 100644 --- a/tests/circuitpython-manual/usb/basic_mouse.py +++ b/tests/circuitpython-manual/usb/basic_mouse.py @@ -17,6 +17,8 @@ if device.is_kernel_driver_active(0): device.detach_kernel_driver(0) +device.set_configuration() + # Boot mice have 4 byte reports buf = array.array("b", [0] * 4) report_count = 0 diff --git a/tests/circuitpython-manual/usb/displayio_mouse.py b/tests/circuitpython-manual/usb/displayio_mouse.py new file mode 100644 index 0000000000000..8dd2b1e482604 --- /dev/null +++ b/tests/circuitpython-manual/usb/displayio_mouse.py @@ -0,0 +1,67 @@ +# SPDX-FileCopyrightText: 2025 Tim Cocks for Adafruit Industries +# SPDX-License-Identifier: MIT +import terminalio +import array +import usb.core +import supervisor +from displayio import Group, OnDiskBitmap, TileGrid +from adafruit_display_text.bitmap_label import Label + +display = supervisor.runtime.display + +main_group = Group() +display.root_group = main_group + +mouse_bmp = OnDiskBitmap("mouse_cursor.bmp") +mouse_bmp.pixel_shader.make_transparent(0) +mouse_tg = TileGrid(mouse_bmp, pixel_shader=mouse_bmp.pixel_shader) +mouse_tg.x = display.width // 2 +mouse_tg.y = display.height // 2 + +output_lbl = Label(terminalio.FONT, text=f"{mouse_tg.x},{mouse_tg.y}", color=0xFFFFFF, scale=1) +output_lbl.anchor_point = (0, 0) +output_lbl.anchored_position = (1, 1) +main_group.append(output_lbl) + +main_group.append(mouse_tg) + +# This is a basic Microsoft optical mouse with two buttons and a wheel that can +# also be pressed. +USB_VID = 0x046D +USB_PID = 0xC52F +# This is ordered by bit position. +BUTTONS = ["left", "right", "middle"] + +for device in usb.core.find(find_all=True): + print(f"{device.idVendor:04x}:{device.idProduct:04x}") + print(device.manufacturer, device.product) + print(device.serial_number) + if device.idVendor == USB_VID and device.idProduct == USB_PID: + mouse = device +# +print(mouse.manufacturer, mouse.product) + +if mouse.is_kernel_driver_active(0): + mouse.detach_kernel_driver(0) + +mouse.set_configuration() + +# Boot mice have 4 byte reports +buf = array.array("b", [0] * 4) +report_count = 0 + +# try: +while True: + try: + count = mouse.read(0x81, buf, timeout=10) + except usb.core.USBTimeoutError: + continue + + mouse_tg.x = max(0, min(display.width - 1, mouse_tg.x + buf[1])) + mouse_tg.y = max(0, min(display.height - 1, mouse_tg.y + buf[2])) + out_str = f"{mouse_tg.x},{mouse_tg.y}" + for i, button in enumerate(BUTTONS): + if buf[0] & (1 << i) != 0: + out_str += f" {button}" + + output_lbl.text = out_str diff --git a/tests/circuitpython-manual/usb/mouse_cursor.bmp b/tests/circuitpython-manual/usb/mouse_cursor.bmp new file mode 100644 index 0000000000000000000000000000000000000000..94ec328896cfb7dc84ac82d6a5b8b58e8a8a5f12 GIT binary patch literal 198 zcmZ?rJ;ne5(|}YB5VHX>4-hjlumDL01_K~g)`MVXARB}k82-Z$nCIjkR19X2Kro@H r{SPt|2>$;E(h3X=OhOQ>q@=*0C@2KPKpH3p#z1*RAXZ`kD`fxx@`?`& literal 0 HcmV?d00001