On Thu, Oct 18, 2012 at 01:31:46PM -0700, Jason Gerecke wrote:
> Adds support for the EMR and touch digitizers on the Cintiq 24HD
> touch. The digitizers are on separate USB devices, which can lead to
> the cursor jumping back and forth between the stylus and finger.
> Performing arbitration between the two (disabling finger while pen is in
> proximity) is expected to be handled by the kernel driver.
>
> Signed-off-by: Jason Gerecke <killert...@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
Cheers,
Peter
> ---
> src/wcmUSB.c | 1 +
> src/wcmValidateDevice.c | 2 ++
> 2 files changed, 3 insertions(+)
>
> diff --git a/src/wcmUSB.c b/src/wcmUSB.c
> index f90def9..4eb15d4 100644
> --- a/src/wcmUSB.c
> +++ b/src/wcmUSB.c
> @@ -278,6 +278,7 @@ static struct
> { WACOM_VENDOR_ID, 0xCC, 200000, 200000, &usbCintiqV5 }, /* Cintiq
> 21UX2 */
> { WACOM_VENDOR_ID, 0xF4, 200000, 200000, &usbCintiqV5 }, /* Cintiq
> 24HD */
> { WACOM_VENDOR_ID, 0xFA, 200000, 200000, &usbCintiqV5 }, /* Cintiq
> 22HD */
> + { WACOM_VENDOR_ID, 0xF8, 200000, 200000, &usbCintiqV5 }, /* Cintiq
> 24HD touch (EMR digitizer) */
>
> { 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 1d09102..658092b 100644
> --- a/src/wcmValidateDevice.c
> +++ b/src/wcmValidateDevice.c
> @@ -189,6 +189,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
>
> switch (priv->common->tablet_id)
> {
> + case 0xF8: /* Cintiq 24HDT */
> case 0xF4: /* Cintiq 24HD */
> TabletSetFeature(priv->common, WCM_DUALRING | WCM_LCD);
> /* fall through */
> @@ -279,6 +280,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
> break;
>
> case 0x9F:
> + case 0xF6: /* Cintiq 24HDT Touch */
> TabletSetFeature(priv->common, WCM_LCD);
> break;
> }
> --
> 1.7.12.2
>
>
> ------------------------------------------------------------------------------
> Everyone hates slow websites. So do we.
> Make your web apps faster with AppDynamics
> Download AppDynamics Lite for free today:
> http://p.sf.net/sfu/appdyn_sfd2d_oct
> _______________________________________________
> Linuxwacom-devel mailing list
> Linuxwacom-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
