nixo
/
tuhi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wacom/live: do not fetch the width and height, rely on stored values 

It's not like we are handling hundreds of devices. And this allows us to
be more flexible in which fields are replaced in the report descriptor.
This commit is contained in:
Benjamin Tissoires 2018-02-15 12:33:50 +01:00
parent cf4d5b184e
commit 013de2a6e4
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tuhi/wacom.py
View File

@ -619,20 +619,15 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
arguments=args) arguments=args)
def start_live(self, fd): def start_live(self, fd):
w = self.get_dimensions('width')
h = self.get_dimensions('height')
self.send_nordic_command_sync(command=0xb1, self.send_nordic_command_sync(command=0xb1,
expected_opcode=0xb3) expected_opcode=0xb3)
logger.debug(f'Starting wacom live mode on fd: {fd}') logger.debug(f'Starting wacom live mode on fd: {fd}')
rdesc = wacom_live_rdesc_template[:] rdesc = wacom_live_rdesc_template[:]
for i, v in enumerate(rdesc): for i, v in enumerate(rdesc):
if v == 'width': if isinstance(v, str):
rdesc[i] = list(int.to_bytes(w, 4, 'little', signed=True)) v = getattr(self, v)
elif v == 'height': rdesc[i] = list(int.to_bytes(v, 4, 'little', signed=True))
rdesc[i] = list(int.to_bytes(h, 4, 'little', signed=True))
elif v == 'pressure':
rdesc[i] = list(int.to_bytes(self.pressure, 2, 'little', signed=True))
uhid_device = UHIDDevice(fd) uhid_device = UHIDDevice(fd)
uhid_device.rdesc = list(flatten(rdesc)) uhid_device.rdesc = list(flatten(rdesc))