From 5501df8e55591bc85ff46291e68db0e791138041 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 7 Oct 2024 09:24:05 -0500 Subject: [PATCH 01/11] remove deprecated get_html_theme_path() call Signed-off-by: foamyguy --- docs/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index cb76c06..2c03f0b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -115,7 +115,6 @@ import sphinx_rtd_theme html_theme = "sphinx_rtd_theme" -html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."] # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, From 4fa9b9908fcfed32de43160934213cd4ff9381c3 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 14 Jan 2025 11:32:34 -0600 Subject: [PATCH 02/11] add sphinx configuration to rtd.yaml Signed-off-by: foamyguy --- .readthedocs.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index b79ec5b..fe4faae 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -8,6 +8,9 @@ # Required version: 2 +sphinx: + configuration: docs/conf.py + build: os: ubuntu-20.04 tools: From 3f14ad3d2ec5211c303c50a4d5f3f4ebeef5c294 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sun, 23 Mar 2025 14:34:48 -0500 Subject: [PATCH 03/11] find_mouse_endpoint() function and convert to ruff. --- .gitattributes | 11 + .pre-commit-config.yaml | 43 +-- .pylintrc | 399 -------------------- README.rst | 6 +- adafruit_usb_host_descriptors.py | 41 ++ docs/api.rst | 3 + docs/conf.py | 8 +- examples/usb_host_descriptors_simpletest.py | 9 +- ruff.toml | 100 +++++ 9 files changed, 174 insertions(+), 446 deletions(-) create mode 100644 .gitattributes delete mode 100644 .pylintrc create mode 100644 ruff.toml diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..21c125c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,11 @@ +# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries +# +# SPDX-License-Identifier: Unlicense + +.py text eol=lf +.rst text eol=lf +.txt text eol=lf +.yaml text eol=lf +.toml text eol=lf +.license text eol=lf +.md text eol=lf diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 70ade69..ff19dde 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,42 +1,21 @@ -# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò +# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries # # SPDX-License-Identifier: Unlicense repos: - - repo: https://github.com/python/black - rev: 23.3.0 - hooks: - - id: black - - repo: https://github.com/fsfe/reuse-tool - rev: v1.1.2 - hooks: - - id: reuse - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - - repo: https://github.com/pycqa/pylint - rev: v2.17.4 + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.3.4 hooks: - - id: pylint - name: pylint (library code) - types: [python] - args: - - --disable=consider-using-f-string - exclude: "^(docs/|examples/|tests/|setup.py$)" - - id: pylint - name: pylint (example code) - description: Run pylint rules on "examples/*.py" files - types: [python] - files: "^examples/" - args: - - --disable=missing-docstring,invalid-name,consider-using-f-string,duplicate-code - - id: pylint - name: pylint (test code) - description: Run pylint rules on "tests/*.py" files - types: [python] - files: "^tests/" - args: - - --disable=missing-docstring,consider-using-f-string,duplicate-code + - id: ruff-format + - id: ruff + args: ["--fix"] + - repo: https://github.com/fsfe/reuse-tool + rev: v3.0.1 + hooks: + - id: reuse diff --git a/.pylintrc b/.pylintrc deleted file mode 100644 index f945e92..0000000 --- a/.pylintrc +++ /dev/null @@ -1,399 +0,0 @@ -# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries -# -# SPDX-License-Identifier: Unlicense - -[MASTER] - -# A comma-separated list of package or module names from where C extensions may -# be loaded. Extensions are loading into the active Python interpreter and may -# run arbitrary code -extension-pkg-whitelist= - -# Add files or directories to the ignore-list. They should be base names, not -# paths. -ignore=CVS - -# Add files or directories matching the regex patterns to the ignore-list. The -# regex matches against base names, not paths. -ignore-patterns= - -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= - -# Use multiple processes to speed up Pylint. -jobs=1 - -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -load-plugins=pylint.extensions.no_self_use - -# Pickle collected data for later comparisons. -persistent=yes - -# Specify a configuration file. -#rcfile= - -# Allow loading of arbitrary C extensions. Extensions are imported into the -# active Python interpreter and may run arbitrary code. -unsafe-load-any-extension=no - - -[MESSAGES CONTROL] - -# Only show warnings with the listed confidence levels. Leave empty to show -# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED -confidence= - -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifiers separated by comma (,) or put this -# option multiple times (only on the command line, not in the configuration -# file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if -# you want to run only the similarities checker, you can use "--disable=all -# --enable=similarities". If you want to run only the classes checker, but have -# no Warning level messages displayed, use"--disable=all --enable=classes -# --disable=W" -# disable=import-error,raw-checker-failed,bad-inline-option,locally-disabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,deprecated-str-translate-call -disable=raw-checker-failed,bad-inline-option,locally-disabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,import-error,pointless-string-statement,unspecified-encoding - -# Enable the message, report, category or checker with the given id(s). You can -# either give multiple identifier separated by comma (,) or put this option -# multiple time (only on the command line, not in the configuration file where -# it should appear only once). See also the "--disable" option for examples. -enable= - - -[REPORTS] - -# Python expression which should return a note less than 10 (10 is the highest -# note). You have access to the variables errors warning, statement which -# respectively contain the number of errors / warnings messages and the total -# number of statements analyzed. This is used by the global evaluation report -# (RP0004). -evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -# Template used to display messages. This is a python new-style format string -# used to format the message information. See doc for all details -#msg-template= - -# Set the output format. Available formats are text, parseable, colorized, json -# and msvs (visual studio).You can also give a reporter class, eg -# mypackage.mymodule.MyReporterClass. -output-format=text - -# Tells whether to display a full report or only the messages -reports=no - -# Activate the evaluation score. -score=yes - - -[REFACTORING] - -# Maximum number of nested blocks for function / method body -max-nested-blocks=5 - - -[LOGGING] - -# Logging modules to check that the string format arguments are in logging -# function parameter format -logging-modules=logging - - -[SPELLING] - -# Spelling dictionary name. Available dictionaries: none. To make it working -# install python-enchant package. -spelling-dict= - -# List of comma separated words that should not be checked. -spelling-ignore-words= - -# A path to a file that contains private dictionary; one word per line. -spelling-private-dict-file= - -# Tells whether to store unknown words to indicated private dictionary in -# --spelling-private-dict-file option instead of raising a message. -spelling-store-unknown-words=no - - -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -# notes=FIXME,XXX,TODO -notes=FIXME,XXX - - -[TYPECHECK] - -# List of decorators that produce context managers, such as -# contextlib.contextmanager. Add to this list to register other decorators that -# produce valid context managers. -contextmanager-decorators=contextlib.contextmanager - -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E1101 when accessed. Python regular -# expressions are accepted. -generated-members= - -# Tells whether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). -ignore-mixin-members=yes - -# This flag controls whether pylint should warn about no-member and similar -# checks whenever an opaque object is returned when inferring. The inference -# can return multiple potential results while evaluating a Python object, but -# some branches might not be evaluated, which results in partial inference. In -# that case, it might be useful to still emit no-member and other checks for -# the rest of the inferred objects. -ignore-on-opaque-inference=yes - -# List of class names for which member attributes should not be checked (useful -# for classes with dynamically set attributes). This supports the use of -# qualified names. -ignored-classes=optparse.Values,thread._local,_thread._local - -# List of module names for which member attributes should not be checked -# (useful for modules/projects where namespaces are manipulated during runtime -# and thus existing member attributes cannot be deduced by static analysis. It -# supports qualified module names, as well as Unix pattern matching. -ignored-modules=board - -# Show a hint with possible names when a member name was not found. The aspect -# of finding the hint is based on edit distance. -missing-member-hint=yes - -# The minimum edit distance a name should have in order to be considered a -# similar match for a missing member name. -missing-member-hint-distance=1 - -# The total number of similar names that should be taken in consideration when -# showing a hint for a missing member. -missing-member-max-choices=1 - - -[VARIABLES] - -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -additional-builtins= - -# Tells whether unused global variables should be treated as a violation. -allow-global-unused-variables=yes - -# List of strings which can identify a callback function by name. A callback -# name must start or end with one of those strings. -callbacks=cb_,_cb - -# A regular expression matching the name of dummy variables (i.e. expectedly -# not used). -dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ - -# Argument names that match this expression will be ignored. Default to name -# with leading underscore -ignored-argument-names=_.*|^ignored_|^unused_ - -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# List of qualified module names which can have objects that can redefine -# builtins. -redefining-builtins-modules=six.moves,future.builtins - - -[FORMAT] - -# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. -# expected-line-ending-format= -expected-line-ending-format=LF - -# Regexp for a line that is allowed to be longer than the limit. -ignore-long-lines=^\s*(# )??$ - -# Number of spaces of indent required inside a hanging or continued line. -indent-after-paren=4 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - -# Maximum number of characters on a single line. -max-line-length=100 - -# Maximum number of lines in a module -max-module-lines=1000 - -# Allow the body of a class to be on the same line as the declaration if body -# contains single statement. -single-line-class-stmt=no - -# Allow the body of an if to be on the same line as the test if there is no -# else. -single-line-if-stmt=no - - -[SIMILARITIES] - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - -# Ignore imports when computing similarities. -ignore-imports=yes - -# Minimum lines number of a similarity. -min-similarity-lines=12 - - -[BASIC] - -# Regular expression matching correct argument names -argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Regular expression matching correct attribute names -attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,baz,toto,tutu,tata - -# Regular expression matching correct class attribute names -class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - -# Regular expression matching correct class names -# class-rgx=[A-Z_][a-zA-Z0-9]+$ -class-rgx=[A-Z_][a-zA-Z0-9_]+$ - -# Regular expression matching correct constant names -const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ - -# Minimum line length for functions/classes that require docstrings, shorter -# ones are exempt. -docstring-min-length=-1 - -# Regular expression matching correct function names -function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Good variable names which should always be accepted, separated by a comma -# good-names=i,j,k,ex,Run,_ -good-names=r,g,b,w,i,j,k,n,x,y,z,ex,ok,Run,_ - -# Include a hint for the correct naming format with invalid-name -include-naming-hint=no - -# Regular expression matching correct inline iteration names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ - -# Regular expression matching correct method names -method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Regular expression matching correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Colon-delimited sets of names that determine each other's naming style when -# the name regexes allow several styles. -name-group= - -# Regular expression which should only match function or class names that do -# not require a docstring. -no-docstring-rgx=^_ - -# List of decorators that produce properties, such as abc.abstractproperty. Add -# to this list to register other decorators that produce valid properties. -property-classes=abc.abstractproperty - -# Regular expression matching correct variable names -variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - - -[IMPORTS] - -# Allow wildcard imports from modules that define __all__. -allow-wildcard-with-all=no - -# Analyse import fallback blocks. This can be used to support both Python 2 and -# 3 compatible code, which means that the block might have code that exists -# only in one or another interpreter, leading to false positives when analysed. -analyse-fallback-blocks=no - -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=optparse,tkinter.tix - -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled) -ext-import-graph= - -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled) -import-graph= - -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled) -int-import-graph= - -# Force import order to recognize a module as part of the standard -# compatibility libraries. -known-standard-library= - -# Force import order to recognize a module as part of a third party library. -known-third-party=enchant - - -[CLASSES] - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp - -# List of member names, which should be excluded from the protected access -# warning. -exclude-protected=_asdict,_fields,_replace,_source,_make - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - -# List of valid names for the first argument in a metaclass class method. -valid-metaclass-classmethod-first-arg=mcs - - -[DESIGN] - -# Maximum number of arguments for function / method -max-args=5 - -# Maximum number of attributes for a class (see R0902). -# max-attributes=7 -max-attributes=11 - -# Maximum number of boolean expressions in a if statement -max-bool-expr=5 - -# Maximum number of branch for function / method body -max-branches=12 - -# Maximum number of locals for function / method body -max-locals=15 - -# Maximum number of parents for a class (see R0901). -max-parents=7 - -# Maximum number of public methods for a class (see R0904). -max-public-methods=20 - -# Maximum number of return / yield for function / method body -max-returns=6 - -# Maximum number of statements in function / method body -max-statements=50 - -# Minimum number of public methods for a class (see R0903). -min-public-methods=1 - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "Exception" -overgeneral-exceptions=builtins.Exception diff --git a/README.rst b/README.rst index 10bf37c..bcbae1e 100644 --- a/README.rst +++ b/README.rst @@ -17,9 +17,9 @@ Introduction :alt: Build Status -.. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code Style: Black +.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json + :target: https://github.com/astral-sh/ruff + :alt: Code Style: Ruff Helpers for getting USB descriptors diff --git a/adafruit_usb_host_descriptors.py b/adafruit_usb_host_descriptors.py index bcf2845..c580be0 100644 --- a/adafruit_usb_host_descriptors.py +++ b/adafruit_usb_host_descriptors.py @@ -11,6 +11,7 @@ """ import struct + from micropython import const __version__ = "0.0.0+auto.0" @@ -35,6 +36,10 @@ DESC_INTERFACE = 0x04 DESC_ENDPOINT = 0x05 +INTERFACE_HID = 0x03 +SUBCLASS_BOOT = 0x01 +PROTOCOL_MOUSE = 0x02 + def get_descriptor(device, desc_type, index, buf, language_id=0): """Fetch the descriptor from the device into buf.""" @@ -70,3 +75,39 @@ def get_configuration_descriptor(device, index): full_buf = bytearray(wTotalLength) get_descriptor(device, DESC_CONFIGURATION, index, full_buf) return full_buf + + +def find_mouse_endpoint(device): + """ + Try to find a boot mouse endpoint in the device and return its + interface index, and endpoint address. + :param device: The device to search within + :return: mouse_interface_index, mouse_endpoint_address if found, or None, None otherwise + """ + config_descriptor = get_configuration_descriptor(device, 0) + i = 0 + mouse_interface_index = None + found_mouse = False + while i < len(config_descriptor): + descriptor_len = config_descriptor[i] + descriptor_type = config_descriptor[i + 1] + if descriptor_type == DESC_INTERFACE: + interface_number = config_descriptor[i + 2] + interface_class = config_descriptor[i + 5] + interface_subclass = config_descriptor[i + 6] + interface_protocol = config_descriptor[i + 7] + if ( + interface_class == INTERFACE_HID + and interface_subclass == SUBCLASS_BOOT + and interface_protocol == PROTOCOL_MOUSE + ): + found_mouse = True + mouse_interface_index = interface_number + + elif descriptor_type == DESC_ENDPOINT: + endpoint_address = config_descriptor[i + 2] + if endpoint_address & _DIR_IN: + if found_mouse: + return mouse_interface_index, endpoint_address + i += descriptor_len + return None, None diff --git a/docs/api.rst b/docs/api.rst index 52a6845..9bc0a9e 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -4,5 +4,8 @@ .. If your library file(s) are nested in a directory (e.g. /adafruit_foo/foo.py) .. use this format as the module name: "adafruit_foo.foo" +API Reference +############# + .. automodule:: adafruit_usb_host_descriptors :members: diff --git a/docs/conf.py b/docs/conf.py index 2c03f0b..10b349b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,12 +1,10 @@ -# -*- coding: utf-8 -*- - # SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries # # SPDX-License-Identifier: MIT +import datetime import os import sys -import datetime sys.path.insert(0, os.path.abspath("..")) @@ -53,9 +51,7 @@ creation_year = "2023" current_year = str(datetime.datetime.now().year) year_duration = ( - current_year - if current_year == creation_year - else creation_year + " - " + current_year + current_year if current_year == creation_year else creation_year + " - " + current_year ) copyright = year_duration + " Scott Shawcroft" author = "Scott Shawcroft" diff --git a/examples/usb_host_descriptors_simpletest.py b/examples/usb_host_descriptors_simpletest.py index 9d3765f..2e260bc 100644 --- a/examples/usb_host_descriptors_simpletest.py +++ b/examples/usb_host_descriptors_simpletest.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: Unlicense import time + import usb.core import adafruit_usb_host_descriptors @@ -19,9 +20,7 @@ print("product", device.product) print("serial", device.serial_number) print("config[0]:") - config_descriptor = adafruit_usb_host_descriptors.get_configuration_descriptor( - device, 0 - ) + config_descriptor = adafruit_usb_host_descriptors.get_configuration_descriptor(device, 0) i = 0 while i < len(config_descriptor): @@ -35,9 +34,7 @@ interface_class = config_descriptor[i + 5] interface_subclass = config_descriptor[i + 6] print(f" interface[{interface_number:d}]") - print( - f" class {interface_class:02x} subclass {interface_subclass:02x}" - ) + print(f" class {interface_class:02x} subclass {interface_subclass:02x}") elif descriptor_type == adafruit_usb_host_descriptors.DESC_ENDPOINT: endpoint_address = config_descriptor[i + 2] if endpoint_address & DIR_IN: diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..970c292 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,100 @@ +# SPDX-FileCopyrightText: 2024 Tim Cocks for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +target-version = "py38" +line-length = 100 + +[lint] +preview = true +select = ["I", "PL", "UP"] + +extend-select = [ + "D419", # empty-docstring + "E501", # line-too-long + "W291", # trailing-whitespace + "PLC0414", # useless-import-alias + "PLC2401", # non-ascii-name + "PLC2801", # unnecessary-dunder-call + "PLC3002", # unnecessary-direct-lambda-call + "E999", # syntax-error + "PLE0101", # return-in-init + "F706", # return-outside-function + "F704", # yield-outside-function + "PLE0116", # continue-in-finally + "PLE0117", # nonlocal-without-binding + "PLE0241", # duplicate-bases + "PLE0302", # unexpected-special-method-signature + "PLE0604", # invalid-all-object + "PLE0605", # invalid-all-format + "PLE0643", # potential-index-error + "PLE0704", # misplaced-bare-raise + "PLE1141", # dict-iter-missing-items + "PLE1142", # await-outside-async + "PLE1205", # logging-too-many-args + "PLE1206", # logging-too-few-args + "PLE1307", # bad-string-format-type + "PLE1310", # bad-str-strip-call + "PLE1507", # invalid-envvar-value + "PLE2502", # bidirectional-unicode + "PLE2510", # invalid-character-backspace + "PLE2512", # invalid-character-sub + "PLE2513", # invalid-character-esc + "PLE2514", # invalid-character-nul + "PLE2515", # invalid-character-zero-width-space + "PLR0124", # comparison-with-itself + "PLR0202", # no-classmethod-decorator + "PLR0203", # no-staticmethod-decorator + "UP004", # useless-object-inheritance + "PLR0206", # property-with-parameters + "PLR0904", # too-many-public-methods + "PLR0911", # too-many-return-statements + "PLR0912", # too-many-branches + "PLR0913", # too-many-arguments + "PLR0914", # too-many-locals + "PLR0915", # too-many-statements + "PLR0916", # too-many-boolean-expressions + "PLR1702", # too-many-nested-blocks + "PLR1704", # redefined-argument-from-local + "PLR1711", # useless-return + "C416", # unnecessary-comprehension + "PLR1733", # unnecessary-dict-index-lookup + "PLR1736", # unnecessary-list-index-lookup + + # ruff reports this rule is unstable + #"PLR6301", # no-self-use + + "PLW0108", # unnecessary-lambda + "PLW0120", # useless-else-on-loop + "PLW0127", # self-assigning-variable + "PLW0129", # assert-on-string-literal + "B033", # duplicate-value + "PLW0131", # named-expr-without-context + "PLW0245", # super-without-brackets + "PLW0406", # import-self + "PLW0602", # global-variable-not-assigned + "PLW0603", # global-statement + "PLW0604", # global-at-module-level + + # fails on the try: import typing used by libraries + #"F401", # unused-import + + "F841", # unused-variable + "E722", # bare-except + "PLW0711", # binary-op-exception + "PLW1501", # bad-open-mode + "PLW1508", # invalid-envvar-default + "PLW1509", # subprocess-popen-preexec-fn + "PLW2101", # useless-with-lock + "PLW3301", # nested-min-max +] + +ignore = [ + "PLR2004", # magic-value-comparison + "UP030", # format literals + "PLW1514", # unspecified-encoding + +] + +[format] +line-ending = "lf" From 10f584727b3be7fee9782a2112e82f70c870738d Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 27 Mar 2025 14:20:05 -0500 Subject: [PATCH 04/11] include boot in function name Co-authored-by: Scott Shawcroft --- adafruit_usb_host_descriptors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_usb_host_descriptors.py b/adafruit_usb_host_descriptors.py index c580be0..c4a6f00 100644 --- a/adafruit_usb_host_descriptors.py +++ b/adafruit_usb_host_descriptors.py @@ -77,7 +77,7 @@ def get_configuration_descriptor(device, index): return full_buf -def find_mouse_endpoint(device): +def find_boot_mouse_endpoint(device): """ Try to find a boot mouse endpoint in the device and return its interface index, and endpoint address. From 3b72cd062241f5c2744b1a1b8980c0a16ec26ec0 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Wed, 2 Apr 2025 09:33:17 -0500 Subject: [PATCH 05/11] add two mouse example --- examples/mouse_cursor.bmp | Bin 0 -> 198 bytes examples/mouse_cursor.bmp.license | 3 + .../usb_host_descriptors_two_boot_mice.py | 108 ++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 examples/mouse_cursor.bmp create mode 100644 examples/mouse_cursor.bmp.license create mode 100644 examples/usb_host_descriptors_two_boot_mice.py diff --git a/examples/mouse_cursor.bmp b/examples/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 diff --git a/examples/mouse_cursor.bmp.license b/examples/mouse_cursor.bmp.license new file mode 100644 index 0000000..99fbe5f --- /dev/null +++ b/examples/mouse_cursor.bmp.license @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: Copyright (c) 2025 Tim Cocks for Adafruit Industries +# +# SPDX-License-Identifier: Unlicense diff --git a/examples/usb_host_descriptors_two_boot_mice.py b/examples/usb_host_descriptors_two_boot_mice.py new file mode 100644 index 0000000..14c9a59 --- /dev/null +++ b/examples/usb_host_descriptors_two_boot_mice.py @@ -0,0 +1,108 @@ +# SPDX-FileCopyrightText: Copyright (c) 2025 Tim Cocks for Adafruit Industries +# +# SPDX-License-Identifier: MIT +import array + +import displayio +import supervisor +import terminalio +import usb.core +from adafruit_display_text.bitmap_label import Label +from displayio import Group, OnDiskBitmap, TileGrid +from tilepalettemapper import TilePaletteMapper + +import adafruit_usb_host_descriptors + +display = supervisor.runtime.display + +main_group = Group() +display.root_group = main_group + +mouse_bmp = OnDiskBitmap("mouse_cursor.bmp") + +output_lbls = [] +mouse_tgs = [] +palette_mappers = [] +color_converter = displayio.ColorConverter() +colors = [0xFF00FF, 0x00FF00] +remap_palette = displayio.Palette(3 + len(colors)) +remap_palette.make_transparent(0) + +# copy the 3 colors from mouse palette +for i in range(3): + remap_palette[i] = mouse_bmp.pixel_shader[i] + +# add the two extra colors to the palette +for i in range(2): + remap_palette[i + 3] = colors[i] + +for i in range(2): + palette_mapper = TilePaletteMapper(remap_palette, 3, 1, 1) + palette_mapper[0] = [0, 1, i + 3] + palette_mappers.append(palette_mapper) + mouse_tg = TileGrid(mouse_bmp, pixel_shader=palette_mapper) + mouse_tg.x = display.width // 2 - (i * 12) + mouse_tg.y = display.height // 2 + mouse_tgs.append(mouse_tg) + main_group.append(mouse_tg) + + output_lbl = Label(terminalio.FONT, text=f"{mouse_tg.x},{mouse_tg.y}", color=colors[i], scale=1) + output_lbl.anchor_point = (0, 0) + output_lbl.anchored_position = (1, 1 + i * 13) + output_lbls.append(output_lbl) + main_group.append(output_lbl) + +mouse_interface_indexes = [] +mouse_endpoint_addresses = [] +mice = [] + +# scan for connected USB devices +for device in usb.core.find(find_all=True): + mouse_interface_index, mouse_endpoint_address = ( + adafruit_usb_host_descriptors.find_boot_mouse_endpoint(device) + ) + if mouse_interface_index is not None and mouse_endpoint_address is not None: + mouse_interface_indexes.append(mouse_interface_index) + mouse_endpoint_addresses.append(mouse_endpoint_address) + + mice.append(device) + print(f"mouse interface: {mouse_interface_index} ", end="") + print(f"endpoint_address: {hex(mouse_endpoint_address)}") + if device.is_kernel_driver_active(0): + device.detach_kernel_driver(0) + + # set the mouse configuration so it can be used + device.set_configuration() + +# This is ordered by bit position. +BUTTONS = ["left", "right", "middle"] + +mouse_bufs = [] +for mouse_tg in mouse_tgs: + # Buffer to hold data read from the mouse + # Boot mice have 4 byte reports + mouse_bufs.append(array.array("b", [0] * 4)) + + +while True: + for mouse_index, mouse in enumerate(mice): + try: + count = mouse.read( + mouse_endpoint_addresses[mouse_index], mouse_bufs[mouse_index], timeout=10 + ) + except usb.core.USBTimeoutError: + continue + + mouse_tgs[mouse_index].x = max( + 0, min(display.width - 1, mouse_tgs[mouse_index].x + mouse_bufs[mouse_index][1]) + ) + mouse_tgs[mouse_index].y = max( + 0, min(display.height - 1, mouse_tgs[mouse_index].y + mouse_bufs[mouse_index][2]) + ) + + out_str = f"{mouse_tgs[mouse_index].x},{mouse_tgs[mouse_index].y}" + for i, button in enumerate(BUTTONS): + if mouse_bufs[mouse_index][0] & (1 << i) != 0: + out_str += f" {button}" + + output_lbls[mouse_index].text = out_str From b18147f894bb7f0d367c7ff360bd7b5eda5510d6 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 3 Apr 2025 15:37:59 -0500 Subject: [PATCH 06/11] update dual mouse example to support 8 byte data packets --- .../usb_host_descriptors_two_boot_mice.py | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/examples/usb_host_descriptors_two_boot_mice.py b/examples/usb_host_descriptors_two_boot_mice.py index 14c9a59..3827a40 100644 --- a/examples/usb_host_descriptors_two_boot_mice.py +++ b/examples/usb_host_descriptors_two_boot_mice.py @@ -78,26 +78,42 @@ BUTTONS = ["left", "right", "middle"] mouse_bufs = [] +mouse_read_counts = [0, 0] for mouse_tg in mouse_tgs: # Buffer to hold data read from the mouse # Boot mice have 4 byte reports mouse_bufs.append(array.array("b", [0] * 4)) +def get_mouse_deltas(mouse_index): + if mouse_read_counts[mouse_index] == 4: + delta_x = mouse_bufs[mouse_index][1] + delta_y = mouse_bufs[mouse_index][2] + elif mouse_read_counts[mouse_index] == 8: + delta_x = mouse_bufs[mouse_index][2] + delta_y = mouse_bufs[mouse_index][4] + else: + raise ValueError( + f"Unsupported mouse packet size: {mouse_packet_sizes[mouse_index]}, must be 4 or 8" + ) + return delta_x, delta_y + + while True: for mouse_index, mouse in enumerate(mice): try: count = mouse.read( mouse_endpoint_addresses[mouse_index], mouse_bufs[mouse_index], timeout=10 ) + mouse_read_counts[mouse_index] = count except usb.core.USBTimeoutError: continue - + mouse_deltas = get_mouse_deltas(mouse_index) mouse_tgs[mouse_index].x = max( - 0, min(display.width - 1, mouse_tgs[mouse_index].x + mouse_bufs[mouse_index][1]) + 0, min(display.width - 1, mouse_tgs[mouse_index].x + mouse_deltas[0]) ) mouse_tgs[mouse_index].y = max( - 0, min(display.height - 1, mouse_tgs[mouse_index].y + mouse_bufs[mouse_index][2]) + 0, min(display.height - 1, mouse_tgs[mouse_index].y + mouse_deltas[1]) ) out_str = f"{mouse_tgs[mouse_index].x},{mouse_tgs[mouse_index].y}" From fea74c64afb56a615133d32527a2d368ea9f65d7 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 3 Apr 2025 15:49:50 -0500 Subject: [PATCH 07/11] refactor get_mouse_deltas() to accept buffer and read_count instead of index --- .../usb_host_descriptors_two_boot_mice.py | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/examples/usb_host_descriptors_two_boot_mice.py b/examples/usb_host_descriptors_two_boot_mice.py index 3827a40..2cc9369 100644 --- a/examples/usb_host_descriptors_two_boot_mice.py +++ b/examples/usb_host_descriptors_two_boot_mice.py @@ -78,24 +78,22 @@ BUTTONS = ["left", "right", "middle"] mouse_bufs = [] -mouse_read_counts = [0, 0] + for mouse_tg in mouse_tgs: # Buffer to hold data read from the mouse # Boot mice have 4 byte reports - mouse_bufs.append(array.array("b", [0] * 4)) + mouse_bufs.append(array.array("b", [0] * 8)) -def get_mouse_deltas(mouse_index): - if mouse_read_counts[mouse_index] == 4: - delta_x = mouse_bufs[mouse_index][1] - delta_y = mouse_bufs[mouse_index][2] - elif mouse_read_counts[mouse_index] == 8: - delta_x = mouse_bufs[mouse_index][2] - delta_y = mouse_bufs[mouse_index][4] +def get_mouse_deltas(buffer, read_count): + if read_count == 4: + delta_x = buffer[1] + delta_y = buffer[2] + elif read_count == 8: + delta_x = buffer[2] + delta_y = buffer[4] else: - raise ValueError( - f"Unsupported mouse packet size: {mouse_packet_sizes[mouse_index]}, must be 4 or 8" - ) + raise ValueError(f"Unsupported mouse packet size: {read_count}, must be 4 or 8") return delta_x, delta_y @@ -105,10 +103,9 @@ def get_mouse_deltas(mouse_index): count = mouse.read( mouse_endpoint_addresses[mouse_index], mouse_bufs[mouse_index], timeout=10 ) - mouse_read_counts[mouse_index] = count except usb.core.USBTimeoutError: continue - mouse_deltas = get_mouse_deltas(mouse_index) + mouse_deltas = get_mouse_deltas(mouse_bufs[mouse_index], count) mouse_tgs[mouse_index].x = max( 0, min(display.width - 1, mouse_tgs[mouse_index].x + mouse_deltas[0]) ) From c97682fa6998076adcc5e9be1cc85c893d2dfc3d Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 8 Apr 2025 15:15:36 -0500 Subject: [PATCH 08/11] use different palettes instead of tilepalettemapper, add more comments --- .../usb_host_descriptors_two_boot_mice.py | 108 ++++++++++++++---- 1 file changed, 86 insertions(+), 22 deletions(-) diff --git a/examples/usb_host_descriptors_two_boot_mice.py b/examples/usb_host_descriptors_two_boot_mice.py index 2cc9369..f189fc3 100644 --- a/examples/usb_host_descriptors_two_boot_mice.py +++ b/examples/usb_host_descriptors_two_boot_mice.py @@ -3,71 +3,110 @@ # SPDX-License-Identifier: MIT import array -import displayio import supervisor import terminalio import usb.core from adafruit_display_text.bitmap_label import Label -from displayio import Group, OnDiskBitmap, TileGrid -from tilepalettemapper import TilePaletteMapper +from displayio import ColorConverter, Group, OnDiskBitmap, Palette, TileGrid import adafruit_usb_host_descriptors +# use the default built-in display, display = supervisor.runtime.display +# a group to hold all other visual elements main_group = Group() + +# set the main group to show on the display display.root_group = main_group +# load the cursor bitmap file mouse_bmp = OnDiskBitmap("mouse_cursor.bmp") +# lists for labels, mouse tilegrids, and palettes. +# each mouse will get 1 of each item. All lists +# will end up with length 2. output_lbls = [] mouse_tgs = [] -palette_mappers = [] -color_converter = displayio.ColorConverter() -colors = [0xFF00FF, 0x00FF00] -remap_palette = displayio.Palette(3 + len(colors)) -remap_palette.make_transparent(0) +palettes = [] -# copy the 3 colors from mouse palette -for i in range(3): - remap_palette[i] = mouse_bmp.pixel_shader[i] +# the different colors to use for each mouse cursor +# and labels +colors = [0xFF00FF, 0x00FF00] -# add the two extra colors to the palette for i in range(2): - remap_palette[i + 3] = colors[i] + # create a palette for this mouse + mouse_palette = Palette(3) + # index zero is used for transparency + mouse_palette.make_transparent(0) + # add the palette to the list of palettes + palettes.append(mouse_palette) -for i in range(2): - palette_mapper = TilePaletteMapper(remap_palette, 3, 1, 1) - palette_mapper[0] = [0, 1, i + 3] - palette_mappers.append(palette_mapper) - mouse_tg = TileGrid(mouse_bmp, pixel_shader=palette_mapper) + # copy the first two colors from mouse palette + for palette_color_index in range(2): + mouse_palette[palette_color_index] = mouse_bmp.pixel_shader[palette_color_index] + + # replace the last color with different color for each mouse + mouse_palette[2] = colors[i] + + # create a TileGrid for this mouse cursor. + # use the palette created above + mouse_tg = TileGrid(mouse_bmp, pixel_shader=mouse_palette) + + # move the mouse tilegrid to near the center of the display mouse_tg.x = display.width // 2 - (i * 12) mouse_tg.y = display.height // 2 + + # add this mouse tilegrid to the list of mouse tilegrids mouse_tgs.append(mouse_tg) + + # add this mouse tilegrid to the main group so it will show + # on the display main_group.append(mouse_tg) + # create a label for this mouse output_lbl = Label(terminalio.FONT, text=f"{mouse_tg.x},{mouse_tg.y}", color=colors[i], scale=1) + # anchored to the top left corner of the label output_lbl.anchor_point = (0, 0) + + # move to op left corner of the display, moving + # down by a static amount to static the two labels + # one below the other output_lbl.anchored_position = (1, 1 + i * 13) + + # add the label to the list of labels output_lbls.append(output_lbl) + + # add the label to the main group so it will show + # on the display main_group.append(output_lbl) +# lists for mouse interface indexes, endpoint addresses, and USB Device instances +# each of these will end up with length 2 once we find both mice mouse_interface_indexes = [] mouse_endpoint_addresses = [] mice = [] # scan for connected USB devices for device in usb.core.find(find_all=True): + # check for boot mouse endpoints on this device mouse_interface_index, mouse_endpoint_address = ( adafruit_usb_host_descriptors.find_boot_mouse_endpoint(device) ) + # if a boot mouse interface index and endpoint address were found if mouse_interface_index is not None and mouse_endpoint_address is not None: + # add the interface index to the list of indexes mouse_interface_indexes.append(mouse_interface_index) + # add the endpoint address to the list of addresses mouse_endpoint_addresses.append(mouse_endpoint_address) - + # add the device instance to the list of mice mice.append(device) + + # print details to the console print(f"mouse interface: {mouse_interface_index} ", end="") print(f"endpoint_address: {hex(mouse_endpoint_address)}") + + # detach device from kernel if needed if device.is_kernel_driver_active(0): device.detach_kernel_driver(0) @@ -77,15 +116,20 @@ # This is ordered by bit position. BUTTONS = ["left", "right", "middle"] +# list of buffers, will hold one buffer for each mouse mouse_bufs = [] - -for mouse_tg in mouse_tgs: +for i in range(2): # Buffer to hold data read from the mouse - # Boot mice have 4 byte reports mouse_bufs.append(array.array("b", [0] * 8)) def get_mouse_deltas(buffer, read_count): + """ + Given a buffer and read_count return the x and y delta values + :param buffer: A buffer containing data read from the mouse + :param read_count: How many bytes of data were read from the mouse + :return: tuple x,y delta values + """ if read_count == 4: delta_x = buffer[1] delta_y = buffer[2] @@ -97,25 +141,45 @@ def get_mouse_deltas(buffer, read_count): return delta_x, delta_y +# main loop while True: + # for each mouse instance for mouse_index, mouse in enumerate(mice): + # try to read data from the mouse try: count = mouse.read( mouse_endpoint_addresses[mouse_index], mouse_bufs[mouse_index], timeout=10 ) + + # if there is no data it will raise USBTimeoutError except usb.core.USBTimeoutError: + # Nothing to do if there is no data for this mouse continue + + # there was mouse data, so get the delta x and y values from it mouse_deltas = get_mouse_deltas(mouse_bufs[mouse_index], count) + + # update the x position of this mouse cursor using the delta value + # clamped to the display size mouse_tgs[mouse_index].x = max( 0, min(display.width - 1, mouse_tgs[mouse_index].x + mouse_deltas[0]) ) + # update the y position of this mouse cursor using the delta value + # clamped to the display size mouse_tgs[mouse_index].y = max( 0, min(display.height - 1, mouse_tgs[mouse_index].y + mouse_deltas[1]) ) + # output string with the new cursor position out_str = f"{mouse_tgs[mouse_index].x},{mouse_tgs[mouse_index].y}" + + # loop over possible button bit indexes for i, button in enumerate(BUTTONS): + # check each bit index to determin if the button was pressed if mouse_bufs[mouse_index][0] & (1 << i) != 0: + # if it was pressed, add the button to the output string out_str += f" {button}" + # set the output string into text of the label + # to show it on the display output_lbls[mouse_index].text = out_str From 21ab387adb3f6430732476994464493e135fe423 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Wed, 23 Apr 2025 14:36:25 -0500 Subject: [PATCH 09/11] add find_boot_keyboard function and example --- adafruit_usb_host_descriptors.py | 36 ++++++++++---- ...usb_host_descriptors_find_boot_keyboard.py | 47 +++++++++++++++++++ 2 files changed, 75 insertions(+), 8 deletions(-) create mode 100644 examples/usb_host_descriptors_find_boot_keyboard.py diff --git a/adafruit_usb_host_descriptors.py b/adafruit_usb_host_descriptors.py index c4a6f00..c02c1ba 100644 --- a/adafruit_usb_host_descriptors.py +++ b/adafruit_usb_host_descriptors.py @@ -14,6 +14,11 @@ from micropython import const +try: + from typing import Literal +except ImportError: + pass + __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_USB_Host_Descriptors.git" @@ -39,6 +44,7 @@ INTERFACE_HID = 0x03 SUBCLASS_BOOT = 0x01 PROTOCOL_MOUSE = 0x02 +PROTOCOL_KEYBOARD = 0x01 def get_descriptor(device, desc_type, index, buf, language_id=0): @@ -77,13 +83,7 @@ def get_configuration_descriptor(device, index): return full_buf -def find_boot_mouse_endpoint(device): - """ - Try to find a boot mouse endpoint in the device and return its - interface index, and endpoint address. - :param device: The device to search within - :return: mouse_interface_index, mouse_endpoint_address if found, or None, None otherwise - """ +def _find_boot_endpoint(device, protocol_type: Literal[PROTOCOL_MOUSE, PROTOCOL_KEYBOARD]): config_descriptor = get_configuration_descriptor(device, 0) i = 0 mouse_interface_index = None @@ -99,7 +99,7 @@ def find_boot_mouse_endpoint(device): if ( interface_class == INTERFACE_HID and interface_subclass == SUBCLASS_BOOT - and interface_protocol == PROTOCOL_MOUSE + and interface_protocol == protocol_type ): found_mouse = True mouse_interface_index = interface_number @@ -111,3 +111,23 @@ def find_boot_mouse_endpoint(device): return mouse_interface_index, endpoint_address i += descriptor_len return None, None + + +def find_boot_mouse_endpoint(device): + """ + Try to find a boot mouse endpoint in the device and return its + interface index, and endpoint address. + :param device: The device to search within + :return: mouse_interface_index, mouse_endpoint_address if found, or None, None otherwise + """ + return _find_boot_endpoint(device, PROTOCOL_MOUSE) + + +def find_boot_keyboard_endpoint(device): + """ + Try to find a boot keyboard endpoint in the device and return its + interface index, and endpoint address. + :param device: The device to search within + :return: keyboard_interface_index, keyboard_endpoint_address if found, or None, None otherwise + """ + return _find_boot_endpoint(device, PROTOCOL_KEYBOARD) diff --git a/examples/usb_host_descriptors_find_boot_keyboard.py b/examples/usb_host_descriptors_find_boot_keyboard.py new file mode 100644 index 0000000..af6ca89 --- /dev/null +++ b/examples/usb_host_descriptors_find_boot_keyboard.py @@ -0,0 +1,47 @@ +# SPDX-FileCopyrightText: Copyright (c) 2025 Tim Cocks for Adafruit Industries +# +# SPDX-License-Identifier: MIT +import array + +import usb + +import adafruit_usb_host_descriptors + +# lists for mouse interface indexes, endpoint addresses, and USB Device instances +# each of these will end up with length 2 once we find both mice +mouse_interface_indexes = None +mouse_endpoint_addresses = None +keyboard = None + +# scan for connected USB devices +for device in usb.core.find(find_all=True): + # check for boot mouse endpoints on this device + kbd_interface_index, kbd_endpoint_address = ( + adafruit_usb_host_descriptors.find_boot_keyboard_endpoint(device) + ) + # if a boot mouse interface index and endpoint address were found + if kbd_interface_index is not None and kbd_interface_index is not None: + keyboard = device + + # detach device from kernel if needed + if keyboard.is_kernel_driver_active(0): + keyboard.detach_kernel_driver(0) + + # set the mouse configuration so it can be used + keyboard.set_configuration() + +buf = array.array("b", [0] * 8) + +while True: + # try to read data from the mouse + try: + count = keyboard.read(mouse_endpoint_addresses, buf, timeout=10) + + # if there is no data it will raise USBTimeoutError + except usb.core.USBTimeoutError: + # Nothing to do if there is no data for this mouse + continue + + for b in buf: + print(hex(b), end=" ") + print() From 7782b669225851a17f0e6e664b422b819536c473 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 24 Apr 2025 13:05:29 -0500 Subject: [PATCH 10/11] fix references to mice --- ...usb_host_descriptors_find_boot_keyboard.py | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/examples/usb_host_descriptors_find_boot_keyboard.py b/examples/usb_host_descriptors_find_boot_keyboard.py index af6ca89..62dd717 100644 --- a/examples/usb_host_descriptors_find_boot_keyboard.py +++ b/examples/usb_host_descriptors_find_boot_keyboard.py @@ -7,39 +7,37 @@ import adafruit_usb_host_descriptors -# lists for mouse interface indexes, endpoint addresses, and USB Device instances -# each of these will end up with length 2 once we find both mice -mouse_interface_indexes = None -mouse_endpoint_addresses = None +keyboard_interface_index = None +keyboard_endpoint_address = None keyboard = None # scan for connected USB devices for device in usb.core.find(find_all=True): - # check for boot mouse endpoints on this device - kbd_interface_index, kbd_endpoint_address = ( + # check for boot keyboard endpoints on this device + keyboard_interface_index, keyboard_endpoint_address = ( adafruit_usb_host_descriptors.find_boot_keyboard_endpoint(device) ) # if a boot mouse interface index and endpoint address were found - if kbd_interface_index is not None and kbd_interface_index is not None: + if keyboard_interface_index is not None and keyboard_endpoint_address is not None: keyboard = device # detach device from kernel if needed if keyboard.is_kernel_driver_active(0): keyboard.detach_kernel_driver(0) - # set the mouse configuration so it can be used + # set the configuration so the keyboard can be used keyboard.set_configuration() buf = array.array("b", [0] * 8) while True: - # try to read data from the mouse + # try to read data from the keyboard try: - count = keyboard.read(mouse_endpoint_addresses, buf, timeout=10) + count = keyboard.read(keyboard_endpoint_address, buf, timeout=10) # if there is no data it will raise USBTimeoutError except usb.core.USBTimeoutError: - # Nothing to do if there is no data for this mouse + # Nothing to do if there is no data for this keyboard continue for b in buf: From e547a73f277bb2c55ebcd2fd1226d50953e3b3d5 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 24 Apr 2025 13:36:11 -0500 Subject: [PATCH 11/11] fix reference to mouse --- examples/usb_host_descriptors_find_boot_keyboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/usb_host_descriptors_find_boot_keyboard.py b/examples/usb_host_descriptors_find_boot_keyboard.py index 62dd717..9ee9bd6 100644 --- a/examples/usb_host_descriptors_find_boot_keyboard.py +++ b/examples/usb_host_descriptors_find_boot_keyboard.py @@ -17,7 +17,7 @@ keyboard_interface_index, keyboard_endpoint_address = ( adafruit_usb_host_descriptors.find_boot_keyboard_endpoint(device) ) - # if a boot mouse interface index and endpoint address were found + # if a boot keyboard interface index and endpoint address were found if keyboard_interface_index is not None and keyboard_endpoint_address is not None: keyboard = device