Skip to content

Fix Resume() to fully reinitialize USB device after suspend #249

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

Open
fcatuhe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Resume() to fully reinitialize USB device after suspend #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions dbus_service/dbus-service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,13 @@ class Device(dbus.service.Object):
def Resume(self):
logging.debug('In Resume')
tls.reset()
try:
init.open_common()
except:
init.open_common()
for attempt in range(20):
try:
init.open()
return
except usb_core.USBError as e:
logging.debug('Resume attempt %d failed: %s' % (attempt + 1, repr(e)))
time.sleep(0.1)

@dbus.service.method(dbus_interface=INTERFACE_NAME, in_signature="s", out_signature="as")
def ListEnrolledFingers(self, user):
Expand Down
2 changes: 1 addition & 1 deletion validitysensor/usb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def match(d):

def open_dev(self, dev: ucore.Device):
if dev is None:
raise Exception('No matching devices found')
raise USBError('No matching devices found')

self.dev = dev
self.dev.default_timeout = 15000
Expand Down