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

wacom/live: make the pressure dependent of the class 

The Intuos Pro has 4096 levels of pressure, while the Slate and the Spark
only has 2048. We should do something about it.
pull/95/head
Benjamin Tissoires 2018-02-15 11:51:51 +01:00
parent 18221dfd58
commit cf4d5b184e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tuhi/wacom.py
View File

@ -86,7 +86,7 @@ wacom_live_rdesc_template = [
0x81, 0x02, # ..Input (Data,Var,Abs) 71 0x81, 0x02, # ..Input (Data,Var,Abs) 71
0x05, 0x0d, # ..Usage Page (Digitizers) 73 0x05, 0x0d, # ..Usage Page (Digitizers) 73
0x09, 0x30, # ..Usage (Tip Pressure) 75 0x09, 0x30, # ..Usage (Tip Pressure) 75
0x26, 0xff, 0x07, # ..Logical Maximum (2047) 77 0x26, 'pressure', # ..Logical Maximum (TBD) 77
0x81, 0x02, # ..Input (Data,Var,Abs) 80 0x81, 0x02, # ..Input (Data,Var,Abs) 80
0xc0, # .End Collection 82 0xc0, # .End Collection 82
0xc0, # End Collection 83 0xc0, # End Collection 83
@ -631,6 +631,8 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
rdesc[i] = list(int.to_bytes(w, 4, 'little', signed=True)) rdesc[i] = list(int.to_bytes(w, 4, 'little', signed=True))
elif v == 'height': elif v == 'height':
rdesc[i] = list(int.to_bytes(h, 4, 'little', signed=True)) rdesc[i] = list(int.to_bytes(h, 4, 'little', signed=True))
elif v == 'pressure':
rdesc[i] = list(int.to_bytes(self.pressure, 2, 'little', signed=True))
uhid_device = UHIDDevice(fd) uhid_device = UHIDDevice(fd)
uhid_device.rdesc = list(flatten(rdesc)) uhid_device.rdesc = list(flatten(rdesc))
@ -872,6 +874,7 @@ class WacomProtocolSpark(WacomProtocolBase):
''' '''
width = 21600 width = 21600
height = 14800 height = 14800
pressure = 2047
protocol = Protocol.SPARK protocol = Protocol.SPARK
packet_handlers = [WacomPacketHandlerEndOfStroke, packet_handlers = [WacomPacketHandlerEndOfStroke,
WacomPacketHandlerEndOfSequence] WacomPacketHandlerEndOfSequence]
@ -887,6 +890,7 @@ class WacomProtocolSlate(WacomProtocolSpark):
''' '''
width = 21600 width = 21600
height = 14800 height = 14800
pressure = 2047
protocol = Protocol.SLATE protocol = Protocol.SLATE
packet_handlers = [WacomPacketHandlerStrokePrefixSlate] packet_handlers = [WacomPacketHandlerStrokePrefixSlate]
@ -979,6 +983,7 @@ class WacomProtocolIntuosPro(WacomProtocolSlate):
''' '''
width = 44800 width = 44800
height = 29600 height = 29600
pressure = 4095
protocol = Protocol.INTUOS_PRO protocol = Protocol.INTUOS_PRO
packet_handlers = [WacomPacketHandlerStrokePrefixIntuosPro, packet_handlers = [WacomPacketHandlerStrokePrefixIntuosPro,
WacomPacketHandlerStrokeTimestampIntuosPro, WacomPacketHandlerStrokeTimestampIntuosPro,