From 3d21219a9eba6ee8166ca0930bfd1e94b324b56e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 13 May 2024 18:17:57 +1000
Subject: [PATCH] data: fix tablet file for the Huion Inspiroy 2S (#686)

---
 data/huion-inspiroy-2-s---h641p.tablet      |  49 +++-
 data/layouts/huion-inspiroy-2-s---h641p.svg | 301 ++++++++++++++------
 2 files changed, 249 insertions(+), 101 deletions(-)

diff --git a/data/huion-inspiroy-2-s---h641p.tablet b/data/huion-inspiroy-2-s---h641p.tablet
index 5d9a4ffb..28add042 100644
--- a/data/huion-inspiroy-2-s---h641p.tablet
+++ b/data/huion-inspiroy-2-s---h641p.tablet
@@ -1,25 +1,50 @@
-# This tablet description file has been generated using an automated tool:
-# https://github.com/JoseExposito/uclogic-libwacom-tablet-descriptions
-# If you own this tablet, please improve it.
+# Huion
+# Inspiroy 2S
+# H641
 #
-# sysinfo missing - if you own this device please provide it. See this link
-# for details: https://github.com/linuxwacom/libwacom/wiki/Adding-a-new-device
+# sysinfo.25eW86cnXE.tar.gz
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/379
+#
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+#    +----------------------------------+
+#    |                                  |
+#  A |                                  |
+#  B |                                  |
+#  C |                                  |
+#    |                                  |
+#    |                                  |
+#  D |                                  |
+#  E |                                  |
+#  F |                                  |
+#    |                                  |
+#    +----------------------------------+
+#
+# Dial Map:
+# (A=1st ring, B=2nd ring, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  A |        TABLET         |
+#    |                       |
+#    *-----------------------*
 
 [Device]
-Name=Inspiroy 2 S - H641P
-ModelName=Inspiroy 2 S - H641P
+Name=Inspiroy 2 S
+ModelName=H641P
 Class=Bamboo
-# Product ID is unknown, please fix
-DeviceMatch=usb|256c|006e||HUION_T21j;usb|256c|006d||HUION_T21j;usb|256c|006f||HUION_T21j;usb|256c|0064||HUION_T21j;
-Width=9  # autogenerated value, please fix
-Height=6  # autogenerated value, please fix
+DeviceMatch=usb|256c|0066||HUION_T21j;
+Width=6
+Height=4
 Layout=huion-inspiroy-2-s---h641p.svg
 Styli=@generic-no-eraser;
 IntegratedIn=
 
 [Features]
-NumStrips=1
+NumStrips=0
 NumRings=0
+NumDials=1
 Reversible=true
 Stylus=true
 Touch=false
diff --git a/data/layouts/huion-inspiroy-2-s---h641p.svg b/data/layouts/huion-inspiroy-2-s---h641p.svg
index fe3a3fb4..b7dfb1ae 100644
--- a/data/layouts/huion-inspiroy-2-s---h641p.svg
+++ b/data/layouts/huion-inspiroy-2-s---h641p.svg
@@ -1,90 +1,213 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg"
-        version="1.1"
-        style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
-        id="huion-inspiroy-2-s---h641p"
-        width="688"
-        height="424">
-    <title id="title">Inspiroy 2 S - H641P</title>
-    <rect x="185" y="73" width="442" height="277" />
-
-            <g>
-                <rect id="ButtonA"
-                      class="A Button"
-                      x="49"
-                      y="34"
-                      width="45"
-                      height="30" />
-                <text id="LabelA"
-                      class="A Label"
-                      x="69.5"
-                      y="51"
-                      style="text-anchor:start;">A</text>
-            </g>,
-            <g>
-                <rect id="ButtonB"
-                      class="B Button"
-                      x="49"
-                      y="81"
-                      width="45"
-                      height="30" />
-                <text id="LabelB"
-                      class="B Label"
-                      x="69.5"
-                      y="98"
-                      style="text-anchor:start;">B</text>
-            </g>,
-            <g>
-                <rect id="ButtonC"
-                      class="C Button"
-                      x="49"
-                      y="128"
-                      width="45"
-                      height="30" />
-                <text id="LabelC"
-                      class="C Label"
-                      x="69.5"
-                      y="145"
-                      style="text-anchor:start;">C</text>
-            </g>,
-            <g>
-                <rect id="ButtonD"
-                      class="D Button"
-                      x="49"
-                      y="265"
-                      width="45"
-                      height="30" />
-                <text id="LabelD"
-                      class="D Label"
-                      x="69.5"
-                      y="282"
-                      style="text-anchor:start;">D</text>
-            </g>,
-            <g>
-                <rect id="ButtonE"
-                      class="E Button"
-                      x="49"
-                      y="312"
-                      width="45"
-                      height="30" />
-                <text id="LabelE"
-                      class="E Label"
-                      x="69.5"
-                      y="329"
-                      style="text-anchor:start;">E</text>
-            </g>,
-            <g>
-                <rect id="ButtonF"
-                      class="F Button"
-                      x="49"
-                      y="359"
-                      width="45"
-                      height="30" />
-                <text id="LabelF"
-                      class="F Label"
-                      x="69.5"
-                      y="376"
-                      style="text-anchor:start;">F</text>
-            </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   id="huion-inspiroy-2-s---h641p"
+   width="688"
+   height="424"
+   sodipodi:docname="huion-inspiroy-2-s---h641p.svg"
+   inkscape:version="1.5-dev (afb39433d1, 2024-05-12)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs6" />
+<sodipodi:namedview
+   id="namedview6"
+   pagecolor="#ffffff"
+   bordercolor="#000000"
+   borderopacity="0.25"
+   inkscape:showpageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"
+   showgrid="false"
+   showguides="true"
+   inkscape:zoom="6.8066038"
+   inkscape:cx="174.02218"
+   inkscape:cy="314.62093"
+   inkscape:window-width="3072"
+   inkscape:window-height="1696"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="huion-inspiroy-2-s---h641p">
+  <sodipodi:guide
+     position="72.101404,226.00524"
+     orientation="1,0"
+     id="guide9"
+     inkscape:locked="false" />
+</sodipodi:namedview>
+<title
+   id="title">Inspiroy 2 S - H641P</title>
+<rect
+   x="185"
+   y="73"
+   width="442"
+   height="277"
+   id="rect1" />
+<rect
+   id="ButtonA"
+   class="A Button"
+   x="49"
+   y="34"
+   width="45"
+   height="30" />
+<text
+   id="LabelA"
+   class="A Label"
+   x="115.5"
+   y="51"
+   style="text-anchor:start">A</text>
+,
+            <rect
+   id="ButtonB"
+   class="B Button"
+   x="49"
+   y="81"
+   width="45"
+   height="30" />
+<text
+   id="LabelB"
+   class="B Label"
+   x="115.5"
+   y="98"
+   style="text-anchor:start">B</text>
+,
+            <rect
+   id="ButtonC"
+   class="C Button"
+   x="49"
+   y="128"
+   width="45"
+   height="30" />
+<text
+   id="LabelC"
+   class="C Label"
+   x="115.5"
+   y="145"
+   style="text-anchor:start">C</text>
+,
+            <rect
+   id="ButtonD"
+   class="D Button"
+   x="49"
+   y="265"
+   width="45"
+   height="30" />
+<text
+   id="LabelD"
+   class="D Label"
+   x="115.5"
+   y="282"
+   style="text-anchor:start">D</text>
+,
+            <rect
+   id="ButtonE"
+   class="E Button"
+   x="49"
+   y="312"
+   width="45"
+   height="30" />
+<text
+   id="LabelE"
+   class="E Label"
+   x="115.5"
+   y="329"
+   style="text-anchor:start">E</text>
+,
+            <rect
+   id="ButtonF"
+   class="F Button"
+   x="49"
+   y="359"
+   width="45"
+   height="30" />
+<text
+   id="LabelF"
+   class="F Label"
+   x="115.5"
+   y="376"
+   style="text-anchor:start">F</text>
+<rect
+   style="fill:none"
+   id="rect6"
+   width="71.107414"
+   height="27.032572"
+   x="35.946293"
+   y="198.33681"
+   ry="3.4251668"
+   rx="3.1165621" />
+<path
+   id="LeaderDialCCW"
+   class="DialCCW Dial Leader"
+   d="M 87.116505,189.14918 V 187.1991 H 139.33177"
+   style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.349836" />
+<path
+   id="DialArrowUp"
+   class="DialCCW Button"
+   d="m 86.936266,207.95518 1.5,3 h -1 a 7.5,7.5 0 0 1 -1.5,5 6.5,6.5 0 0 0 0.5,-5 h -1 z"
+   style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+<path
+   id="DialArrowDown"
+   class="DialCCW Button"
+   d="m 55.16357,215.75101 -1.5,-3 h 1 a 7.5,7.5 0 0 1 1.5,-5 6.5,6.5 0 0 0 -0.5,5 h 1 z"
+   style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+<path
+   id="LeaderDialCW"
+   class="DialCW Dial Leader"
+   d="m 55.414901,233.17455 v 1.90472 h 84.779479"
+   style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.440553" />
+<text
+   id="LabelDialCCW"
+   class="DialCCW Dial Label"
+   x="152.79242"
+   y="189.8886"
+   style="color:#000000;font-size:8px;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">Up</text>
+<text
+   id="LabelDialCW"
+   class="DialCW Dial Label"
+   x="147.37643"
+   y="237.93018"
+   style="color:#000000;font-size:8px;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">Down</text>
+<rect
+   style="fill:none"
+   id="Dial"
+   class="Dial TouchDial"
+   width="71.107414"
+   height="27.032572"
+   x="35.946293"
+   y="198.33681"
+   ry="3.4251668"
+   rx="3.1165621" />
+<path
+   id="LeaderA"
+   class="A Leader"
+   d="m 101,48.086146 h 4"
+   style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+<path
+   id="LeaderB"
+   class="B Leader"
+   d="m 101,95.125 h 4"
+   style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+<path
+   id="LeaderC"
+   class="C Leader"
+   d="m 101,142.30033 h 4"
+   style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+<path
+   id="LeaderD"
+   class="D Leader"
+   d="m 101,279.4084 h 4"
+   style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+<path
+   id="LeaderE"
+   class="E Leader"
+   d="m 101,326.0065 h 4"
+   style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+<path
+   id="LeaderF"
+   class="F Leader"
+   d="m 101,372.30033 h 4"
+   style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
 </svg>