From nobody Wed Dec 17 07:24:41 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 671BBC4167B for ; Wed, 6 Dec 2023 10:47:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377703AbjLFKqv (ORCPT ); Wed, 6 Dec 2023 05:46:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377742AbjLFKqe (ORCPT ); Wed, 6 Dec 2023 05:46:34 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFE051723 for ; Wed, 6 Dec 2023 02:46:19 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8B92C433C7; Wed, 6 Dec 2023 10:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701859579; bh=Hif8AQyE2YPxh4c1ifXxoCQdIEAvk7GdDFIcyZbu0Rg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WsnaotKYKcZ5jyNyBNanqgasEniPy/IK218oEK0mTTJx4IZhwZ8WsB4RfXXX7Mtcp KQA4sKiqnZ5SFFXGlfuxyJ0Xu2xEETjfxzC+MHlzPO6lTz1Nx09ogJMGxTYNHwsx6R 0T4fI5Kr+ChGEwCdSr4K/j2LMZbv0C9f3xDJKF+/rAwE+bI5wJNmt2mWh8tCf7QuyJ 8la3tRyiT4w/MHYYpU41q9ESjjMu+jiA8zbFrPlMDokrG24Vq9SR/B9IhH9Nq5ySLI gLIm4j4m2b+F8bUYIFCagviAwmjey/W8ihBeezcHXf6xo5aTAnNzVphOsyb78LAfHJ KCummq02Vmt5A== From: Benjamin Tissoires Date: Wed, 06 Dec 2023 11:45:57 +0100 Subject: [PATCH v2 06/15] selftests/hid: tablets: move move_to function to PenDigitizer MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231206-wip-selftests-v2-6-c0350c2f5986@kernel.org> References: <20231206-wip-selftests-v2-0-c0350c2f5986@kernel.org> In-Reply-To: <20231206-wip-selftests-v2-0-c0350c2f5986@kernel.org> To: Jiri Kosina , Benjamin Tissoires , Shuah Khan , Peter Hutterer Cc: linux-input@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Benjamin Tissoires X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1701859565; l=5364; i=bentiss@kernel.org; s=20230215; h=from:subject:message-id; bh=Hif8AQyE2YPxh4c1ifXxoCQdIEAvk7GdDFIcyZbu0Rg=; b=sB4yEgfiYows++yOpiowOjIdzwzmxxx9prSxRmLvJL+ZhD1Z8+3Wai3Ol4MNtCIMp+teVboBa Pu4jM341xvcDVgNslAXP6SuRQhajOo/DpUXJ7GVfVF/hwDXUVcgvVmJ X-Developer-Key: i=bentiss@kernel.org; a=ed25519; pk=7D1DyAVh6ajCkuUTudt/chMuXWIJHlv2qCsRkIizvFw= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can easily subclass PenDigitizer for introducing firmware bugs when subclassing Pen is harder. Move move_to from Pen to PenDigitizer so we get that ability Reviewed-by: Peter Hutterer Signed-off-by: Benjamin Tissoires --- no changes in v2 --- tools/testing/selftests/hid/tests/test_tablet.py | 97 ++++++++++++--------= ---- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/tools/testing/selftests/hid/tests/test_tablet.py b/tools/testi= ng/selftests/hid/tests/test_tablet.py index ddf28c245046..27260dc02cc4 100644 --- a/tools/testing/selftests/hid/tests/test_tablet.py +++ b/tools/testing/selftests/hid/tests/test_tablet.py @@ -282,7 +282,7 @@ class Pen(object): self._old_values =3D None self.current_state =3D None =20 - def _restore(self): + def restore(self): if self._old_values is not None: for i in [ "x", @@ -297,50 +297,8 @@ class Pen(object): ]: setattr(self, i, getattr(self._old_values, i)) =20 - def move_to(self, state): - # fill in the previous values - if self.current_state =3D=3D PenState.PEN_IS_OUT_OF_RANGE: - self._restore() - - print(f"\n *** pen is moving to {state} ***") - - if state =3D=3D PenState.PEN_IS_OUT_OF_RANGE: - self._old_values =3D copy.copy(self) - self.x =3D 0 - self.y =3D 0 - self.tipswitch =3D False - self.tippressure =3D 0 - self.azimuth =3D 0 - self.inrange =3D False - self.width =3D 0 - self.height =3D 0 - self.invert =3D False - self.eraser =3D False - self.x_tilt =3D 0 - self.y_tilt =3D 0 - self.twist =3D 0 - elif state =3D=3D PenState.PEN_IS_IN_RANGE: - self.tipswitch =3D False - self.inrange =3D True - self.invert =3D False - self.eraser =3D False - elif state =3D=3D PenState.PEN_IS_IN_CONTACT: - self.tipswitch =3D True - self.inrange =3D True - self.invert =3D False - self.eraser =3D False - elif state =3D=3D PenState.PEN_IS_IN_RANGE_WITH_ERASING_INTENT: - self.tipswitch =3D False - self.inrange =3D True - self.invert =3D True - self.eraser =3D False - elif state =3D=3D PenState.PEN_IS_ERASING: - self.tipswitch =3D False - self.inrange =3D True - self.invert =3D True - self.eraser =3D True - - self.current_state =3D state + def backup(self): + self._old_values =3D copy.copy(self) =20 def __assert_axis(self, evdev, axis, value): if ( @@ -384,6 +342,51 @@ class PenDigitizer(base.UHIDTestDevice): continue self.fields =3D [f.usage_name for f in r] =20 + def move_to(self, pen, state): + # fill in the previous values + if pen.current_state =3D=3D PenState.PEN_IS_OUT_OF_RANGE: + pen.restore() + + print(f"\n *** pen is moving to {state} ***") + + if state =3D=3D PenState.PEN_IS_OUT_OF_RANGE: + pen.backup() + pen.x =3D 0 + pen.y =3D 0 + pen.tipswitch =3D False + pen.tippressure =3D 0 + pen.azimuth =3D 0 + pen.inrange =3D False + pen.width =3D 0 + pen.height =3D 0 + pen.invert =3D False + pen.eraser =3D False + pen.x_tilt =3D 0 + pen.y_tilt =3D 0 + pen.twist =3D 0 + elif state =3D=3D PenState.PEN_IS_IN_RANGE: + pen.tipswitch =3D False + pen.inrange =3D True + pen.invert =3D False + pen.eraser =3D False + elif state =3D=3D PenState.PEN_IS_IN_CONTACT: + pen.tipswitch =3D True + pen.inrange =3D True + pen.invert =3D False + pen.eraser =3D False + elif state =3D=3D PenState.PEN_IS_IN_RANGE_WITH_ERASING_INTENT: + pen.tipswitch =3D False + pen.inrange =3D True + pen.invert =3D True + pen.eraser =3D False + elif state =3D=3D PenState.PEN_IS_ERASING: + pen.tipswitch =3D False + pen.inrange =3D True + pen.invert =3D True + pen.eraser =3D True + + pen.current_state =3D state + def event(self, pen): rs =3D [] r =3D self.create_report(application=3Dself.cur_application, data= =3Dpen) @@ -462,7 +465,7 @@ class BaseTest: cur_state =3D PenState.PEN_IS_OUT_OF_RANGE =20 p =3D Pen(50, 60) - p.move_to(PenState.PEN_IS_OUT_OF_RANGE) + uhdev.move_to(p, PenState.PEN_IS_OUT_OF_RANGE) events =3D self.post(uhdev, p) self.validate_transitions(cur_state, p, evdev, events) =20 @@ -475,7 +478,7 @@ class BaseTest: events =3D self.post(uhdev, p) self.validate_transitions(cur_state, p, evdev, events) assert len(events) >=3D 3 # X, Y, SYN - p.move_to(state) + uhdev.move_to(p, state) if scribble and state !=3D PenState.PEN_IS_OUT_OF_RANGE: p.x +=3D 1 p.y -=3D 1 --=20 2.41.0