From bc5791fa9f63b9de3ab5b8e87db1ec9230c08814 Mon Sep 17 00:00:00 2001
From: Aesara Binder <aesara@mailbox.org>
Date: Fri, 12 Apr 2024 13:01:07 +0930
Subject: [PATCH 1/8] Started work on Kamvas Pro 24 (QHD) tablet definitions

---
 data/huion-kamvas-pro-24.tablet      |  57 +++++++++++++++
 data/layouts/huion-kamvas-pro-24.svg | 104 +++++++++++++++++++++++++++
 2 files changed, 161 insertions(+)
 create mode 100644 data/huion-kamvas-pro-24.tablet
 create mode 100644 data/layouts/huion-kamvas-pro-24.svg

diff --git a/data/huion-kamvas-pro-24.tablet b/data/huion-kamvas-pro-24.tablet
new file mode 100644
index 000000000..76018e5b5
--- /dev/null
+++ b/data/huion-kamvas-pro-24.tablet
@@ -0,0 +1,57 @@
+# Huion
+# Kamvas Pro 24
+# GT-240
+#
+# sysinfo.0LZKOwtz0e.tar.gz
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/351
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+#          *-----------------------*
+#          |                       |
+#    A     |                       |
+#    B     |                       |
+#          |                       |
+#          |        DISPLAY        |
+#          |                       |
+#    C     |                       |
+#    D     |                       |
+#    E     |                       |
+#          *-----------------------*
+#
+# Touch Strip Map:
+# NOTE: not enabled because i couldnt get it to work
+# evtest reports BTN_8, BTN_9, BTN_SOUTH
+#
+#    *-----------------------*
+#    |                       |
+#  A |                       |
+#  a |        DISPLAY        |
+#    |                       |
+#    *-----------------------*
+#
+# Also matches:
+# GAOMON S56K which doesn't have buttons but since HUION re-uses usb IDs
+# there is nothing we can do about this.
+
+[Device]
+Name=Huion Kamvas Pro 24
+ModelName=GT-240
+Class=Cintiq
+DeviceMatch=usb:256c:006e:Tablet Monitor Pen;usb:256c:006e:Tablet Monitor Pad;
+Width=26
+Height=15
+Layout=kamvas-pro-24.svg
+Styli=@generic-no-eraser;
+IntegratedIn=Display
+
+[Features]
+Buttons=20
+Reversible=false
+Ring=false
+Stylus=true
+Touch=true
+
+[Buttons]
+Left=A;B;C;D;E;F;G;H;I;J;K;L;M
+EvdevCodes=BTN_0;BTN_1;BTN_2;BTN_3;BTN_4;BTN_5;BTN_6;BTN_7;BTN_8;BTN_9;BTN_SOUTH;BTN_EAST;BTN_C
diff --git a/data/layouts/huion-kamvas-pro-24.svg b/data/layouts/huion-kamvas-pro-24.svg
new file mode 100644
index 000000000..8f58a199c
--- /dev/null
+++ b/data/layouts/huion-kamvas-pro-24.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg
+   id="cintiq-13hd"
+   width="380"
+   height="250"
+   style="color:#000000;fill:none;font-size:8;stroke:#7f7f7f;stroke-width:.25"
+   version="1.1"
+   xmlns="http://www.w3.org/2000/svg">
+  <title
+     id="title">Huion Kamvas Pro 13</title>
+  <circle
+     id="ButtonA"
+     class="A Button"
+     cx="34"
+     cy="67"
+     r="6.75" />
+  <circle
+     id="DotA"
+     class="A Dot"
+     cx="34"
+     cy="67"
+     r="1" />
+  <path
+     id="LeaderA"
+     class="A Leader"
+     d="m46 68h4" />
+  <text
+     id="LabelA"
+     class="A Label"
+     x="52"
+     y="68">A</text>
+  <circle
+     id="ButtonB"
+     class="B Button"
+     cx="34"
+     cy="86"
+     r="6.75" />
+  <path
+     id="LeaderB"
+     class="B Leader"
+     d="m46 86.5h4" />
+  <text
+     id="LabelB"
+     class="B Label"
+     x="52"
+     y="86.5">B</text>
+  <circle
+     id="ButtonC"
+     class="C Button"
+     cx="34"
+     cy="164.2"
+     r="6.75" />
+  <path
+     id="LeaderC"
+     class="C Leader"
+     d="m46 165h4" />
+  <text
+     id="LabelC"
+     class="C Label"
+     x="52"
+     y="165">C</text>
+  <circle
+     id="ButtonD"
+     class="D Button"
+     cx="34"
+     cy="182.2"
+     r="6.75" />
+  <circle
+     id="DotD"
+     class="D Dot"
+     cx="34"
+     cy="182"
+     r="1" />
+  <path
+     id="LeaderD"
+     class="D Leader"
+     d="m46 183.5h4" />
+  <text
+     id="LabelD"
+     class="D Label"
+     x="52"
+     y="183.5">D</text>
+  <circle
+     id="ButtonE"
+     class="E Button"
+     cx="34.25"
+     cy="204.5"
+     r="8.25" />
+  <path
+     id="DotE"
+     class="E Dot"
+     d="m 32.25,201.5 h 4.25 c 0.4155,0 0.75,0.3345 0.75,0.75 v 4.25 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -4.25 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -4.25 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z" />
+  <path
+     id="LeaderE"
+     class="E Leader"
+     d="m46 205h4" />
+  <text
+     id="LabelE"
+     class="E Label"
+     x="52"
+     y="205">E</text>
+</svg>

From 1b24a3663efd35fb7e889a2cbf419aa6b9db9481 Mon Sep 17 00:00:00 2001
From: Aesara Binder <aesara@mailbox.org>
Date: Mon, 15 Apr 2024 11:15:47 +0930
Subject: [PATCH 2/8] Kamvas Pro 24: Staging commit

---
 data/huion-kamvas-pro-24.tablet | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/data/huion-kamvas-pro-24.tablet b/data/huion-kamvas-pro-24.tablet
index 76018e5b5..ddeff38b7 100644
--- a/data/huion-kamvas-pro-24.tablet
+++ b/data/huion-kamvas-pro-24.tablet
@@ -8,25 +8,27 @@
 # (A=1, B=2, C=3, ...)
 #
 #          *-----------------------*
-#          |                       |
-#    A     |                       |
-#    B     |                       |
-#          |                       |
+#    A     |                       |     K
+#    B     |                       |     L
+#    C     |                       |     M
+#    D     |                       |     N
+#    E     |                       |     O
 #          |        DISPLAY        |
-#          |                       |
-#    C     |                       |
-#    D     |                       |
-#    E     |                       |
+#    F     |                       |     P
+#    G     |                       |     Q
+#    H     |                       |     R
+#    I     |                       |     S
+#    J     |                       |     T
 #          *-----------------------*
 #
 # Touch Strip Map:
-# NOTE: not enabled because i couldnt get it to work
-# evtest reports BTN_8, BTN_9, BTN_SOUTH
+# (A=1st strip, B=2nd strip, ...)
+#
 #
 #    *-----------------------*
 #    |                       |
-#  A |                       |
-#  a |        DISPLAY        |
+#  A |                       | B
+#  a |        DISPLAY        | b
 #    |                       |
 #    *-----------------------*
 #
@@ -38,7 +40,7 @@
 Name=Huion Kamvas Pro 24
 ModelName=GT-240
 Class=Cintiq
-DeviceMatch=usb:256c:006e:Tablet Monitor Pen;usb:256c:006e:Tablet Monitor Pad;
+DeviceMatch=usb:256c:006e:Tablet Monitor Pen;usb:256c:006e:Tablet Monitor Pad;usb:256c:006e:Tablet Monitor Touch Strip;
 Width=26
 Height=15
 Layout=kamvas-pro-24.svg
@@ -50,8 +52,9 @@ Buttons=20
 Reversible=false
 Ring=false
 Stylus=true
-Touch=true
+Touch=false
 
 [Buttons]
-Left=A;B;C;D;E;F;G;H;I;J;K;L;M
+Left=A;B;C;D;E;F;G;H;I;J
+Right=K;L;M
 EvdevCodes=BTN_0;BTN_1;BTN_2;BTN_3;BTN_4;BTN_5;BTN_6;BTN_7;BTN_8;BTN_9;BTN_SOUTH;BTN_EAST;BTN_C

From cc8d36c6b617f7bd4deff819e3a381e8b493893b Mon Sep 17 00:00:00 2001
From: Aesara Binder <aesara@mailbox.org>
Date: Thu, 18 Apr 2024 08:29:18 +0930
Subject: [PATCH 3/8] Kamvas Pro 24: second tablet file draft

---
 data/huion-kamvas-pro-24.tablet | 50 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/data/huion-kamvas-pro-24.tablet b/data/huion-kamvas-pro-24.tablet
index ddeff38b7..4e04a4365 100644
--- a/data/huion-kamvas-pro-24.tablet
+++ b/data/huion-kamvas-pro-24.tablet
@@ -7,54 +7,52 @@
 # Button Map:
 # (A=1, B=2, C=3, ...)
 #
-#          *-----------------------*
-#    A     |                       |     K
-#    B     |                       |     L
-#    C     |                       |     M
-#    D     |                       |     N
-#    E     |                       |     O
-#          |        DISPLAY        |
-#    F     |                       |     P
-#    G     |                       |     Q
-#    H     |                       |     R
-#    I     |                       |     S
-#    J     |                       |     T
-#          *-----------------------*
+#    *-----------------------*
+#  A |                       | K
+#  B |                       | L
+#  C |                       | M
+#  D |                       | N
+#  E |                       | O
+#    |        DISPLAY        |
+#  F |                       | P
+#  G |                       | Q
+#  H |                       | R
+#  I |                       | S
+#  J |                       | T
+#    *-----------------------*
 #
 # Touch Strip Map:
-# (A=1st strip, B=2nd strip, ...)
-#
+# (a=strip min, A=strip max)
+# Touch Strips are mirrored and do not map seperately
 #
 #    *-----------------------*
 #    |                       |
-#  A |                       | B
-#  a |        DISPLAY        | b
+#  A |                       | A
+#  a |        DISPLAY        | a
 #    |                       |
 #    *-----------------------*
 #
-# Also matches:
-# GAOMON S56K which doesn't have buttons but since HUION re-uses usb IDs
-# there is nothing we can do about this.
 
 [Device]
 Name=Huion Kamvas Pro 24
 ModelName=GT-240
 Class=Cintiq
-DeviceMatch=usb:256c:006e:Tablet Monitor Pen;usb:256c:006e:Tablet Monitor Pad;usb:256c:006e:Tablet Monitor Touch Strip;
-Width=26
-Height=15
+DeviceMatch=usb|256c|006e|Tablet Monitor Pen;usb|256c|006e|Tablet Monitor Pad;usb|256c|006e|Tablet Monitor Touch Strip;
+Width=21
+Height=12
 Layout=kamvas-pro-24.svg
 Styli=@generic-no-eraser;
 IntegratedIn=Display
 
 [Features]
-Buttons=20
+NumStrips=1
 Reversible=false
 Ring=false
 Stylus=true
 Touch=false
+TouchSwitch=false
 
 [Buttons]
 Left=A;B;C;D;E;F;G;H;I;J
-Right=K;L;M
-EvdevCodes=BTN_0;BTN_1;BTN_2;BTN_3;BTN_4;BTN_5;BTN_6;BTN_7;BTN_8;BTN_9;BTN_SOUTH;BTN_EAST;BTN_C
+Right=K;L;M;N;O;P;Q;R;S;T
+EvdevCodes=BTN_0;BTN_1;BTN_2;BTN_3;BTN_4;BTN_5;BTN_6;BTN_7;BTN_8;BTN_9;BTN_SOUTH;BTN_EAST;BTN_C;BTN_NORTH;BTN_WEST;BTN_Z;BTN_TL;BTN_TR;BTN_TL2;BTN_TR2

From 1f250c76fe7c2600ea8a81583fb4922ceb7c2059 Mon Sep 17 00:00:00 2001
From: Aesara Binder <aesara@mailbox.org>
Date: Thu, 18 Apr 2024 19:46:24 +0930
Subject: [PATCH 4/8] Kamvas Pro 24: Added firmware version

---
 data/huion-kamvas-pro-24.tablet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/huion-kamvas-pro-24.tablet b/data/huion-kamvas-pro-24.tablet
index 4e04a4365..3b686109f 100644
--- a/data/huion-kamvas-pro-24.tablet
+++ b/data/huion-kamvas-pro-24.tablet
@@ -37,7 +37,7 @@
 Name=Huion Kamvas Pro 24
 ModelName=GT-240
 Class=Cintiq
-DeviceMatch=usb|256c|006e|Tablet Monitor Pen;usb|256c|006e|Tablet Monitor Pad;usb|256c|006e|Tablet Monitor Touch Strip;
+DeviceMatch=usb|256c|006e|Tablet Monitor Pen|HUION_M184;usb|256c|006e|Tablet Monitor Pad|HUION_M184;usb|256c|006e|Tablet Monitor Touch Strip|HUION_M184;
 Width=21
 Height=12
 Layout=kamvas-pro-24.svg

From e29f7be751d5c87f9f4561327994cb4aed64d336 Mon Sep 17 00:00:00 2001
From: Aesara Binder <aesara@mailbox.org>
Date: Thu, 18 Apr 2024 21:23:21 +0930
Subject: [PATCH 5/8] Kamvas Pro 24: Added tablet svg

---
 data/layouts/huion-kamvas-pro-24.svg | 591 ++++++++++++++++++++++-----
 1 file changed, 493 insertions(+), 98 deletions(-)

diff --git a/data/layouts/huion-kamvas-pro-24.svg b/data/layouts/huion-kamvas-pro-24.svg
index 8f58a199c..5e297929e 100644
--- a/data/layouts/huion-kamvas-pro-24.svg
+++ b/data/layouts/huion-kamvas-pro-24.svg
@@ -1,104 +1,499 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?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">
+<!--
+   Designed after data from http://www.wacom.com/~/media/Files/Manuals/Cintiq-22HD-Manual.pdf
+   Size and positions of controls may not be accurate
+ -->
 <svg
-   id="cintiq-13hd"
-   width="380"
-   height="250"
-   style="color:#000000;fill:none;font-size:8;stroke:#7f7f7f;stroke-width:.25"
+   xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   xmlns="http://www.w3.org/2000/svg">
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   id="huion-kamvas-pro-24"
+   width="512"
+   height="288">
   <title
-     id="title">Huion Kamvas Pro 13</title>
-  <circle
-     id="ButtonA"
-     class="A Button"
-     cx="34"
-     cy="67"
-     r="6.75" />
-  <circle
-     id="DotA"
-     class="A Dot"
-     cx="34"
-     cy="67"
-     r="1" />
-  <path
-     id="LeaderA"
-     class="A Leader"
-     d="m46 68h4" />
-  <text
-     id="LabelA"
-     class="A Label"
-     x="52"
-     y="68">A</text>
-  <circle
-     id="ButtonB"
-     class="B Button"
-     cx="34"
-     cy="86"
-     r="6.75" />
-  <path
-     id="LeaderB"
-     class="B Leader"
-     d="m46 86.5h4" />
-  <text
-     id="LabelB"
-     class="B Label"
-     x="52"
-     y="86.5">B</text>
-  <circle
-     id="ButtonC"
-     class="C Button"
-     cx="34"
-     cy="164.2"
-     r="6.75" />
-  <path
-     id="LeaderC"
-     class="C Leader"
-     d="m46 165h4" />
-  <text
-     id="LabelC"
-     class="C Label"
-     x="52"
-     y="165">C</text>
-  <circle
-     id="ButtonD"
-     class="D Button"
-     cx="34"
-     cy="182.2"
-     r="6.75" />
-  <circle
-     id="DotD"
-     class="D Dot"
-     cx="34"
-     cy="182"
-     r="1" />
-  <path
-     id="LeaderD"
-     class="D Leader"
-     d="m46 183.5h4" />
-  <text
-     id="LabelD"
-     class="D Label"
-     x="52"
-     y="183.5">D</text>
-  <circle
-     id="ButtonE"
-     class="E Button"
-     cx="34.25"
-     cy="204.5"
-     r="8.25" />
-  <path
-     id="DotE"
-     class="E Dot"
-     d="m 32.25,201.5 h 4.25 c 0.4155,0 0.75,0.3345 0.75,0.75 v 4.25 c 0,0.4155 -0.3345,0.75 -0.75,0.75 h -4.25 c -0.4155,0 -0.75,-0.3345 -0.75,-0.75 v -4.25 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z" />
-  <path
-     id="LeaderE"
-     class="E Leader"
-     d="m46 205h4" />
-  <text
-     id="LabelE"
-     class="E Label"
-     x="52"
-     y="205">E</text>
+     id="title">Huion Kamvas Pro 24 (GT-240)</title>
+  <g>
+    <rect
+       id="ButtonA"
+       class="A Button"
+       rx=".5"
+       ry=".5"
+       x="4"
+       y="35"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderA"
+       class="A Leader"
+       d="M 26 40 l 24 0" />
+    <text
+       id="LabelA"
+       class="A Label"
+       x="54"
+       y="40"
+       style="text-anchor:start;">A</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonB"
+       class="B Button"
+       rx=".5"
+       ry=".5"
+       x="4"
+       y="50"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderB"
+       class="B Leader"
+       d="M 26 55 l 24 0" />
+    <text
+       id="LabelB"
+       class="B Label"
+       x="54"
+       y="55"
+       style="text-anchor:start;">B</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonC"
+       class="C Button"
+       rx=".5"
+       ry=".5"
+       x="4"
+       y="65"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderC"
+       class="C Leader"
+       d="M 26 70 l 24 0" />
+    <text
+       id="LabelC"
+       class="C Label"
+       x="54"
+       y="70"
+       style="text-anchor:start;">C</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonD"
+       class="D Button"
+       rx=".5"
+       ry=".5"
+       x="4"
+       y="80"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderD"
+       class="D Leader"
+       d="M 26 85 l 24 0" />
+    <text
+       id="LabelD"
+       class="D Label"
+       x="54"
+       y="85"
+       style="text-anchor:start;">D</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonE"
+       class="E Button"
+       rx=".5"
+       ry=".5"
+       x="4"
+       y="95"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderE"
+       class="E Leader"
+       d="M 26 100 l 25 0" />
+    <text
+       id="LabelE"
+       class="E Label"
+       x="54"
+       y="100"
+       style="text-anchor:start;">E</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonF"
+       class="F Button"
+       rx=".5"
+       ry=".5"
+       x="4"
+       y="186"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderF"
+       class="F Leader"
+       d="M 26 191 l 24 0" />
+    <text
+       id="LabelF"
+       class="F Label"
+       x="54"
+       y="191"
+       style="text-anchor:start;">F</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonG"
+       class="G Button"
+       rx=".5"
+       ry=".5"
+       x="4"
+       y="201"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderG"
+       class="G Leader"
+       d="M 26 206 l 24 0" />
+    <text
+       id="LabelG"
+       class="G Label"
+       x="54"
+       y="206"
+       style="text-anchor:start;">G</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonH"
+       class="H Button"
+       rx=".5"
+       ry=".5"
+       x="4"
+       y="216"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderH"
+       class="H Leader"
+       d="M 26 221 l 24 0" />
+    <text
+       id="LabelH"
+       class="H Label"
+       x="54"
+       y="221"
+       style="text-anchor:start;">H</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonI"
+       class="I Button"
+       rx=".5"
+       ry=".5"
+       x="4"
+       y="231"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderI"
+       class="I Leader"
+       d="M 26 236 l 24 0" />
+    <text
+       id="LabelI"
+       class="I Label"
+       x="54"
+       y="236"
+       style="text-anchor:start;">I</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonJ"
+       class="J Button"
+       rx=".5"
+       ry=".5"
+       x="4"
+       y="246"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderJ"
+       class="J Leader"
+       d="M 26 251 l 24 0" />
+    <text
+       id="LabelJ"
+       class="J Label"
+       x="54"
+       y="251"
+       style="text-anchor:start;">J</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonK"
+       class="K Button"
+       rx=".5"
+       ry=".5"
+       x="490"
+       y="35"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderK"
+       class="K Leader"
+       d="M 486 40 l -24 0" />
+    <text
+       id="LabelK"
+       class="K Label"
+       x="458"
+       y="40"
+       style="text-anchor:end;">K</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonL"
+       class="L Button"
+       rx=".5"
+       ry=".5"
+       x="490"
+       y="50"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderL"
+       class="L Leader"
+       d="M 486 55 l -24 0" />
+    <text
+       id="LabelL"
+       class="L Label"
+       x="458"
+       y="55"
+       style="text-anchor:end;">L</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonM"
+       class="M Button"
+       rx=".5"
+       ry=".5"
+       x="490"
+       y="65"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderM"
+       class="M Leader"
+       d="M 486 70 l -24 0" />
+    <text
+       id="LabelM"
+       class="M Label"
+       x="458"
+       y="70"
+       style="text-anchor:end;">M</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonN"
+       class="N Button"
+       rx=".5"
+       ry=".5"
+       x="490"
+       y="80"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderN"
+       class="N Leader"
+       d="M 486 85 l -24 0" />
+    <text
+       id="LabelN"
+       class="N Label"
+       x="458"
+       y="85"
+       style="text-anchor:end;">N</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonO"
+       class="O Button"
+       rx=".5"
+       ry=".5"
+       x="490"
+       y="95"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderO"
+       class="O Leader"
+       d="M 486 100 l -25 0" />
+    <text
+       id="LabelO"
+       class="J Label"
+       x="458"
+       y="100"
+       style="text-anchor:end;">O</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonP"
+       class="P Button"
+       rx=".5"
+       ry=".5"
+       x="490"
+       y="186"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderP"
+       class="P Leader"
+       d="M 486 191 l -24 0" />
+    <text
+       id="LabelP"
+       class="P Label"
+       x="458"
+       y="191"
+       style="text-anchor:end;">P</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonQ"
+       class="Q Button"
+       rx=".5"
+       ry=".5"
+       x="490"
+       y="201"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderQ"
+       class="Q Leader"
+       d="M 486 206 l -24 0" />
+    <text
+       id="LabelQ"
+       class="P Label"
+       x="458"
+       y="206"
+       style="text-anchor:end;">Q</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonR"
+       class="R Button"
+       rx=".5"
+       ry=".5"
+       x="490"
+       y="216"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderR"
+       class="R Leader"
+       d="M 486 221 l -24 0" />
+    <text
+       id="LabelR"
+       class="R Label"
+       x="458"
+       y="221"
+       style="text-anchor:end;">R</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonS"
+       class="S Button"
+       rx=".5"
+       ry=".5"
+       x="490"
+       y="231"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderS"
+       class="S Leader"
+       d="M 486 236 l -24 0" />
+    <text
+       id="LabelS"
+       class="S Label"
+       x="458"
+       y="236"
+       style="text-anchor:end;">S</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonT"
+       class="T Button"
+       rx=".5"
+       ry=".5"
+       x="490"
+       y="246"
+       width="18"
+       height="10" />
+    <path
+       id="LeaderT"
+       class="T Leader"
+       d="M 486 251 l -24 0" />
+    <text
+       id="LabelT"
+       class="T Label"
+       x="458"
+       y="251"
+       style="text-anchor:end;">T</text>
+  </g>
+  <g>
+    <rect
+       id="Strip"
+       class="Strip TouchStrip"
+       x="7"
+       y="118"
+       rx="6"
+       ry="6"
+       width="12"
+       height="55" />
+    <path
+       id="LeaderStripUp"
+       class="StripUp Strip Leader"
+       d="M 24 123 l 24 0" />
+    <text
+       id="LabelStripUp"
+       class="StripUp Strip Label"
+       x="54"
+       y="123"
+       style="text-anchor:start;">Up</text>
+    <path
+       id="LeaderStripDown"
+       class="StripDown Strip Leader"
+       d="M 24 168 l 24 0" />
+    <text
+       id="LabelStripDown"
+       class="StripDown Strip Label"
+       x="54"
+       y="168"
+       style="text-anchor:start;">Down</text>
+  </g>
+  <!--<g> Touch strip is duplicated
+    <rect
+       id="Strip2"
+       class="Strip2 TouchStrip"
+       x="493"
+       y="118"
+       rx="6"
+       ry="6"
+       width="12"
+       height="55" />
+    <path
+       id="LeaderStrip2Up"
+       class="Strip2Up Strip2 Leader"
+       d="M 486 123 l -24 0" />
+    <text
+       id="LabelStrip2Up"
+       class="Strip2Up Strip2 Label"
+       x="458"
+       y="123"
+       style="text-anchor:end;">Up</text>
+    <path
+       id="LeaderStrip2Down"
+       class="Strip2Down Strip2 Leader"
+       d="M 486 168 l -24 0" />
+    <text
+       id="LabelStrip2Down"
+       class="Strip2Down Strip2 Label"
+       x="458"
+       y="168"
+       style="text-anchor:end;">Down</text>
+  </g>-->
 </svg>

From 969149681df2ed6bb0a6fda04291466dd48f055c Mon Sep 17 00:00:00 2001
From: Aesara Binder <aesara@mailbox.org>
Date: Fri, 19 Apr 2024 12:58:31 +0930
Subject: [PATCH 6/8] Kamvas Pro 24:svg: Removed comment from ancestor file

---
 data/layouts/huion-kamvas-pro-24.svg | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/data/layouts/huion-kamvas-pro-24.svg b/data/layouts/huion-kamvas-pro-24.svg
index 5e297929e..da786beea 100644
--- a/data/layouts/huion-kamvas-pro-24.svg
+++ b/data/layouts/huion-kamvas-pro-24.svg
@@ -1,10 +1,6 @@
 <?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">
-<!--
-   Designed after data from http://www.wacom.com/~/media/Files/Manuals/Cintiq-22HD-Manual.pdf
-   Size and positions of controls may not be accurate
- -->
 <svg
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"

From d61445f38f65e27af6c0489cf31a76ccdc95ce0a Mon Sep 17 00:00:00 2001
From: Aesara Binder <aesara@mailbox.org>
Date: Fri, 19 Apr 2024 12:58:52 +0930
Subject: [PATCH 7/8] Kamvas Pro 24:svg: Fixed class typos

---
 data/layouts/huion-kamvas-pro-24.svg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/layouts/huion-kamvas-pro-24.svg b/data/layouts/huion-kamvas-pro-24.svg
index da786beea..d4edc58f5 100644
--- a/data/layouts/huion-kamvas-pro-24.svg
+++ b/data/layouts/huion-kamvas-pro-24.svg
@@ -320,7 +320,7 @@
        d="M 486 100 l -25 0" />
     <text
        id="LabelO"
-       class="J Label"
+       class="O Label"
        x="458"
        y="100"
        style="text-anchor:end;">O</text>
@@ -362,7 +362,7 @@
        d="M 486 206 l -24 0" />
     <text
        id="LabelQ"
-       class="P Label"
+       class="Q Label"
        x="458"
        y="206"
        style="text-anchor:end;">Q</text>

From bff8ea2e892d225d47e898963bd3ec5ffe972794 Mon Sep 17 00:00:00 2001
From: Aesara Binder <aesara@mailbox.org>
Date: Fri, 19 Apr 2024 13:04:44 +0930
Subject: [PATCH 8/8] Kamvas Pro 24: Corrected name of layout file

---
 data/huion-kamvas-pro-24.tablet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/huion-kamvas-pro-24.tablet b/data/huion-kamvas-pro-24.tablet
index 3b686109f..611a2df32 100644
--- a/data/huion-kamvas-pro-24.tablet
+++ b/data/huion-kamvas-pro-24.tablet
@@ -40,7 +40,7 @@ Class=Cintiq
 DeviceMatch=usb|256c|006e|Tablet Monitor Pen|HUION_M184;usb|256c|006e|Tablet Monitor Pad|HUION_M184;usb|256c|006e|Tablet Monitor Touch Strip|HUION_M184;
 Width=21
 Height=12
-Layout=kamvas-pro-24.svg
+Layout=huion-kamvas-pro-24.svg
 Styli=@generic-no-eraser;
 IntegratedIn=Display