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

wacom: make 0xb3 the expected opcode 

Virtually all the commands we have that don't have a specific opcode expect
0xb3. Since that's the general ACK command, we can default to that and make
everything else the exception.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
pull/146/head
Peter Hutterer 2019-06-07 14:21:56 +10:00 committed by Benjamin Tissoires
parent a061240b11
commit f488d4e130
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tuhi/wacom.py
View File

@ -374,7 +374,7 @@ class WacomProtocolLowLevelComm(GObject.Object):
def send_nordic_command_sync(self, def send_nordic_command_sync(self,
command, command,
expected_opcode, expected_opcode=0xb3,
arguments=None): arguments=None):
if arguments is None: if arguments is None:
arguments = [0x00] arguments = [0x00]
@ -421,9 +421,7 @@ class WacomRegisterHelper(WacomProtocolLowLevelComm):
# Usually that triggers a WacomWrongModeException but here it's # Usually that triggers a WacomWrongModeException but here it's
# expected # expected
try: try:
self.send_nordic_command_sync(command=0xe6, self.send_nordic_command_sync(command=0xe6, arguments=args)
expected_opcode=0xb3,
arguments=args)
except WacomWrongModeException: except WacomWrongModeException:
# this is expected # this is expected
pass pass
@ -554,13 +552,10 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
def check_connection(self): def check_connection(self):
args = [int(i) for i in binascii.unhexlify(self._uuid)] args = [int(i) for i in binascii.unhexlify(self._uuid)]
self.send_nordic_command_sync(command=0xe6, self.send_nordic_command_sync(command=0xe6, arguments=args)
expected_opcode=0xb3,
arguments=args)
def e3_command(self): def e3_command(self):
self.send_nordic_command_sync(command=0xe3, self.send_nordic_command_sync(command=0xe3)
expected_opcode=0xb3)
def time_to_bytes(self): def time_to_bytes(self):
# Device time is UTC # Device time is UTC
@ -575,9 +570,7 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
def set_time(self): def set_time(self):
args = self.time_to_bytes() args = self.time_to_bytes()
self.send_nordic_command_sync(command=0xb6, self.send_nordic_command_sync(command=0xb6, arguments=args)
expected_opcode=0xb3,
arguments=args)
def read_time(self): def read_time(self):
data = self.send_nordic_command_sync(command=0xb6, data = self.send_nordic_command_sync(command=0xb6,
@ -622,13 +615,10 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
def ec_command(self): def ec_command(self):
args = [0x06, 0x00, 0x00, 0x00, 0x00, 0x00] args = [0x06, 0x00, 0x00, 0x00, 0x00, 0x00]
self.send_nordic_command_sync(command=0xec, self.send_nordic_command_sync(command=0xec, arguments=args)
expected_opcode=0xb3,
arguments=args)
def start_live(self, fd): def start_live(self, fd):
self.send_nordic_command_sync(command=0xb1, self.send_nordic_command_sync(command=0xb1)
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[:]
@ -646,15 +636,11 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
def stop_live(self): def stop_live(self):
args = [0x02] args = [0x02]
self.send_nordic_command_sync(command=0xb1, self.send_nordic_command_sync(command=0xb1, arguments=args)
expected_opcode=0xb3,
arguments=args)
def b1_command(self): def b1_command(self):
args = [0x01] args = [0x01]
self.send_nordic_command_sync(command=0xb1, self.send_nordic_command_sync(command=0xb1, arguments=args)
expected_opcode=0xb3,
arguments=args)
def is_data_available(self): def is_data_available(self):
data = self.send_nordic_command_sync(command=0xc1, data = self.send_nordic_command_sync(command=0xc1,
@ -835,14 +821,12 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
# firmware gets confused. # firmware gets confused.
args = [ord(c) for c in name] + [0x0a] args = [ord(c) for c in name] + [0x0a]
data = self.send_nordic_command_sync(command=0xbb, data = self.send_nordic_command_sync(command=0xbb,
arguments=args, arguments=args)
expected_opcode=0xb3)
return bytes(data) return bytes(data)
def register_device_finish(self): def register_device_finish(self):
self.send_nordic_command_sync(command=0xe5, self.send_nordic_command_sync(command=0xe5,
arguments=None, arguments=None)
expected_opcode=0xb3)
self.set_time() self.set_time()
self.read_time() self.read_time()
name = self.get_name() name = self.get_name()
@ -925,8 +909,7 @@ class WacomProtocolSlate(WacomProtocolSpark):
self.fw_logger.debug(f'mysterious: {binascii.hexlify(bytes(value))}') self.fw_logger.debug(f'mysterious: {binascii.hexlify(bytes(value))}')
def ack_transaction(self): def ack_transaction(self):
self.send_nordic_command_sync(command=0xca, self.send_nordic_command_sync(command=0xca)
expected_opcode=0xb3)
def is_data_available(self): def is_data_available(self):
data = self.send_nordic_command_sync(command=0xc1, data = self.send_nordic_command_sync(command=0xc1,
@ -1053,8 +1036,7 @@ class WacomProtocolIntuosPro(WacomProtocolSlate):
def set_name(self, name): def set_name(self, name):
args = [ord(c) for c in name] args = [ord(c) for c in name]
data = self.send_nordic_command_sync(command=0xbb, data = self.send_nordic_command_sync(command=0xbb,
arguments=args, arguments=args)
expected_opcode=0xb3)
return bytes(data) return bytes(data)
def check_connection(self): def check_connection(self):