Skip to content

Add missing return codes to os.strerror() calls and fix force feedback example in docs. #137

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
gvalkov merged 3 commits into from
Oct 1, 2020
Merged

Add missing return codes to os.strerror() calls and fix force feedback example in docs. #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
092df1d
Add missing return codes to os.strerror() calls.
sequoia-hope Sep 30, 2020
454f50f
Fix a typo in force feedback example.
sequoia-hope Oct 1, 2020
148e6e0
One more bug fix in the example.
sequoia-hope Oct 1, 2020
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
4 changes: 2 additions & 2 deletions docs/tutorial.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,13 +385,13 @@ Create ``uinput`` device capable of receiving FF-effects
# Wait for an EV_UINPUT event that will signal us that an
# effect upload/erase operation is in progress.
if event.type != ecodes.EV_UINPUT:
pass
continue

if event.code == ecodes.UI_FF_UPLOAD:
upload = device.begin_upload(event.value)
upload.retval = 0

print(f'[upload] effect_id: {upload.effect_id}, type: {upload.effect.type}')
print(f'[upload] effect_id: {upload.effect.id}, type: {upload.effect.type}')
device.end_upload(upload)

elif event.code == ecodes.UI_FF_ERASE:
Expand Down
20 changes: 12 additions & 8 deletions evdev/uinput.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,26 +229,30 @@ def begin_upload(self, effect_id):
upload = ff.UInputUpload()
upload.effect_id = effect_id

if self.dll._uinput_begin_upload(self.fd, ctypes.byref(upload)):
raise UInputError('Failed to begin uinput upload: ' + os.strerror())
ret = self.dll._uinput_begin_upload(self.fd, ctypes.byref(upload))
if ret:
raise UInputError('Failed to begin uinput upload: ' + os.strerror(ret))

return upload

def end_upload(self, upload):
if self.dll._uinput_end_upload(self.fd, ctypes.byref(upload)):
raise UInputError('Failed to end uinput upload: ' + os.strerror())
ret = self.dll._uinput_end_upload(self.fd, ctypes.byref(upload))
if ret:
raise UInputError('Failed to end uinput upload: ' + os.strerror(ret))

def begin_erase(self, effect_id):
erase = ff.UInputErase()
erase.effect_id = effect_id

if self.dll._uinput_begin_erase(self.fd, ctypes.byref(erase)):
raise UInputError('Failed to begin uinput erase: ' + os.strerror())
ret = self.dll._uinput_begin_erase(self.fd, ctypes.byref(erase))
if ret:
raise UInputError('Failed to begin uinput erase: ' + os.strerror(ret))
return erase

def end_erase(self, erase):
if self.dll._uinput_end_erase(self.fd, ctypes.byref(erase)):
raise UInputError('Failed to end uinput erase: ' + os.strerror())
ret = self.dll._uinput_end_erase(self.fd, ctypes.byref(erase))
if ret:
raise UInputError('Failed to end uinput erase: ' + os.strerror(ret))

def _verify(self):
'''
Expand Down