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

wacom: factor out the prefix handling 

The Intuos Pro has a different prefix, we'll need to override this. Dropping
the comment about the 8bt, on the intuos pro the prefix is nonsensical so
let's not leave a false lead there.
This commit is contained in:
Peter Hutterer 2018-02-14 09:48:02 +10:00
parent 726362107b
commit 876f35f806
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tuhi/wacom.py
View File

@ -586,6 +586,16 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
is_rel = True is_rel = True
return v, dv, is_rel return v, dv, is_rel
def parse_pen_data_prefix(self, data):
expected_prefix = b'\x62\x38\x62\x74'
prefix = data[:4]
# not sure if we really need this check
if bytes(prefix) != expected_prefix:
logger.debug(f'Expected pen data prefix {expected_prefix} but got {prefix}')
return False
return True
def parse_pen_data(self, data, timestamp): def parse_pen_data(self, data, timestamp):
''' '''
:param timestamp: a tuple with 9 entries, corresponding to the :param timestamp: a tuple with 9 entries, corresponding to the
@ -599,6 +609,10 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
drawings = [] drawings = []
drawing = None drawing = None
stroke = None stroke = None
if not self.parse_pen_data_prefix(data):
return []
while offset < len(data): while offset < len(data):
bitmask, opcode, raw_args, args, offset = self.next_pen_data(data, offset) bitmask, opcode, raw_args, args, offset = self.next_pen_data(data, offset)
if opcode == 0x3800: if opcode == 0x3800:
@ -652,13 +666,9 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
pen_data = self.wait_for_end_read() pen_data = self.wait_for_end_read()
str_pen = binascii.hexlify(bytes(pen_data)) str_pen = binascii.hexlify(bytes(pen_data))
logger.info(f'received {str_pen}') logger.info(f'received {str_pen}')
prefix = pen_data[:4] drawings = self.parse_pen_data(pen_data, timestamp)
# not sure if we really need this check for drawing in drawings:
# note: \x38\x62\x74 translates to '8bt' self.emit('drawing', drawing)
if bytes(prefix) == b'\x62\x38\x62\x74':
drawings = self.parse_pen_data(pen_data, timestamp)
for drawing in drawings:
self.emit('drawing', drawing)
self.ack_transaction() self.ack_transaction()
transaction_count += 1 transaction_count += 1
return transaction_count return transaction_count