From d94babd8319635ef67e1d9e34ae38bc96258cf19 Mon Sep 17 00:00:00 2001 From: Harry Cutts Date: Mon, 13 Mar 2023 11:32:06 +0000 Subject: [PATCH] Revert^2 "Add device-specific tunings for external touchpads" 89e347b2a6ed507b760d864127d10f501e0fa249 Change-Id: Ibe48eacce5301836da5ec6124073209df563068b --- data/keyboards/Vendor_004c_Product_0265.idc | 1 + data/keyboards/Vendor_03f6_Product_a001.idc | 22 ++++++++++++ data/keyboards/Vendor_046d_Product_4011.idc | 32 +++++++++++++++++ data/keyboards/Vendor_046d_Product_4101.idc | 31 +++++++++++++++++ data/keyboards/Vendor_046d_Product_4102.idc | 24 +++++++++++++ data/keyboards/Vendor_046d_Product_b00c.idc | 31 +++++++++++++++++ data/keyboards/Vendor_05ac_Product_0265.idc | 34 ++++++++++++++++++ data/keyboards/Vendor_05ac_Product_030e.idc | 38 +++++++++++++++++++++ 8 files changed, 213 insertions(+) create mode 120000 data/keyboards/Vendor_004c_Product_0265.idc create mode 100644 data/keyboards/Vendor_03f6_Product_a001.idc create mode 100644 data/keyboards/Vendor_046d_Product_4011.idc create mode 100644 data/keyboards/Vendor_046d_Product_4101.idc create mode 100644 data/keyboards/Vendor_046d_Product_4102.idc create mode 100644 data/keyboards/Vendor_046d_Product_b00c.idc create mode 100644 data/keyboards/Vendor_05ac_Product_0265.idc create mode 100644 data/keyboards/Vendor_05ac_Product_030e.idc diff --git a/data/keyboards/Vendor_004c_Product_0265.idc b/data/keyboards/Vendor_004c_Product_0265.idc new file mode 120000 index 0000000000000..707dfcfe3a10f --- /dev/null +++ b/data/keyboards/Vendor_004c_Product_0265.idc @@ -0,0 +1 @@ +Vendor_05ac_Product_0265.idc \ No newline at end of file diff --git a/data/keyboards/Vendor_03f6_Product_a001.idc b/data/keyboards/Vendor_03f6_Product_a001.idc new file mode 100644 index 0000000000000..bcb4ee3fc84bf --- /dev/null +++ b/data/keyboards/Vendor_03f6_Product_a001.idc @@ -0,0 +1,22 @@ +# Copyright 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Brydge Touchpad +# + +# Reports from this touchpad sometimes get bunched together due to Bluetooth +# batching, leading to bad timestamps that mess up finger velocity calculations. +# To fix this, set a fake delta using the touchpad's known report rate. +gestureProp.Fake_Timestamp_Delta = 0.010 diff --git a/data/keyboards/Vendor_046d_Product_4011.idc b/data/keyboards/Vendor_046d_Product_4011.idc new file mode 100644 index 0000000000000..3a23830e73210 --- /dev/null +++ b/data/keyboards/Vendor_046d_Product_4011.idc @@ -0,0 +1,32 @@ +# Copyright 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Logitech Wireless Touchpad +# + +gestureProp.Touchpad_Stack_Version = 1 +gestureProp.IIR_b0 = 1 +gestureProp.IIR_b1 = 0 +gestureProp.IIR_b2 = 0 +gestureProp.IIR_b3 = 0 +gestureProp.IIR_a1 = 0 +gestureProp.IIR_a2 = 0 +gestureProp.Pressure_Calibration_Offset = -313.240741792594 +gestureProp.Pressure_Calibration_Slope = 4.39678062436752 +gestureProp.Max_Allowed_Pressure_Change_Per_Sec = 100000.0 +gestureProp.Max_Hysteresis_Pressure_Per_Sec = 100000.0 +gestureProp.Palm_Pressure = 100000.0 +gestureProp.Two_Finger_Vertical_Close_Distance_Thresh = 35.0 +gestureProp.Fling_Buffer_Suppress_Zero_Length_Scrolls = 0 diff --git a/data/keyboards/Vendor_046d_Product_4101.idc b/data/keyboards/Vendor_046d_Product_4101.idc new file mode 100644 index 0000000000000..47e2530416025 --- /dev/null +++ b/data/keyboards/Vendor_046d_Product_4101.idc @@ -0,0 +1,31 @@ +# Copyright 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Logitech T650 +# + +gestureProp.Touchpad_Stack_Version = 1 +gestureProp.IIR_b0 = 1 +gestureProp.IIR_b1 = 0 +gestureProp.IIR_b2 = 0 +gestureProp.IIR_b3 = 0 +gestureProp.IIR_a1 = 0 +gestureProp.IIR_a2 = 0 +gestureProp.Pressure_Calibration_Offset = -0.439288351750068 +gestureProp.Pressure_Calibration_Slope = 3.05998553523335 +gestureProp.Max_Allowed_Pressure_Change_Per_Sec = 100000.0 +gestureProp.Max_Hysteresis_Pressure_Per_Sec = 100000.0 +gestureProp.Two_Finger_Vertical_Close_Distance_Thresh = 35.0 +gestureProp.Fling_Buffer_Suppress_Zero_Length_Scrolls = 0 diff --git a/data/keyboards/Vendor_046d_Product_4102.idc b/data/keyboards/Vendor_046d_Product_4102.idc new file mode 100644 index 0000000000000..e33a28a423152 --- /dev/null +++ b/data/keyboards/Vendor_046d_Product_4102.idc @@ -0,0 +1,24 @@ +# Copyright 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Logitech TK820 +# + +gestureProp.Touchpad_Stack_Version = 2 +# Pressure jumps around a lot on this touchpad, so allow that: +gestureProp.Max_Allowed_Pressure_Change_Per_Sec = 100000.0 +gestureProp.Max_Hysteresis_Pressure_Per_Sec = 100000.0 +gestureProp.Pressure_Calibration_Offset = -18.8078435 +gestureProp.Pressure_Calibration_Slope = 2.466208137 diff --git a/data/keyboards/Vendor_046d_Product_b00c.idc b/data/keyboards/Vendor_046d_Product_b00c.idc new file mode 100644 index 0000000000000..a49970cf3b7a8 --- /dev/null +++ b/data/keyboards/Vendor_046d_Product_b00c.idc @@ -0,0 +1,31 @@ +# Copyright 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Logitech T651 +# + +gestureProp.Touchpad_Stack_Version = 1 +gestureProp.IIR_b0 = 1 +gestureProp.IIR_b1 = 0 +gestureProp.IIR_b2 = 0 +gestureProp.IIR_b3 = 0 +gestureProp.IIR_a1 = 0 +gestureProp.IIR_a2 = 0 +gestureProp.Pressure_Calibration_Offset = -4.46520447177073 +gestureProp.Pressure_Calibration_Slope = 3.21071719332644 +gestureProp.Max_Allowed_Pressure_Change_Per_Sec = 100000.0 +gestureProp.Max_Hysteresis_Pressure_Per_Sec = 100000.0 +gestureProp.Two_Finger_Vertical_Close_Distance_Thresh = 35.0 +gestureProp.Fling_Buffer_Suppress_Zero_Length_Scrolls = 0 diff --git a/data/keyboards/Vendor_05ac_Product_0265.idc b/data/keyboards/Vendor_05ac_Product_0265.idc new file mode 100644 index 0000000000000..d72de649c0ed5 --- /dev/null +++ b/data/keyboards/Vendor_05ac_Product_0265.idc @@ -0,0 +1,34 @@ +# Copyright 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Apple Magic Trackpad 2 configuration file +# Bluetooth vendor ID 004c +# USB vendor ID 05ac +# + +gestureProp.Pressure_Calibration_Offset = 30 +gestureProp.Palm_Pressure = 250.0 +gestureProp.Palm_Width = 20.0 +gestureProp.Multiple_Palm_Width = 20.0 + +# Enable Stationary Wiggle Filter +gestureProp.Stationary_Wiggle_Filter_Enabled = 1 +gestureProp.Finger_Moving_Energy = 0.0008 +gestureProp.Finger_Moving_Hysteresis = 0.0004 + +# Avoid accidental scroll/move on finger lift +gestureProp.Max_Stationary_Move_Speed = 47 +gestureProp.Max_Stationary_Move_Speed_Hysteresis = 1 +gestureProp.Max_Stationary_Move_Suppress_Distance = 0.2 diff --git a/data/keyboards/Vendor_05ac_Product_030e.idc b/data/keyboards/Vendor_05ac_Product_030e.idc new file mode 100644 index 0000000000000..23a2e189c8fcc --- /dev/null +++ b/data/keyboards/Vendor_05ac_Product_030e.idc @@ -0,0 +1,38 @@ +# Copyright 2023 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# Apple Magic Trackpad +# + +gestureProp.Touchpad_Stack_Version = 1 +# We are using raw touch major value as pressure value, so set the Palm +# pressure threshold high. +gestureProp.Palm_Pressure = 1000 +gestureProp.Compute_Surface_Area_from_Pressure = 0 +gestureProp.IIR_b0 = 1 +gestureProp.IIR_b1 = 0 +gestureProp.IIR_b2 = 0 +gestureProp.IIR_b3 = 0 +gestureProp.IIR_a1 = 0 +gestureProp.IIR_a2 = 0 +# NOTE: bias on X-axis is uncalibrated +gestureProp.Touchpad_Device_Output_Bias_on_X-Axis = -283.3226025266607 +gestureProp.Touchpad_Device_Output_Bias_on_Y-Axis = -283.3226025266607 +gestureProp.Max_Allowed_Pressure_Change_Per_Sec = 100000.0 +gestureProp.Max_Hysteresis_Pressure_Per_Sec = 100000.0 +# Drumroll suppression causes janky movement on this touchpad. +gestureProp.Drumroll_Suppression_Enable = 0 +gestureProp.Two_Finger_Vertical_Close_Distance_Thresh = 35.0 +gestureProp.Fling_Buffer_Suppress_Zero_Length_Scrolls = 0