Ticket #7600: wacom_extra_bamboo.patch

src/add-ons/input_server/devices/wacom/TabletDevice.cpp

@@ -238 +238 @@
         case 0xD4:  // Wacom Bamboo 4x5 (from Linux Wacom Project)
             SetDevice(14720.0, 9200.0, DEVICE_BAMBOO_PT);
             break;
+        case 0xD6:  // Wacom Bamboo CTH-460/K (from Linux Wacom Project)
+            SetDevice(14720.0, 9200.0, DEVICE_BAMBOO_PT);
+            break;
+        case 0xD7:  // Wacom Bamboo CTH-461/S (from Linux Wacom Project)
+            SetDevice(14720.0, 9200.0, DEVICE_BAMBOO_PT);
+            break;
+        case 0xD8:  // Wacom Bamboo CTH-661/S1 (from Linux Wacom Project)
+            SetDevice(21648.0, 13530.0, DEVICE_BAMBOO_PT);
+            break;
+        case 0xDA:  // Wacom Bamboo CTH-461/L (from Linux Wacom Project)
+            SetDevice(14720.0, 9200.0, DEVICE_BAMBOO_PT);
+            break;
+        case 0xDB:  // Wacom Bamboo CTH-661 (from Linux Wacom Project)
+            SetDevice(21648.0, 13530.0, DEVICE_BAMBOO_PT);
+            break;
         default:
             status = B_BAD_VALUE;
             break;
@@ -322 +337 @@
             if (dataBytes < 20) {   // ignore touch-packets
                 xPos = data[3] << 8 | data[2];
                 yPos = data[5] << 8 | data[4];
-    
-                hasContact = (data[1] & 0x10) && (data[1] & 0x20);      
-    
+
+                hasContact = (data[1] & 0x20);
+
                 uint16 pressureData = data[7] << 8 | data[6];
                 pressure = (float)pressureData / 1023.0;
                 eraser = (data[1] & 0x08);
-    
+
                 firstButton = (data[1] & 0x01);
                 secondButton = (data[1] & 0x02);
                 thirdButton = (data[1] & 0x04);
-    
+
                 break;
             }
         }
@@ -816 +831 @@
         case 0xD4:
             *name = "Wacom Bamboo 4x5\" USB";
             break;
+        case 0xD6:
+            *name = "Wacom Bamboo (CTH-460/K)";
+            break;
+        case 0xD7:
+            *name = "Wacom Bamboo (CTH-461/S)";
+            break;
+        case 0xD8:
+            *name = "Wacom Bamboo (CTH-661/S1)";
+            break;
+        case 0xDA:
+            *name = "Wacom Bamboo (CTH-461/L)";
+            break;
+        case 0xDB:
+            *name = "Wacom Bamboo (CTH-661)";
+            break;
 
         default:
             *name = "<unkown wacom tablet>";