Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For Intuos3, use an additional bit from another data bucket. This is what the 

Linux driver does, thanks for idefix for tracking down the problem! Should fix
ticket #5960, but I don't personally have the hardware. The change can only
affect Intuos3 tablets, though.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36791 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-05-11 18:32:16 +00:00
parent 6f05b1027f
commit 9716ee3e47
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/add-ons/input_server/devices/wacom/TabletDevice.cpp
View File

@ -206,10 +206,7 @@ TabletDevice::DetectDevice(const DeviceReader* reader)
SetDevice(25400.0, 20320.0, DEVICE_INTUOS3);
break;
case 0xB1:
// tested:
SetDevice(20320.0, 15230.0, DEVICE_INTUOS3);
// Frans:
// SetDevice(40640.0, 30480.0, DEVICE_INTUOS3);
SetDevice(40640.0, 30480.0, DEVICE_INTUOS3);
break;
case 0xB2:
SetDevice(60960.0, 45720.0, DEVICE_INTUOS3);
@ -295,8 +292,13 @@ TabletDevice::ReadData(const uchar* data, bool& hasContact, uint32& mode,
case DEVICE_INTUOS3:
case DEVICE_CINTIQ:
if ((data[0] == 0x02) && !(((data[1] >> 5) & 0x03) == 0x02)) {
xPos = data[2] << 8 | data[3];
yPos = data[4] << 8 | data[5];
if (fDeviceMode == DEVICE_INTUOS3) {
xPos = (data[2] << 9) | (data[3] << 1) | ((data[9] >> 1) & 1);
yPos = (data[4] << 9) | (data[5] << 1) | (data[9] & 1);
} else {
xPos = (data[2] << 8) | data[3];
yPos = (data[4] << 8) | data[5];
}
uint16 pressureData = data[6] << 2 | ((data[7] >> 6) & 0x03);
pressure = (float)pressureData / 1023.0;