On Mon, Dec 18, 2017 at 04:53:59PM -0800, Jason Gerecke wrote: > Signed-off-by: Jason Gerecke <jason.gere...@wacom.com> > Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> > --- > Changes from v1: > * Add resolution information to WacomModelDesc table as suggested by > Ping. Ping also noticed the touch resolution doesn't look sane (for > this, or any other device), but I haven't had time to investigate...
it's in units/meter (because that's what X uses), so the new entries are 200u/mm which seems sane enough? Cheers, Peter > > src/wcmUSB.c | 5 +++++ > src/wcmValidateDevice.c | 5 +++++ > 2 files changed, 10 insertions(+) > > diff --git a/src/wcmUSB.c b/src/wcmUSB.c > index 2f96a8a..45277c1 100644 > --- a/src/wcmUSB.c > +++ b/src/wcmUSB.c > @@ -295,8 +295,13 @@ static struct WacomModelDesc > { WACOM_VENDOR_ID, 0x34E, 200000, 200000, &usbCintiqV5, "MobileStudio > Pro 16" }, > { WACOM_VENDOR_ID, 0x34F, 200000, 200000, &usbCintiqV5, "Cintiq 13 FHD > Pro" }, > { WACOM_VENDOR_ID, 0x350, 200000, 200000, &usbCintiqV5, "Cintiq 16 UHD > Pro" }, > + { WACOM_VENDOR_ID, 0x351, 200000, 200000, &usbCintiqV5, "Cintiq Pro > 24" }, > + { WACOM_VENDOR_ID, 0x352, 200000, 200000, &usbCintiqV5, "Cintiq Pro > 32" }, > { WACOM_VENDOR_ID, 0x353, 200000, 200000, &usbCintiqV5, "Cintiq 13 FHD > Pro" }, /* Touch */ > { WACOM_VENDOR_ID, 0x354, 200000, 200000, &usbCintiqV5, "Cintiq 16 UHD > Pro" }, /* Touch */ > + { WACOM_VENDOR_ID, 0x355, 200000, 200000, &usbCintiqV5, "Cintiq Pro > 24" }, /* Touch */ > + { WACOM_VENDOR_ID, 0x356, 200000, 200000, &usbCintiqV5, "Cintiq Pro > 32" }, /* Touch */ > + { WACOM_VENDOR_ID, 0x37C, 200000, 200000, &usbCintiqV5, "Cintiq Pro > 24" }, /* Pen-only model */ > > { WACOM_VENDOR_ID, 0x90, 100000, 100000, &usbTabletPC, "TabletPC > 0x90" }, > { WACOM_VENDOR_ID, 0x93, 100000, 100000, &usbTabletPC, "TabletPC > 0x93" }, > diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c > index 21ccd5f..6546f8c 100644 > --- a/src/wcmValidateDevice.c > +++ b/src/wcmValidateDevice.c > @@ -313,6 +313,9 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) > case 0x304:/* Cintiq 13HD */ > case 0x34F:/* Cintiq Pro 13 FHD */ > case 0x350:/* Cintiq Pro 16 UHD */ > + case 0x351:/* Cintiq Pro 24 */ > + case 0x352:/* Cintiq Pro 32 */ > + case 0x37C:/* Cintiq Pro 24 Pen-Only */ > TabletSetFeature(priv->common, WCM_ROTATION); > /* fall-through */ > > @@ -325,6 +328,8 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) > case 0x34B:/* MobileStudio Pro 16 Touch */ > case 0x353:/* Cintiq Pro 13 FHD Touch */ > case 0x354:/* Cintiq Pro 13 UHD Touch */ > + case 0x355:/* Cintiq Pro 24 Touch */ > + case 0x356:/* Cintiq Pro 32 Touch */ > case 0x35A:/* DTH-1152*/ > case 0x368:/* DTH-1152 Touch */ > TabletSetFeature(priv->common, WCM_LCD); > -- > 2.15.1 > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel