Merge pull request #1 from Kuuuube/backport_deco_xlw

Backport deco xlw

Author: CG-GeisT

OpenTabletDriver.Configurations/Configurations/XP-Pen/Artist Pro 16 (Gen2).json

@@ -0,0 +1,39 @@
+{
+  "Name": "XP-Pen Artist Pro 16 (Gen2)",
+  "Specifications": {
+    "Digitizer": {
+      "Width": 344.68,
+      "Height": 215.42,
+      "MaxX": 68920,
+      "MaxY": 43078
+    },
+    "Pen": {
+      "MaxPressure": 16383,
+      "Buttons": {
+          "ButtonCount": 2
+      }
+    },
+    "AuxiliaryButtons": null,
+    "MouseButtons": null,
+    "Touch": null
+  },
+  "DigitizerIdentifiers": [
+    {
+    "VendorID": 10429,
+    "ProductID": 2395,
+    "InputReportLength": 14,
+    "OutputReportLength": 14,
+    "ReportParser": "OpenTabletDriver.Configurations.Parsers.XP_Pen.XP_PenGen2ReportParser",
+    "FeatureInitReport": null,
+    "OutputInitReport": [
+      "ArAE"
+    ],
+    "DeviceStrings": {},
+    "InitializationStrings": []
+  }
+  ],
+  "AuxilaryDeviceIdentifiers": [],
+  "Attributes": {
+    "libinputoverride": "1"
+  }
+}

OpenTabletDriver.Configurations/Configurations/XP-Pen/Deco Pro LW Gen2.json

@@ -0,0 +1,39 @@
+{
+  "Name": "XP-Pen Deco Pro LW Gen2",
+  "Specifications": {
+    "Digitizer": {
+      "Width": 278.99,
+      "Height": 173.99,
+      "MaxX": 55798,
+      "MaxY": 34798
+    },
+    "Pen": {
+      "MaxPressure": 16383,
+      "Buttons": {
+        "ButtonCount": 2
+      }
+    },
+    "AuxiliaryButtons": null,
+    "MouseButtons": null,
+    "Touch": null
+  },
+  "DigitizerIdentifiers": [
+    {
+      "VendorID": 10429,
+      "ProductID": 2371,
+      "InputReportLength": 14,
+      "OutputReportLength": 14,
+      "ReportParser": "OpenTabletDriver.Configurations.Parsers.XP_Pen.XP_PenGen2ReportParser",
+      "FeatureInitReport": null,
+      "OutputInitReport": [
+        "ArAE"
+      ],
+      "DeviceStrings": {},
+      "InitializationStrings": []
+    }
+  ],
+  "AuxilaryDeviceIdentifiers": [],
+  "Attributes": {
+    "libinputoverride": "1"
+  }
+}

OpenTabletDriver.Configurations/Configurations/XP-Pen/Deco Pro XLW Gen2.json

@@ -0,0 +1,39 @@
+{
+  "Name": "XP-Pen Deco Pro XLW Gen2",
+  "Specifications": {
+    "Digitizer": {
+      "Width": 381,
+      "Height": 229.005,
+      "MaxX": 76200,
+      "MaxY": 45801
+    },
+    "Pen": {
+      "MaxPressure": 16383,
+      "Buttons": {
+        "ButtonCount": 2
+      }
+    },
+    "AuxiliaryButtons": null,
+    "MouseButtons": null,
+    "Touch": null
+  },
+  "DigitizerIdentifiers": [
+    {
+      "VendorID": 10429,
+      "ProductID": 2372,
+      "InputReportLength": 14,
+      "OutputReportLength": 14,
+      "ReportParser": "OpenTabletDriver.Configurations.Parsers.XP_Pen.XP_PenGen2ReportParser",
+      "FeatureInitReport": null,
+      "OutputInitReport": [
+        "ArAE"
+      ],
+      "DeviceStrings": {},
+      "InitializationStrings": []
+    }
+  ],
+  "AuxilaryDeviceIdentifiers": [],
+  "Attributes": {
+    "libinputoverride": "1"
+  }
+}

OpenTabletDriver.Configurations/Parsers/XP_Pen/XP_PenGen2ReportParser.cs

@@ -0,0 +1,16 @@
+using OpenTabletDriver.Plugin.Tablet;
+
+namespace OpenTabletDriver.Configurations.Parsers.XP_Pen
+{
+    public class XP_PenGen2ReportParser : IReportParser<IDeviceReport>
+    {
+        public IDeviceReport Parse(byte[] report)
+        {
+            if (report[1] == 0xC0)
+                return new OutOfRangeReport(report);
+            if ((report[1] & 0xF0) == 0xA0)
+                return new XP_PenTabletGen2Report(report);
+            return new DeviceReport(report);
+        }
+    }
+}

OpenTabletDriver.Configurations/Parsers/XP_Pen/XP_PenTabletGen2Report.cs

@@ -0,0 +1,41 @@
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using OpenTabletDriver.Plugin.Tablet;
+
+namespace OpenTabletDriver.Configurations.Parsers.XP_Pen
+{
+    public struct XP_PenTabletGen2Report : ITabletReport, ITiltReport, IEraserReport
+    {
+        public XP_PenTabletGen2Report(byte[] report)
+        {
+            Raw = report;
+
+            Position = new Vector2
+            {
+                X = Unsafe.ReadUnaligned<ushort>(ref report[2]) | report[10] << 16,
+                Y = Unsafe.ReadUnaligned<ushort>(ref report[4]) | report[11] << 16
+            };
+            Pressure = (uint)((Unsafe.ReadUnaligned<ushort>(ref report[6]) - 16384) | (report[13] & 0x01) << 13);
+            Eraser = report[1].IsBitSet(3);
+
+            PenButtons = new bool[]
+            {
+                report[1].IsBitSet(1),
+                report[1].IsBitSet(2)
+            };
+
+            Tilt = new Vector2
+            {
+                X = (sbyte)report[8],
+                Y = (sbyte)report[9]
+            };
+        }
+
+        public byte[] Raw { set; get; }
+        public Vector2 Position { set; get; }
+        public uint Pressure { set; get; }
+        public bool[] PenButtons { set; get; }
+        public Vector2 Tilt { set; get; }
+        public bool Eraser { set; get; }
+    }
+}