-
Notifications
You must be signed in to change notification settings - Fork 21
Make the HID interface selectable, defaulting away from interface 0 #95
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
Open
dwaycik
wants to merge
2
commits into
strodgers:main
Choose a base branch
from
dwaycik:fix/selectable-hid-interface
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,6 +58,10 @@ def __init__(self, config_main: Config) -> None: | |
|
|
||
| self.vendor_id = config_main["VENDOR_ID"] | ||
| self.use_wireless = config_main["USE_WIRELESS"] | ||
| # Which HID interface to open. None falls back to opening by | ||
| # vendor/product id, which takes whichever the backend enumerates | ||
| # first -- on Windows that is the only option available. | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Code should be self-documenting, so no need in this comment |
||
| self.interface: Optional[int] = config_main["INTERFACE"] | ||
|
|
||
| self.product_ids: list[int] = ( | ||
| config_main["PRODUCT_IDS_WIRED"] | ||
|
|
@@ -170,14 +174,38 @@ def _find_product_id(self) -> Optional[int]: | |
|
|
||
| return None | ||
|
|
||
| def _find_interface_path(self, product_id: int) -> Optional[bytes]: | ||
| """Path of the configured HID interface, or None to open by id. | ||
|
|
||
| Returns None when no interface is configured, or when the backend does | ||
| not report interface numbers -- notably on Windows, where hidapi | ||
| reports -1 and opening by vendor/product id is the only option. | ||
| """ | ||
| if self.config.interface is None: | ||
| return None | ||
|
|
||
| for entry in hid.enumerate(self.config.vendor_id, product_id): | ||
| if entry.get("interface_number") == self.config.interface: | ||
| return entry["path"] | ||
|
|
||
| Logger.log_warning( | ||
| f"Interface {self.config.interface} not found on device " | ||
| f"{self.config.vendor_id:04x}:{product_id:04x}, opening by id instead" | ||
| ) | ||
| return None | ||
|
|
||
| def _open_device(self, product_id: int) -> None: | ||
| """Opens the USB HID device. | ||
|
|
||
| Args: | ||
| product_id (int): The product ID. | ||
| """ | ||
| try: | ||
| self.device.open(self.config.vendor_id, product_id) | ||
| path = self._find_interface_path(product_id) | ||
| if path is not None: | ||
| self.device.open_path(path) | ||
| else: | ||
| self.device.open(self.config.vendor_id, product_id) | ||
| except IOError as e: | ||
| Logger.log_error( | ||
| f"Failed to open device: {e}\n" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have a pylint error somewhere related to this function call