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

wacom: fetch firmware data in one go 

No need for the caller to call this twice everywhere, let's just do this here.
This commit is contained in:
Peter Hutterer 2019-07-15 11:02:32 +10:00 committed by Benjamin Tissoires
parent bf5e53b62b
commit dbd60675a9
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tuhi/wacom.py
View File

@ -742,11 +742,15 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
return int(data[0]), data[1] == 1 return int(data[0]), data[1] == 1
def get_firmware_version(self, arg): def get_firmware_version(self, arg):
data = self.send_nordic_command_sync(command=0xb7, hi = self.send_nordic_command_sync(command=0xb7,
expected_opcode=0xb8, expected_opcode=0xb8,
arguments=(arg,)) arguments=(0,))
fw = ''.join([hex(d)[2:] for d in data[1:]]) lo = self.send_nordic_command_sync(command=0xb7,
return fw.upper() expected_opcode=0xb8,
arguments=(1,))
fw_hi = ''.join([hex(d)[2:] for d in hi[1:]])
fw_lo = ''.join([hex(d)[2:] for d in lo[1:]])
return f'{fw_hi}-{fw_lo}'
def get_name(self): def get_name(self):
data = self.send_nordic_command_sync(command=0xbb, data = self.send_nordic_command_sync(command=0xbb,
@ -982,9 +986,8 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
self.read_time() self.read_time()
name = self.get_name() name = self.get_name()
logger.info(f'device name is {name}') logger.info(f'device name is {name}')
fw_high = self.get_firmware_version(0) fw = self.get_firmware_version()
fw_low = self.get_firmware_version(1) logger.info(f'firmware is {fw}')
logger.info(f'firmware is {fw_high}-{fw_low}')
def live_mode(self, mode, uhid): def live_mode(self, mode, uhid):
try: try:
@ -1092,9 +1095,8 @@ class WacomProtocolSlate(WacomProtocolSpark):
logger.error(f'incompatible dimensions: {w}x{h}') logger.error(f'incompatible dimensions: {w}x{h}')
self.notify('dimensions') self.notify('dimensions')
fw_high = self.get_firmware_version(0) fw = self.get_firmware_version()
fw_low = self.get_firmware_version(1) logger.info(f'firmware is {fw}')
logger.info(f'firmware is {fw_high}-{fw_low}')
battery, charging = self.get_battery_info() battery, charging = self.get_battery_info()
logger.debug(f'device battery: {battery}% ({"dis" if not charging else ""}charging)') logger.debug(f'device battery: {battery}% ({"dis" if not charging else ""}charging)')
self.emit('battery-status', battery, charging) self.emit('battery-status', battery, charging)
@ -1111,9 +1113,8 @@ class WacomProtocolSlate(WacomProtocolSpark):
self.notify('dimensions') self.notify('dimensions')
logger.debug(f'dimensions: {w}x{h}') logger.debug(f'dimensions: {w}x{h}')
fw_high = self.get_firmware_version(0) fw = self.get_firmware_version()
fw_low = self.get_firmware_version(1) logger.debug(f'firmware is {fw}')
logger.debug(f'firmware is {fw_high}-{fw_low}')
self.ec_command() self.ec_command()
if self.read_offline_data() == 0: if self.read_offline_data() == 0:
logger.info('no data to retrieve') logger.info('no data to retrieve')
@ -1178,12 +1179,16 @@ class WacomProtocolIntuosPro(WacomProtocolSlate):
ts = time.strftime('%y-%m-%d %H:%M:%S', self.time_from_bytes(data)) ts = time.strftime('%y-%m-%d %H:%M:%S', self.time_from_bytes(data))
logger.debug(f'b6 returned: {ts}') logger.debug(f'b6 returned: {ts}')
def get_firmware_version(self, arg): def get_firmware_version(self):
data = self.send_nordic_command_sync(command=0xb7, hi = self.send_nordic_command_sync(command=0xb7,
expected_opcode=0xb8, expected_opcode=0xb8,
arguments=(arg,)) arguments=(0,))
fw = ''.join([chr(d) for d in data[1:]]) lo = self.send_nordic_command_sync(command=0xb7,
return fw expected_opcode=0xb8,
arguments=(1,))
fw_hi = ''.join([chr(d) for d in hi[1:]])
fw_lo = ''.join([chr(d) for d in lo[1:]])
return f'{fw_hi}-{fw_lo}'
def get_name(self): def get_name(self):
data = self.send_nordic_command_sync(command=0xdb, data = self.send_nordic_command_sync(command=0xdb,