Adds XP Pen Artist 13.3 tablet with fixed stylus button

.gitignore

@@ -1,4 +1,5 @@
 *.ko
+*.mod
 *.mod.c
 *.o
 .*

.travis.yml

@@ -8,6 +8,8 @@ matrix:
           dist: xenial
         - os: linux
           dist: trusty
+        - os: linux
+          dist: bionic
 before_install:
     - sudo apt-get -qq update
     - sudo apt-get install -y dpkg-dev debhelper dkms lintian sparse fakeroot

Makefile

@@ -1,4 +1,4 @@
-obj-m := hid-kye.o hid-uclogic.o hid-polostar.o hid-viewsonic.o
+obj-m := hid-kye.o hid-uclogic.o hid-polostar.o hid-viewsonic.o hid-xppen.o
 hid-uclogic-objs := \
 	hid-uclogic-core.o \
 	hid-uclogic-rdesc.o \
@@ -19,7 +19,7 @@ DKMS_MODULES = $(DKMS_MODULES_NAME)/$(PACKAGE_VERSION)
 DKMS_SOURCE_DIR = $(DESTDIR)/usr/src/$(DKMS_MODULES_NAME)-$(PACKAGE_VERSION)
 
 modules modules_install clean:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $@
+	$(MAKE) -C $(KDIR) M=$(PWD) $@
 
 depmod_conf_install:
 	install -D -m 0644 depmod.conf $(DEPMOD_CONF)
@@ -43,6 +43,7 @@ udev_rules_uninstall:
 modules_uninstall:
 	rm -vf /lib/modules/*/extra/hid-kye.ko \
 	       /lib/modules/*/extra/hid-polostar.ko \
+	       /lib/modules/*/extra/hid-xppen.ko \
 	       /lib/modules/*/extra/hid-uclogic.ko \
 	       /lib/modules/*/extra/hid-viewsonic.ko
 

README.md

@@ -112,51 +112,6 @@ installation and operation and can safely be ignored. That is, unless you set
 up module signature verification, but then you would recognize the problem,
 and would be able to fix it.
 
-### DKMS issues preventing correct installation ###
-
-If you're installing Debian packages, or installing from source with DKMS, you
-might hit one of DKMS bugs which prevent some of the driver modules from
-installing.
-
-They make DKMS produce messages like this:
-
-    hid-uclogic.ko:
-    Running module version sanity check.
-    Error! Module version 7 for hid-uclogic.ko
-    is not newer than what is already found in kernel 4.9.0-5-amd64 (7).
-    You may override by specifying --force.
-
-or this:
-
-    hid-uclogic.ko.xz:
-    Running module version sanity check.
-    Error! Module version 9 for hid-uclogic.ko.xz
-    is not newer than what is already found in kernel 3.10.0-862.14.4.el7.x86_64 (27A2028780DCB320780F53D).
-
-while trying to install the drivers.
-
-Fixes for these were accepted upstream ([first fix][dkms_issue1_pr] and
-[second fix][dkms_issue2_pr]) and should eventually appear in distributions.
-Meanwhile, to fix the issues, you can apply these yourself, or execute the
-following command:
-
-    sudo sed -i \
-             -e '/^get_module_verinfo()/,+3 s/\<unset res$\|\<res=()$/res=("" "" "")/' \
-	     /usr/sbin/dkms
-
-Be aware that the operation of the above command is inexact, and might not
-work, or might break DKMS. You've been warned. In any case, simply reinstall
-DKMS to restore it.
-
-### Systems with Secure Boot enabled ###
-
-If your system has [Secure Boot][secure_boot] enabled, then the installed
-driver modules won't be permitted to load. You will see messages like
-"Required key not available". To make them work, you will need to sign them,
-or disable Secure Boot entirely. See documentation for your Linux distribution
-on how to sign kernel modules, or documentation for your computer's UEFI
-firmware on how to disable Secure Boot.
-
 Configuration
 -------------
 After installing the drivers, make sure the previous versions of the drivers
@@ -299,6 +254,60 @@ directory:
 
 The resulting package files will be written to the parent directory.
 
+Known issues
+------------
+
+### DKMS issues preventing correct installation ###
+
+If you're installing Debian packages, or installing from source with DKMS, you
+might hit one of DKMS bugs which prevent some of the driver modules from
+installing.
+
+They make DKMS produce messages like this:
+
+    hid-uclogic.ko:
+    Running module version sanity check.
+    Error! Module version 7 for hid-uclogic.ko
+    is not newer than what is already found in kernel 4.9.0-5-amd64 (7).
+    You may override by specifying --force.
+
+or this:
+
+    hid-uclogic.ko.xz:
+    Running module version sanity check.
+    Error! Module version 9 for hid-uclogic.ko.xz
+    is not newer than what is already found in kernel 3.10.0-862.14.4.el7.x86_64 (27A2028780DCB320780F53D).
+
+while trying to install the drivers.
+
+Fixes for these were accepted upstream ([first fix][dkms_issue1_pr] and
+[second fix][dkms_issue2_pr]) and should eventually appear in distributions.
+Meanwhile, to fix the issues, you can apply these yourself, or execute the
+following command:
+
+    sudo sed -i \
+             -e '/^get_module_verinfo()/,+3 s/\<unset res$\|\<res=()$/res=("" "" "")/' \
+             /usr/sbin/dkms
+
+Be aware that the operation of the above command is inexact, and might not
+work, or might break DKMS. You've been warned. In any case, simply reinstall
+DKMS to restore it.
+
+### Systems with Secure Boot enabled ###
+
+If your system has [Secure Boot][secure_boot] enabled, then the installed
+driver modules won't be permitted to load. You will see messages like
+"Required key not available". To make them work, you will need to sign them,
+or disable Secure Boot entirely. See documentation for your Linux distribution
+on how to sign kernel modules, or documentation for your computer's UEFI
+firmware on how to disable Secure Boot.
+
+### Touch ring/strip scrolling doesn't work in Gnome ###
+
+Scrolling with a touch ring or a touch strip [doesn't
+work][gnome_touch_scroll_issue] in Gnome version 3.24 and later. At the moment
+there doesn't seem to be a workaround beside not using Gnome.
+
 Support
 -------
 
@@ -330,3 +339,4 @@ drivers, tablets, development, to ask for help, and to help others!
 [howtos]: http://digimend.github.io/support/
 [issues]: https://github.com/DIGImend/digimend-kernel-drivers/issues
 [irc_channel]: https://webchat.freenode.net/?channels=DIGImend
+[gnome_touch_scroll_issue]: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/118

dkms.conf

@@ -6,7 +6,9 @@ BUILT_MODULE_NAME[0]="hid-kye"
 BUILT_MODULE_NAME[1]="hid-uclogic"
 BUILT_MODULE_NAME[2]="hid-polostar"
 BUILT_MODULE_NAME[3]="hid-viewsonic"
+BUILT_MODULE_NAME[4]="hid-xppen"
 DEST_MODULE_LOCATION[0]="/extra"
 DEST_MODULE_LOCATION[1]="/extra"
 DEST_MODULE_LOCATION[2]="/extra"
 DEST_MODULE_LOCATION[3]="/extra"
+DEST_MODULE_LOCATION[4]="/extra"

hid-ids.h

@@ -8,7 +8,7 @@
 
 #define USB_VENDOR_ID_HUION		0x256c
 #define USB_DEVICE_ID_HUION_TABLET	0x006e
-#define USB_DEVICE_ID_HUION_HS64	0x006d
+#define USB_DEVICE_ID_HUION_TABLET2	0x006d
 
 #define USB_VENDOR_ID_KYE		0x0458
 #define USB_DEVICE_ID_KYE_ERGO_525V	0x0087
@@ -56,6 +56,7 @@
 #define USB_DEVICE_ID_UGEE_TABLET_G5		0x0074
 #define USB_DEVICE_ID_UGEE_TABLET_EX07S		0x0071
 #define USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720	0x0055
+#define USB_DEVICE_ID_UGEE_XPPEN_ARTIST_133     0x000b
 
 /* ViewSonic Corporation */
 #define USB_VENDOR_ID_VIEWSONIC			0x0543