summaryrefslogtreecommitdiff
path: root/units
diff options
Diffstat (limited to 'units')
-rw-r--r--units/touchpad/jobs.pxu22
-rw-r--r--units/touchpad/test-plan.pxu2
2 files changed, 4 insertions, 20 deletions
diff --git a/units/touchpad/jobs.pxu b/units/touchpad/jobs.pxu
index 794de79..e0d118b 100644
--- a/units/touchpad/jobs.pxu
+++ b/units/touchpad/jobs.pxu
@@ -220,30 +220,14 @@ _siblings:
unit: template
template-resource: device
-template-filter: device.category == 'TOUCHPAD'
+template-filter:
+ device.category == 'TOUCHPAD' and device.driver == 'hid-multitouch'
template-unit: job
plugin: shell
category_id: com.canonical.plainbox::touchpad
id: touchpad/palm-rejection-firmware-labeling_{product_slug}
-requires: device.driver == 'hid-multitouch'
estimated_duration: 5.0
-command:
- dev_path=$(udev_resource.py -f TOUCHPAD | grep "path" | cut -d" " -f2)
- abs_path="/sys$dev_path/capabilities/abs"
- abs_caps=$(cat <"$abs_path")
- abs_caps_hex=$((16#"$abs_caps"))
- tool_type_bit=$((abs_caps_hex >> 55))
- support=$((tool_type_bit & 1))
- if [ $support -eq 1 ]; then
- exit 0
- else
- echo "Touchapd info:"
- cat <"/sys$dev_path/name"
- cat <"/sys$dev_path/modalias"
- echo "Touchpad EV_ABS capabilities:"
- echo "$abs_caps"
- exit 1
- fi
+command: touchpad_confidence_bit.py {product_slug}
_summary: Touchpad EV_ABS capability check
_description:
Libinput firmware/labeling palm detection rely on touchpad ABS_MT_TOOL_TYPE
diff --git a/units/touchpad/test-plan.pxu b/units/touchpad/test-plan.pxu
index 39769d0..e03ea54 100644
--- a/units/touchpad/test-plan.pxu
+++ b/units/touchpad/test-plan.pxu
@@ -30,7 +30,7 @@ _description:
Touchpad tests (Automated)
include:
touchpad/detected-as-mouse certification-status=blocker
- touchpad/palm-rejection-firmware-labeling_.* certification-status=blocker
+ touchpad/palm-rejection-firmware-labeling_.* certification-status=non-blocker
id: after-suspend-touchpad-cert-full