From: "François-Xavier Carton" <fx.carton91@gmail.com>
To: linux-input@vger.kernel.org, Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: "François-Xavier Carton" <fx.carton91@gmail.com>,
"Ethan Lee" <flibitijibibo@gmail.com>,
"Bastien Nocera" <hadess@hadess.net>
Subject: [PATCH v3 3/4] HID: gamecube-adapter: add auto calibration
Date: Wed, 14 Oct 2020 03:30:22 +0200 [thread overview]
Message-ID: <20201014013023.23078-4-fx.carton91@gmail.com> (raw)
In-Reply-To: <20201014013023.23078-1-fx.carton91@gmail.com>
The axes do not cover the full 0-255 range, with different limit values
for each axis. The minimal and maximal values are recorded for each axis
and the values are remapped from that range to 0-255.
Signed-off-by: François-Xavier Carton <fx.carton91@gmail.com>
---
drivers/hid/hid-gamecube-adapter.c | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/hid-gamecube-adapter.c b/drivers/hid/hid-gamecube-adapter.c
index d0bf09ba2762..53d372a24277 100644
--- a/drivers/hid/hid-gamecube-adapter.c
+++ b/drivers/hid/hid-gamecube-adapter.c
@@ -56,6 +56,8 @@ struct gamecube_ctrl {
struct input_dev __rcu *input;
struct gamecube_adpt *adpt;
enum gamecube_ctrl_flags flags;
+ u8 axis_min[6];
+ u8 axis_max[6];
u8 rumble;
struct work_struct work_connect;
spinlock_t flags_lock;
@@ -264,6 +266,7 @@ static void gamecube_ctrl_handle_report(struct gamecube_ctrl *ctrl, u8 *data)
u16 btns = data[1] << 8 | data[2];
u8 old_flags, new_flags = data[0];
unsigned long irq_flags;
+ unsigned int i;
spin_lock_irqsave(&ctrl->flags_lock, irq_flags);
old_flags = ctrl->flags;
@@ -271,6 +274,11 @@ static void gamecube_ctrl_handle_report(struct gamecube_ctrl *ctrl, u8 *data)
spin_unlock_irqrestore(&ctrl->flags_lock, irq_flags);
if ((new_flags & GC_TYPES) != (old_flags & GC_TYPES)) {
+ // Reset min/max values. The default values were obtained empirically
+ for (i = 0; i < 6; i++) {
+ ctrl->axis_min[i] = 45; // max across all axes of min values
+ ctrl->axis_max[i] = 215; // min across all axes of max values
+ }
schedule_work(&ctrl->work_connect);
return;
}
@@ -294,12 +302,16 @@ static void gamecube_ctrl_handle_report(struct gamecube_ctrl *ctrl, u8 *data)
input_report_key(dev, BTN_DPAD_RIGHT, btns & GC_BTN_DPAD_RIGHT);
input_report_key(dev, BTN_DPAD_DOWN, btns & GC_BTN_DPAD_DOWN);
input_report_key(dev, BTN_DPAD_UP, btns & GC_BTN_DPAD_UP);
- input_report_abs(dev, ABS_X, data[3]);
- input_report_abs(dev, ABS_Y, 255 - data[4]);
- input_report_abs(dev, ABS_RX, data[5]);
- input_report_abs(dev, ABS_RY, 255 - data[6]);
- input_report_abs(dev, ABS_Z, data[7]);
- input_report_abs(dev, ABS_RZ, data[8]);
+ for (i = 0; i < 6; i++) {
+ u8 a, b, v = data[3 + i];
+
+ a = ctrl->axis_min[i] = min(ctrl->axis_min[i], v);
+ b = ctrl->axis_max[i] = max(ctrl->axis_max[i], v);
+ v = 255U * (v - a) / (b - a);
+ if (gamecube_axes[i] == ABS_Y || gamecube_axes[i] == ABS_RY)
+ v = 255U - v;
+ input_report_abs(dev, gamecube_axes[i], v);
+ }
input_sync(dev);
unlock:
--
2.26.2
next prev parent reply other threads:[~2020-10-14 9:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 1:30 [PATCH v3 0/4] HID: gamecube-adapter François-Xavier Carton
2020-10-14 1:30 ` [PATCH v3 1/4] HID: gamecube-adapter: add nintendo gamecube adapter François-Xavier Carton
2020-10-14 1:30 ` [PATCH v3 2/4] HID: gamecube-adapter: add rumble support François-Xavier Carton
2020-10-14 1:30 ` François-Xavier Carton [this message]
2020-10-14 1:30 ` [PATCH v3 4/4] HID: gamecube-adapter: restore input after suspend François-Xavier Carton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201014013023.23078-4-fx.carton91@gmail.com \
--to=fx.carton91@gmail.com \
--cc=benjamin.tissoires@redhat.com \
--cc=flibitijibibo@gmail.com \
--cc=hadess@hadess.net \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).