Skip to content

Support Ugee M708 v2 #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support Ugee M708 v2 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b52bb2
uclogic: Handle EIO on retrieving v2 parameters
spbnick Dec 1, 2018
01df233
uclogic: Support Ugee M708 v2
spbnick Dec 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hid-ids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042
#define USB_DEVICE_ID_UGEE_TABLET_G5 0x0074
#define USB_DEVICE_ID_UGEE_TABLET_EX07S 0x0071
#define USB_DEVICE_ID_UGEE_TABLET_M708_V2 0x0907

/* ViewSonic Corporation */
#define USB_VENDOR_ID_VIEWSONIC 0x0543
Expand Down
2 changes: 2 additions & 0 deletions hid-uclogic-core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,8 @@ static const struct hid_device_id uclogic_devices[] = {
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640) },
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01) },
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
USB_DEVICE_ID_UGEE_TABLET_M708_V2) },
{ }
};
MODULE_DEVICE_TABLE(hid, uclogic_devices);
Expand Down
9 changes: 8 additions & 1 deletion hid-uclogic-params.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,12 @@ static int uclogic_params_pen_init_v2(struct uclogic_params_pen *pen,
* NOTE: This enables fully-functional tablet mode.
*/
rc = uclogic_params_get_str_desc(&buf, hdev, 200, len);
if (rc == -EPIPE) {
if (rc == -EIO) {
hid_dbg(hdev,
"I/O error retrieving string descriptor with "
"pen parameters, assuming not compatible\n");
goto finish;
} else if (rc == -EPIPE) {
hid_dbg(hdev,
"string descriptor with pen parameters not found, "
"assuming not compatible\n");
Expand Down Expand Up @@ -1007,6 +1012,8 @@ int uclogic_params_init(struct uclogic_params *params,
USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_45):
case VID_PID(USB_VENDOR_ID_UCLOGIC,
USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_47):
case VID_PID(USB_VENDOR_ID_UGEE,
USB_DEVICE_ID_UGEE_TABLET_M708_V2):
rc = uclogic_params_huion_init(&p, hdev);
if (rc != 0) {
goto cleanup;
Expand Down
2 changes: 1 addition & 1 deletion xorg.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ EndSection

Section "InputClass"
Identifier "Ugee/XP-Pen tablets with Wacom driver"
MatchUSBID "28bd:007[145]|28bd:0094|28bd:0042|5543:004[57]|5543:0081|5543:0004|5543:3031"
MatchUSBID "28bd:007[145]|28bd:0094|28bd:0042|28bd:0907|5543:004[57]|5543:0081|5543:0004|5543:3031"
# Exclude the original WP5540U which PID is reused by Ugee M540
NoMatchProduct "MousePen"
MatchDevicePath "/dev/input/event*"
Expand Down