Skip to content

Add ability to add more constraints to bdDetect USB device registration #17537

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.

Sign up for GitHub

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

Merged
seanbudd merged 22 commits into from
Jan 3, 2025
Merged

Add ability to add more constraints to bdDetect USB device registration #17537

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
33228c6
Refactor fallback and allow match funcs for device registration
LeonarddeR Dec 14, 2024
1b95e81
Update albatross
LeonarddeR Dec 16, 2024
ce4d233
Add changes
LeonarddeR Dec 16, 2024
1791b18
Add brailliant
LeonarddeR Dec 16, 2024
9011882
Actually use the matchFunc and make it optional
LeonarddeR Dec 17, 2024
d0c3bce
Fixup typos
LeonarddeR Dec 20, 2024
b726cf6
Use constant in Albatros
LeonarddeR Dec 20, 2024
98d01bc
Uniform yield
LeonarddeR Dec 20, 2024
3b95bd7
use cache for HID device info
LeonarddeR Dec 26, 2024
673d742
Fix typo
LeonarddeR Dec 26, 2024
dcd8ffd
Deprecations
LeonarddeR Dec 27, 2024
0be066c
Use communication types
LeonarddeR Dec 27, 2024
6908f9d
Renames
LeonarddeR Dec 27, 2024
e18250f
Merge remote-tracking branch 'origin/master' into fallbackRevamp
LeonarddeR Dec 30, 2024
3a485cd
Update source/brailleDisplayDrivers/eurobraille/driver.py
LeonarddeR Dec 30, 2024
edcfe14
Update source/brailleDisplayDrivers/eurobraille/driver.py
LeonarddeR Dec 30, 2024
a3e129a
Update source/brailleDisplayDrivers/brailliantB.py
LeonarddeR Jan 2, 2025
2baa9a9
Update source/brailleDisplayDrivers/eurobraille/driver.py
LeonarddeR Jan 2, 2025
b0283da
Use StrEnum again
LeonarddeR Jan 2, 2025
c176ce6
Fix eurobraille mistakes due to coderabbit suggestions
LeonarddeR Jan 2, 2025
47e6fc5
Add doc string
LeonarddeR Jan 2, 2025
543f783
Undo more unrelated/faulty changes
LeonarddeR Jan 2, 2025
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
Prev Previous commit
Next Next commit
Use StrEnum again
  • Loading branch information
@LeonarddeR
LeonarddeR committed Jan 2, 2025
commit b0283da4801b758c0227249cac215e2d3f84c471
10 changes: 5 additions & 5 deletions source/bdDetect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import itertools
import threading
from concurrent.futures import ThreadPoolExecutor, Future
from enum import Enum
from enum import StrEnum
from typing import (
Any,
Callable,
Expand Down Expand Up @@ -53,7 +53,7 @@
USB_ID_REGEX = re.compile(r"^VID_[0-9A-F]{4}&PID_[0-9A-F]{4}$", re.U)


class ProtocolType(str, Enum):
class ProtocolType(StrEnum):
HID = "hid"
"""HID devices"""
SERIAL = "serial"
Expand All @@ -62,7 +62,7 @@ class ProtocolType(str, Enum):
"""Devices with a manufacturer specific protocol"""


class CommunicationType(str, Enum):
class CommunicationType(StrEnum):
BLUETOOTH = "bluetooth"
"""Bluetooth devices"""
USB = "usb"
Expand All @@ -82,7 +82,7 @@ def __getattr__(cls, name: str) -> ProtocolType | CommunicationType:
repl = cls._mapping.get(name)
if repl is not None and NVDAState._allowDeprecatedAPI():
log.warning(
f"{cls.__name__}.{name} is deprecated. Use {repl} instead.",
f"{cls.__name__}.{name} is deprecated. Use {repl.__class__.__name__}.{repl} instead.",
)
return repl
raise AttributeError(f"'{cls.__name__}' object has no attribute '{name}'")
Expand Down Expand Up @@ -112,7 +112,7 @@ def __getattr__(attrName: str) -> Any:
if attrName in _deprecatedConstantsMap and NVDAState._allowDeprecatedAPI():
replacementSymbol = _deprecatedConstantsMap[attrName]
log.warning(
f"{attrName} is deprecated. " f"Use bdDetect.{replacementSymbol} instead. ",
f"{attrName} is deprecated. " f"Use bdDetect.{replacementSymbol.__class__.__name__}.{replacementSymbol.value} instead. ",
)
return replacementSymbol.value
raise AttributeError(f"module {repr(__name__)} has no attribute {repr(attrName)}")
Expand Down