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

wacom: fix from_bytes little/big endianness 

Looks like they are all the wrong way but the time_offset one.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Benjamin Tissoires 2018-01-16 10:09:54 +01:00
parent 1841508c33
commit f30f47d454
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tuhi/wacom.py
View File

@ -148,7 +148,7 @@ class WacomDevice(GObject.Object):
logger.debug(binascii.hexlify(bytes(value))) logger.debug(binascii.hexlify(bytes(value)))
if value[0] == 0x10: if value[0] == 0x10:
pressure = int.from_bytes(value[2:4], byteorder='big') pressure = int.from_bytes(value[2:4], byteorder='little')
buttons = int(value[10]) buttons = int(value[10])
logger.info(f'New Pen Data: pressure: {pressure}, button: {buttons}') logger.info(f'New Pen Data: pressure: {pressure}, button: {buttons}')
elif value[0] == 0xa2: elif value[0] == 0xa2:
@ -167,9 +167,9 @@ class WacomDevice(GObject.Object):
if bytes(data) == b'\xff\xff\xff\xff\xff\xff': if bytes(data) == b'\xff\xff\xff\xff\xff\xff':
logger.info(f'Pen left proximity') logger.info(f'Pen left proximity')
else: else:
x = int.from_bytes(data[0:2], byteorder='big') x = int.from_bytes(data[0:2], byteorder='little')
y = int.from_bytes(data[2:4], byteorder='big') y = int.from_bytes(data[2:4], byteorder='little')
pressure = int.from_bytes(data[4:6], byteorder='big') pressure = int.from_bytes(data[4:6], byteorder='little')
if self.orientation == ORIENTATION_PORTRAIT: if self.orientation == ORIENTATION_PORTRAIT:
t = x t = x
x = self.height - y x = self.height - y
@ -315,7 +315,7 @@ class WacomDevice(GObject.Object):
if len(data) != 6: if len(data) != 6:
str_data = binascii.hexlify(bytes(data)) str_data = binascii.hexlify(bytes(data))
raise WacomCorruptDataException(f'unexpected answer for get_dimensions: {str_data}') raise WacomCorruptDataException(f'unexpected answer for get_dimensions: {str_data}')
return int.from_bytes(data[2:4], byteorder='big') return int.from_bytes(data[2:4], byteorder='little')
def ec_command(self): def ec_command(self):
args = [0x06, 0x00, 0x00, 0x00, 0x00, 0x00] args = [0x06, 0x00, 0x00, 0x00, 0x00, 0x00]
@ -344,9 +344,9 @@ class WacomDevice(GObject.Object):
expected_opcode=0xc2) expected_opcode=0xc2)
n = 0 n = 0
if self.is_slate(): if self.is_slate():
n = int.from_bytes(data[0:2], byteorder='big')
else:
n = int.from_bytes(data[0:2], byteorder='little') n = int.from_bytes(data[0:2], byteorder='little')
else:
n = int.from_bytes(data[0:2], byteorder='big')
logger.debug(f'Drawings available: {n}') logger.debug(f'Drawings available: {n}')
return n > 0 return n > 0
@ -354,7 +354,7 @@ class WacomDevice(GObject.Object):
data = self.send_nordic_command_sync(command=0xcc, data = self.send_nordic_command_sync(command=0xcc,
expected_opcode=0xcf) expected_opcode=0xcf)
# logger.debug(f'cc returned {data} ') # logger.debug(f'cc returned {data} ')
count = int.from_bytes(data[0:4], byteorder='big') count = int.from_bytes(data[0:4], byteorder='little')
str_timestamp = ''.join([hex(d)[2:] for d in data[4:]]) str_timestamp = ''.join([hex(d)[2:] for d in data[4:]])
timestamp = time.strptime(str_timestamp, "%y%m%d%H%M%S") timestamp = time.strptime(str_timestamp, "%y%m%d%H%M%S")
return count, timestamp return count, timestamp
@ -366,7 +366,7 @@ class WacomDevice(GObject.Object):
# the btsnoop logs but I only rarely get a c7 response here # the btsnoop logs but I only rarely get a c7 response here
count = 0 count = 0
if data.opcode == 0xc7: if data.opcode == 0xc7:
count = int.from_bytes(data[0:4], byteorder='big') count = int.from_bytes(data[0:4], byteorder='little')
data = self.wait_nordic_data(0xcd, 5) data = self.wait_nordic_data(0xcd, 5)
# logger.debug(f'cc returned {data} ') # logger.debug(f'cc returned {data} ')
@ -453,7 +453,7 @@ class WacomDevice(GObject.Object):
full_coord_bitmask = 0b11 << (2 * n) full_coord_bitmask = 0b11 << (2 * n)
delta_coord_bitmask = 0b10 << (2 * n) delta_coord_bitmask = 0b10 << (2 * n)
if (bitmask & full_coord_bitmask) == full_coord_bitmask: if (bitmask & full_coord_bitmask) == full_coord_bitmask:
v = int.from_bytes(data[2 * n:2 * n + 2], byteorder='big') v = int.from_bytes(data[2 * n:2 * n + 2], byteorder='little')
dv = 0 dv = 0
elif bitmask & delta_coord_bitmask: elif bitmask & delta_coord_bitmask:
dv += signed_char_to_int(data[2 * n + 1]) dv += signed_char_to_int(data[2 * n + 1])