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

wacom: factor out the 'next stroke data' parsing

This commit is contained in:
Peter Hutterer 2018-02-14 10:33:19 +10:00
parent 8ecc397303
commit c39b735e1e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tuhi/wacom.py
View File

@ -597,6 +597,10 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
return True, offset return True, offset
def parse_next_stroke_prefix(self, opcode, raw_args):
# This doesn't exist on the Spark
return False
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
@ -619,10 +623,8 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
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 == 0xeeff:
# some sort of headers if self.parse_next_stroke_prefix(opcode, raw_args):
time_offset = int.from_bytes(raw_args[4:], byteorder='little')
logger.info(f'time offset since boot: {time_offset * 0.005} secs')
stroke = drawing.new_stroke() stroke = drawing.new_stroke()
continue continue
if bytes(args) == b'\xff\xff\xff\xff\xff\xff\xff\xff': if bytes(args) == b'\xff\xff\xff\xff\xff\xff\xff\xff':
@ -806,6 +808,15 @@ class WacomProtocolSlate(WacomProtocolSpark):
raise WacomCorruptDataException("CRCs don't match") raise WacomCorruptDataException("CRCs don't match")
return pen_data return pen_data
def parse_next_stroke_prefix(self, opcode, raw_args):
if opcode != 0xeeff:
return False
# some sort of headers
time_offset = int.from_bytes(raw_args[4:], byteorder='little')
logger.info(f'time offset since boot: {time_offset * 0.005} secs')
return True
class WacomDevice(GObject.Object): class WacomDevice(GObject.Object):
''' '''