diff --git a/PKGBUILD/inputplumber/002-enable-gyro-air_zero.patch b/PKGBUILD/inputplumber/002-enable-gyro-air_zero.patch index 227127de..11fdf8be 100644 --- a/PKGBUILD/inputplumber/002-enable-gyro-air_zero.patch +++ b/PKGBUILD/inputplumber/002-enable-gyro-air_zero.patch @@ -1,5 +1,5 @@ diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air.yaml -index 4abf518..c4851e6 100644 +index daf8bfe..afa4326 100644 --- a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air.yaml +++ b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air.yaml @@ -35,13 +35,13 @@ source_devices: @@ -11,23 +11,23 @@ index 4abf518..c4851e6 100644 - # name: i2c-BMI0160:00 - # mount_matrix: - # x: [0, -1, 0] -- # y: [0, 0, -1] -- # z: [1, 0, 0] -+ - group: imu +- # y: [-1, 0, 0] +- # z: [0, 0, -1] ++ - group: imu #TODO:reenable after we switch from polling + iio: + name: i2c-BMI0160:00 + mount_matrix: + x: [0, -1, 0] -+ y: [0, 0, -1] -+ z: [1, 0, 0] ++ y: [-1, 0, 0] ++ z: [0, 0, -1] - # The target input device(s) that the virtual device profile can use - target_devices: + # Optional configuration for the composite device + options: diff --git a/rootfs/usr/share/inputplumber/devices/50-ayn_loki_zero.yaml b/rootfs/usr/share/inputplumber/devices/50-ayn_loki_zero.yaml -index bb6b5be..045d1b3 100644 +index 45e0c84..fff2658 100644 --- a/rootfs/usr/share/inputplumber/devices/50-ayn_loki_zero.yaml +++ b/rootfs/usr/share/inputplumber/devices/50-ayn_loki_zero.yaml -@@ -32,13 +32,13 @@ source_devices: +@@ -32,14 +32,14 @@ source_devices: name: AT Translated Set 2 keyboard phys_path: isa0060/serio0/input0 handler: event* @@ -35,16 +35,18 @@ index bb6b5be..045d1b3 100644 - # iio: - # name: i2c-BMI0160:00 - # mount_matrix: +- # # TODO: Reverify on actual hardware - # x: [1, 0, 0] -- # y: [0, 0, -1] -- # z: [0, 1, 0] +- # y: [0, 1, 0] +- # z: [0, 0, -1] + - group: imu + iio: + name: i2c-BMI0160:00 + mount_matrix: ++ # TODO: Reverify on actual hardware + x: [1, 0, 0] -+ y: [0, 0, -1] -+ z: [0, 1, 0] ++ y: [0, 1, 0] ++ z: [0, 0, -1] - # The target input device(s) that the virtual device profile can use - target_devices: + # Optional configuration for the composite device + options: diff --git a/PKGBUILD/inputplumber/003-Update-mount_matrix.patch b/PKGBUILD/inputplumber/003-Update-mount_matrix.patch deleted file mode 100644 index dcd9b9f2..00000000 --- a/PKGBUILD/inputplumber/003-Update-mount_matrix.patch +++ /dev/null @@ -1,326 +0,0 @@ -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_2.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_2.yaml -index 5d4e261..a68cbe8 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayaneo_2.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayaneo_2.yaml -@@ -45,8 +45,8 @@ source_devices: - name: i2c-BMI0160:00 - mount_matrix: - x: [0, -1, 0] -- y: [0, 0, -1] -- z: [1, 0, 0] -+ y: [-1, 0, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_2021.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_2021.yaml -index d7cf6e6..cd88fe3 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayaneo_2021.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayaneo_2021.yaml -@@ -49,8 +49,8 @@ source_devices: - name: i2c-10EC5280:00 - mount_matrix: - x: [0, -1, 0] -- y: [0, 0, -1] -- z: [1, 0, 0] -+ y: [-1, 0, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_2s.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_2s.yaml -index 04f5ec3..c4b245f 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayaneo_2s.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayaneo_2s.yaml -@@ -44,9 +44,11 @@ source_devices: - iio: - name: i2c-BMI0160:00 - mount_matrix: -- x: [0, -1, 0] -- y: [0, 0, -1] -- z: [1, 0, 0] -+ # Calculated from observed gyro output -+ # TODO: Verify updated matrix on actual hardware -+ x: [0, -1, 0] -+ y: [-1, 0, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air.yaml -index fd16747..9ba17d0 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air.yaml -@@ -35,13 +35,13 @@ source_devices: - name: AT Translated Set 2 keyboard - phys_path: isa0060/serio0/input0 - handler: event* -- #- group: imu #TODO:reenable after we switch from polling -- # iio: -- # name: i2c-BMI0160:00 -- # mount_matrix: -- # x: [0, -1, 0] -- # y: [0, 0, -1] -- # z: [1, 0, 0] -+ - group: imu -+ iio: -+ name: i2c-BMI0160:00 -+ mount_matrix: -+ x: [0, -1, 0] -+ y: [-1, 0, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_1s.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_1s.yaml -index 779ba5d..8a2598b 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_1s.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_1s.yaml -@@ -43,6 +43,12 @@ source_devices: - - group: imu - iio: - name: i2c-BMI0160:00 -+ mount_matrix: -+ # Tested on Air 1S 8840U -+ # TODO: Verify on 7840U -+ x: [0, -1, 0] -+ y: [-1, 0, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_plus.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_plus.yaml -index 3c15719..4b5a02b 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_plus.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_plus.yaml -@@ -52,8 +52,8 @@ source_devices: - name: bmi323-imu - mount_matrix: - x: [0, -1, 0] -- y: [0, 0, 1] -- z: [-1, 0, 0] -+ y: [1, 0, 0] -+ z: [0, 0, 1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_plus_mendo.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_plus_mendo.yaml -index 8cb61c5..d5e9264 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_plus_mendo.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayaneo_air_plus_mendo.yaml -@@ -42,9 +42,10 @@ source_devices: - iio: - name: bmi323-imu - mount_matrix: -+ # TODO: Reverify on actual hardware - x: [0, -1, 0] -- y: [0, 0, 1] -- z: [-1, 0, 0] -+ y: [-1, 0, 0] -+ z: [0, 0, 1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_flip.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_flip.yaml -index 2882d9f..babfd2f 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayaneo_flip.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayaneo_flip.yaml -@@ -44,9 +44,11 @@ source_devices: - iio: - name: i2c-BMI0160:00 - mount_matrix: -- x: [0, -1, 0] -- y: [0, 0, -1] -- z: [1, 0, 0] -+ # Calculated from observed gyro output -+ # TODO: Verify updated matrix on actual hardware -+ x: [0, -1, 0] -+ y: [-1, 0, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayaneo_next.yaml b/rootfs/usr/share/inputplumber/devices/50-ayaneo_next.yaml -index a9f6978..56d29bb 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayaneo_next.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayaneo_next.yaml -@@ -54,9 +54,10 @@ source_devices: - iio: - name: i2c-BMI0160:00 - mount_matrix: -+ # TODO: Reverify on actual hardware - x: [0, -1, 0] -- y: [0, 0, -1] -- z: [1, 0, 0] -+ y: [1, 0, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayn_loki_max.yaml b/rootfs/usr/share/inputplumber/devices/50-ayn_loki_max.yaml -index fed2735..01bfb19 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayn_loki_max.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayn_loki_max.yaml -@@ -37,8 +37,8 @@ source_devices: - name: i2c-BMI0160:00 - mount_matrix: - x: [1, 0, 0] -- y: [0, 0, -1] -- z: [0, 1, 0] -+ y: [0, -1, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayn_loki_mini_pro.yaml b/rootfs/usr/share/inputplumber/devices/50-ayn_loki_mini_pro.yaml -index c0a3783..f93346c 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayn_loki_mini_pro.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayn_loki_mini_pro.yaml -@@ -36,9 +36,10 @@ source_devices: - iio: - name: i2c-BMI0160:00 - mount_matrix: -+ # TODO: Reverify on actual hardware - x: [1, 0, 0] -- y: [0, 0, -1] -- z: [0, 1, 0] -+ y: [0, 1, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-ayn_loki_zero.yaml b/rootfs/usr/share/inputplumber/devices/50-ayn_loki_zero.yaml -index 8f13377..8e18f10 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-ayn_loki_zero.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-ayn_loki_zero.yaml -@@ -32,13 +32,13 @@ source_devices: - name: AT Translated Set 2 keyboard - phys_path: isa0060/serio0/input0 - handler: event* -- #- group: imu #TODO:reenable after we switch from polling -- # iio: -- # name: i2c-BMI0160:00 -- # mount_matrix: -- # x: [1, 0, 0] -- # y: [0, 0, -1] -- # z: [0, 1, 0] -+ - group: imu -+ iio: -+ name: i2c-BMI0160:00 -+ mount_matrix: -+ x: [1, 0, 0] -+ y: [0, 1, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-gpd_win4.yaml b/rootfs/usr/share/inputplumber/devices/50-gpd_win4.yaml -index 866dc43..20cf87c 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-gpd_win4.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-gpd_win4.yaml -@@ -35,6 +35,12 @@ source_devices: - - group: imu - iio: - name: i2c-BMI0160:00 -+ mount_matrix: -+ # Tested on 6800U -+ # TODO: Verify on other models -+ x: [-1, 0, 0] -+ y: [0, -1, 0] -+ z: [0, 0, 1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-legion_go.yaml b/rootfs/usr/share/inputplumber/devices/50-legion_go.yaml -index 2094949..aaccb8b 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-legion_go.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-legion_go.yaml -@@ -133,8 +133,8 @@ source_devices: - name: gyro_3d - mount_matrix: - x: [0, 1, 0] -- y: [0, 0, -1] -- z: [-1, 0, 0] -+ y: [-1, 0, 0] -+ z: [0, 0, -1] - - # Block all evdev devices; mouse, touchpad, gamepad, keyboard - - group: gamepad -diff --git a/rootfs/usr/share/inputplumber/devices/50-msi_claw.yaml b/rootfs/usr/share/inputplumber/devices/50-msi_claw.yaml -index 471da92..89c1735 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-msi_claw.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-msi_claw.yaml -@@ -40,16 +40,18 @@ source_devices: - iio: - name: accel_3d - mount_matrix: -+ # TODO: Reverify on actual hardware - x: [0, 1, 0] -- y: [0, 0, -1] -- z: [-1, 0, 0] -+ y: [-1, 0, 0] -+ z: [0, 0, -1] - - group: imu - iio: - name: gyro_3d - mount_matrix: -+ # TODO: Reverify on actual hardware - x: [0, 1, 0] -- y: [0, 0, -1] -- z: [-1, 0, 0] -+ y: [-1, 0, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-orangepi_neo.yaml b/rootfs/usr/share/inputplumber/devices/50-orangepi_neo.yaml -index 4b289f5..0158b2b 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-orangepi_neo.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-orangepi_neo.yaml -@@ -61,9 +61,10 @@ source_devices: - iio: - name: i2c-BMI0260:00 - mount_matrix: -+ # TODO: Reverify on actual hardware - x: [1, 0, 0] -- y: [0, 0, -1] -- z: [0, -1, 0] -+ y: [0, -1, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-rog_ally.yaml b/rootfs/usr/share/inputplumber/devices/50-rog_ally.yaml -index d3106ab..8e9fbd6 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-rog_ally.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-rog_ally.yaml -@@ -50,9 +50,9 @@ source_devices: - iio: - name: bmi323-imu - mount_matrix: -- x: [-1, 0, 0] -- y: [0, 0, -1] -- z: [0, 1, 0] -+ x: [1, 0, 0] -+ y: [0, -1, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: -diff --git a/rootfs/usr/share/inputplumber/devices/50-rog_ally_x.yaml b/rootfs/usr/share/inputplumber/devices/50-rog_ally_x.yaml -index a80d292..8f5b2f7 100644 ---- a/rootfs/usr/share/inputplumber/devices/50-rog_ally_x.yaml -+++ b/rootfs/usr/share/inputplumber/devices/50-rog_ally_x.yaml -@@ -49,9 +49,9 @@ source_devices: - iio: - name: bmi323-imu - mount_matrix: -- x: [-1, 0, 0] -- y: [0, 0, -1] -- z: [0, 1, 0] -+ x: [1, 0, 0] -+ y: [0, -1, 0] -+ z: [0, 0, -1] - - # Optional configuration for the composite device - options: diff --git a/PKGBUILD/inputplumber/PKGBUILD b/PKGBUILD/inputplumber/PKGBUILD index dafd0e80..c705c43a 100644 --- a/PKGBUILD/inputplumber/PKGBUILD +++ b/PKGBUILD/inputplumber/PKGBUILD @@ -2,8 +2,8 @@ # Upstream maintainer: William Edwards pkgname=inputplumber _pkgbase=inputplumber -pkgver=0.39.2 -pkgrel=2 +pkgver=0.40.0 +pkgrel=1 pkgdesc="Open source input router and remapper daemon for Linux" arch=('x86_64') options=(!lto) @@ -15,12 +15,12 @@ provides=('inputplumber') conflicts=('inputplumber-bin') source=("${_pkgbase}::git+https://github.com/ShadowBlip/${_pkgbase}.git#tag=v$pkgver" 001-no-rootfs.patch - 003-Update-mount_matrix.patch + 002-enable-gyro-air_zero.patch ) sha256sums=('SKIP' '55d15e63e2229e239b51823ba1a92522cba4a04e424c8515c210c102b4b6a88c' # 001-no-rootfs.patch - 'c2d8439b113ff03996974e70ed53dc4bcdec3f35ec91aa2c6a828a49bfab8341' # 003-Update-mount_matrix.patch + '050ed7b0cf854c86cecda952864b64a0563b2a193d8c231f37cd052398148501' # 002-enable-gyro-air_zero.patch ) build() {