[Linuxwacom-devel] [PATCH libwacom] Add data files for Cintiq 27QHD and 27QHD touch

2015-03-04 Thread Ping Cheng
Signed-off-by: Ping Cheng pi...@wacom.com
---
 data/cintiq-27hd.tablet  | 21 +
 data/cintiq-27hdt.tablet | 22 ++
 2 files changed, 43 insertions(+)
 create mode 100644 data/cintiq-27hd.tablet
 create mode 100644 data/cintiq-27hdt.tablet

diff --git a/data/cintiq-27hd.tablet b/data/cintiq-27hd.tablet
new file mode 100644
index 000..9ed2325
--- /dev/null
+++ b/data/cintiq-27hd.tablet
@@ -0,0 +1,21 @@
+# Wacom
+# Cintiq 27QHD
+# DTK-2700
+#
+
+[Device]
+Name=Wacom Cintiq 27QHD
+DeviceMatch=usb:056a:032a
+Class=Cintiq
+Width=24
+Height=12
+Styli=0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a;
+IntegratedIn=Display
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=false
+Buttons=0
+Ring=false
+Ring2=false
diff --git a/data/cintiq-27hdt.tablet b/data/cintiq-27hdt.tablet
new file mode 100644
index 000..9565bc8
--- /dev/null
+++ b/data/cintiq-27hdt.tablet
@@ -0,0 +1,22 @@
+# Wacom
+# Cintiq 27QHD touch
+# DTH-2700
+#
+# Note: touch data comes through the usb:056a:032c interface
+
+[Device]
+Name=Wacom Cintiq 27QHD touch
+DeviceMatch=usb:056a:032b
+Class=Cintiq
+Width=24
+Height=12
+Styli=0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a;
+IntegratedIn=Display
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=true
+Buttons=0
+Ring=false
+Ring2=false
-- 
1.9.1


--
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel


Re: [Linuxwacom-devel] [PATCH libwacom] data: add Distance to the axes reported by the mice/lens cursors

2015-03-04 Thread Ping Cheng
On Sun, Mar 1, 2015 at 10:55 PM, Peter Hutterer
peter.hutte...@who-t.net wrote:
 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
 ---
 Not sure about the Intuos 1, 2, and 3 devices here, but I just assumed
 they'll do distance too.

Yes, all pucks report distance.

Reviewed-by: Ping Cheng pi...@wacom.com

Ping

  data/libwacom.stylus | 14 +++---
  1 file changed, 7 insertions(+), 7 deletions(-)

 diff --git a/data/libwacom.stylus b/data/libwacom.stylus
 index ca4ae6b..3a59a9d 100644
 --- a/data/libwacom.stylus
 +++ b/data/libwacom.stylus
 @@ -377,7 +377,7 @@ Type=Airbrush
  [0x096]
  # Intuos and Intuos2
  Name=Lens Cursor
 -Axes=Tilt;
 +Axes=Tilt;Distance;
  Type=Puck
  HasLens=true
  HasWheel=false
 @@ -386,7 +386,7 @@ Buttons=5
  [0x097]
  # Intuos3
  Name=Lens Cursor
 -Axes=Tilt;
 +Axes=Tilt;Distance;
  Type=Puck
  HasLens=true
  HasWheel=false
 @@ -395,7 +395,7 @@ Buttons=5
  [0x006]
  # Intuos4 and Intuos5
  Name=Lens Cursor
 -Axes=Tilt;
 +Axes=Tilt;Distance;
  Type=Puck
  HasLens=true
  HasWheel=false
 @@ -404,7 +404,7 @@ Buttons=5
  [0x094]
  # Intuos and Intuos2
  Name=4D Mouse
 -Axes=Tilt;
 +Axes=Tilt;Distance;
  Type=Puck
  HasLens=false
  HasWheel=false
 @@ -413,7 +413,7 @@ Buttons=5
  [0x007]
  # Intuos3
  Name=2D Mouse
 -Axes=Tilt;
 +Axes=Tilt;Distance;
  Type=Puck
  HasLens=false
  HasWheel=true
 @@ -422,7 +422,7 @@ Buttons=3
  [0x017]
  # Intuos3
  Name=Mouse
 -Axes=Tilt;
 +Axes=Tilt;Distance;
  Type=Puck
  HasLens=false
  HasWheel=true
 @@ -431,7 +431,7 @@ Buttons=5
  [0x806]
  # Intuos4 and Intuos5
  Name=Five Button Mouse
 -Axes=Tilt;
 +Axes=Tilt;Distance;
  Type=Puck
  HasLens=false
  HasWheel=true
 --
 2.1.0


 --
 Dive into the World of Parallel Programming The Go Parallel Website, sponsored
 by Intel and developed in partnership with Slashdot Media, is your hub for all
 things parallel software development, from weekly thought leadership blogs to
 news, videos, case studies, tutorials and more. Take a look and join the
 conversation now. http://goparallel.sourceforge.net/
 ___
 Linuxwacom-devel mailing list
 Linuxwacom-devel@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

--
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel


Re: [Linuxwacom-devel] [PATCH libwacom] Add data files for Cintiq 27QHD and 27QHD touch

2015-03-04 Thread Peter Hutterer
On Wed, Mar 04, 2015 at 12:34:02PM -0800, Ping Cheng wrote:
 Signed-off-by: Ping Cheng pi...@wacom.com

merged, thanks.

Cheers,
   Peter

 ---
  data/cintiq-27hd.tablet  | 21 +
  data/cintiq-27hdt.tablet | 22 ++
  2 files changed, 43 insertions(+)
  create mode 100644 data/cintiq-27hd.tablet
  create mode 100644 data/cintiq-27hdt.tablet
 
 diff --git a/data/cintiq-27hd.tablet b/data/cintiq-27hd.tablet
 new file mode 100644
 index 000..9ed2325
 --- /dev/null
 +++ b/data/cintiq-27hd.tablet
 @@ -0,0 +1,21 @@
 +# Wacom
 +# Cintiq 27QHD
 +# DTK-2700
 +#
 +
 +[Device]
 +Name=Wacom Cintiq 27QHD
 +DeviceMatch=usb:056a:032a
 +Class=Cintiq
 +Width=24
 +Height=12
 +Styli=0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a;
 +IntegratedIn=Display
 +
 +[Features]
 +Stylus=true
 +Reversible=false
 +Touch=false
 +Buttons=0
 +Ring=false
 +Ring2=false
 diff --git a/data/cintiq-27hdt.tablet b/data/cintiq-27hdt.tablet
 new file mode 100644
 index 000..9565bc8
 --- /dev/null
 +++ b/data/cintiq-27hdt.tablet
 @@ -0,0 +1,22 @@
 +# Wacom
 +# Cintiq 27QHD touch
 +# DTH-2700
 +#
 +# Note: touch data comes through the usb:056a:032c interface
 +
 +[Device]
 +Name=Wacom Cintiq 27QHD touch
 +DeviceMatch=usb:056a:032b
 +Class=Cintiq
 +Width=24
 +Height=12
 +Styli=0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a;
 +IntegratedIn=Display
 +
 +[Features]
 +Stylus=true
 +Reversible=false
 +Touch=true
 +Buttons=0
 +Ring=false
 +Ring2=false
 -- 
 1.9.1
 
 
 --
 Dive into the World of Parallel Programming The Go Parallel Website, sponsored
 by Intel and developed in partnership with Slashdot Media, is your hub for all
 things parallel software development, from weekly thought leadership blogs to
 news, videos, case studies, tutorials and more. Take a look and join the 
 conversation now. http://goparallel.sourceforge.net/
 ___
 Linuxwacom-devel mailing list
 Linuxwacom-devel@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
 

--
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel