Skip to content

Commit 9266a88

Browse files
JoseExpositoJiri Kosina
authored andcommitted
HID: uclogic: Add support for XP-PEN Deco Pro MW
The XP-PEN Deco Pro MW is a UGEE v2 device with a frame with 8 buttons, a bitmap dial and a mouse. Its pen has 2 buttons, supports tilt and pressure. It can be connected using a USB cable or, to use it in wireless mode, using a USB Bluetooth dongle. When it is connected in wireless mode the device battery is used to power it. All the pieces to support it are already in place. Add its ID and quirks in order to support the device. Link: DIGImend/digimend-kernel-drivers#622 Tested-by: Andreas Grosse <[email protected]> Signed-off-by: José Expósito <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 7744ca5 commit 9266a88

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

drivers/hid/hid-ids.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,6 +1296,7 @@
12961296
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640 0x0094
12971297
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042
12981298
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L 0x0935
1299+
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_MW 0x0934
12991300
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S 0x0909
13001301
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW 0x0933
13011302
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06 0x0078

drivers/hid/hid-input.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@ static const struct hid_device_id hid_battery_quirks[] = {
376376
HID_BATTERY_QUIRK_IGNORE },
377377
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L),
378378
HID_BATTERY_QUIRK_AVOID_QUERY },
379+
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_MW),
380+
HID_BATTERY_QUIRK_AVOID_QUERY },
379381
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW),
380382
HID_BATTERY_QUIRK_AVOID_QUERY },
381383
{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15),

drivers/hid/hid-uclogic-core.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,9 @@ static const struct hid_device_id uclogic_devices[] = {
540540
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01) },
541541
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
542542
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L) },
543+
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
544+
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_MW),
545+
.driver_data = UCLOGIC_MOUSE_FRAME_QUIRK | UCLOGIC_BATTERY_QUIRK },
543546
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
544547
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S) },
545548
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,

drivers/hid/hid-uclogic-params.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,6 +1765,8 @@ int uclogic_params_init(struct uclogic_params *params,
17651765
USB_DEVICE_ID_UGEE_PARBLO_A610_PRO):
17661766
case VID_PID(USB_VENDOR_ID_UGEE,
17671767
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L):
1768+
case VID_PID(USB_VENDOR_ID_UGEE,
1769+
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_MW):
17681770
case VID_PID(USB_VENDOR_ID_UGEE,
17691771
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S):
17701772
case VID_PID(USB_VENDOR_ID_UGEE,

0 commit comments

Comments
 (0)