diff --git a/data/huion-mini-keydial-kd100.tablet b/data/huion-mini-keydial-kd100.tablet index 26de2317a..2eac471f2 100644 --- a/data/huion-mini-keydial-kd100.tablet +++ b/data/huion-mini-keydial-kd100.tablet @@ -8,23 +8,14 @@ [Device] Name=Mini KeyDial KD100 ModelName=Mini KeyDial KD100 -Class=Bamboo -# Product ID is unknown, please fix -DeviceMatch=usb|256c|006e||HUION_T200;usb|256c|006d||HUION_T200;usb|256c|006f||HUION_T200;usb|256c|0064||HUION_T200; -Width=9 # autogenerated value, please fix -Height=6 # autogenerated value, please fix +Class=Remote +DeviceMatch=usb|256c|006d||HUION_T200 Layout=huion-mini-keydial-kd100.svg -Styli=@generic-no-eraser; IntegratedIn= [Features] -NumStrips=0 -NumRings=0 NumDials=1 -Reversible=true -Stylus=true -Touch=false -TouchSwitch=false +Stylus=false [Buttons] Left=A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S diff --git a/data/layouts/huion-mini-keydial-kd100.svg b/data/layouts/huion-mini-keydial-kd100.svg index 8cad7be07..c21c29bc1 100644 --- a/data/layouts/huion-mini-keydial-kd100.svg +++ b/data/layouts/huion-mini-keydial-kd100.svg @@ -1,102 +1,478 @@ - - - - - - Codestin Search App - - - A - - - - - B - - - - - C - - - - - D - - - - - E - - - - - F - - - - - G - - - - - H - - - - - I - - - - - J - - - - - K - - - - - L - - - - - M - - - - - N - - - - - O - - - - - P - - - - - Q - - - - - R - - - - - S - + + + + + Codestin Search App + + + + A + + + + B + + + + + C + + + + + D + + + + + E + + + + + F + + + + + G + + + + + H + + + + + I + + + + + J + + + + + K + + + + + L + + + + + M + + + + + N + + + + + O + + + + + P + + + + + Q + + + + + R + + + + + S + + + + + + CCW + + CW diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c index e927c60cd..287757e57 100644 --- a/libwacom/libwacom.c +++ b/libwacom/libwacom.c @@ -1086,7 +1086,7 @@ libwacom_print_device_description(int fd, const WacomDevice *device) dprintf(fd, "[Features]\n"); dprintf(fd, "Reversible=%s\n", libwacom_is_reversible(device) ? "true" : "false"); dprintf(fd, "Stylus=%s\n", libwacom_has_stylus(device) ? "true" : "false"); - dprintf(fd, "NumRings=%s\n", libwacom_get_num_rings(device) ? "true" : "false"); + dprintf(fd, "NumRings=%d\n", libwacom_get_num_rings(device)); dprintf(fd, "Touch=%s\n", libwacom_has_touch(device) ? "true" : "false"); dprintf(fd, "TouchSwitch=%s\n", libwacom_has_touchswitch(device)? "true" : "false"); print_supported_leds(fd, device); diff --git a/test/test_svg.py b/test/test_svg.py index 5113750b4..3c6763322 100644 --- a/test/test_svg.py +++ b/test/test_svg.py @@ -83,7 +83,7 @@ def pytest_generate_tests(metafunc): ] def filenames(devices: List[SvgDevice]) -> List[str]: - return [Path(d.device.layout_filename).name for d in devices] + return sorted([Path(d.device.layout_filename).name for d in devices]) if "svgdevice" in metafunc.fixturenames: metafunc.parametrize("svgdevice", devices, ids=filenames(devices))