fix(OrangePi NEO): Add 8800U varaint touchpad detection.

ShadowBlip · Jul 26, 2024 · b473d2b · b473d2b
1 parent de268e5
commit b473d2b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/rootfs/usr/share/inputplumber/devices/50-orangepi_neo.yaml b/rootfs/usr/share/inputplumber/devices/50-orangepi_neo.yaml
@@ -31,14 +31,14 @@ source_devices:
   - group: mouse
     blocked: true
     evdev:
-      name: OPI0001:00 0911:5288 Touchpad
-      phys_path: i2c-OPI0001:00
+      name: { OPI0001:00 0911:5288 Touchpad, SYNA3602:00 0911:5288 Touchpad }
+      phys_path: { i2c-OPI0001:00, i2c-SYNA3602:00 }
       handler: event*
   - group: mouse
     blocked: true
     evdev:
-      name: OPI0002:00 0911:5288 Touchpad
-      phys_path: i2c-OPI0002:00
+      name: { OPI0002:00 0911:5288 Touchpad, SYNA3602:01 0911:5288 Touchpad }
+      phys_path: { i2c-OPI0002:00, i2c-SYNA3602:01 }
       handler: event*
 
   ## Gamepad Devices

diff --git a/src/drivers/opineo/driver.rs b/src/drivers/opineo/driver.rs
@@ -18,12 +18,18 @@ use super::{
 // Hardware ID's
 pub const VID: u16 = 0x0911;
 pub const PID: u16 = 0x5288;
+pub const LPAD_NAMES: [&str; 2] = ["OPI0001:00", "SYNA3602:00"];
+pub const RPAD_NAMES: [&str; 2] = ["OPI0002:00", "SYNA3602:01"];
+
 // Report ID
 pub const TOUCH_DATA: u8 = 0x04;
+
 // Input report size
 const TOUCHPAD_PACKET_SIZE: usize = 10;
+
 // HID buffer read timeout
 const HID_TIMEOUT: i32 = 10;
+
 // Input report axis ranges
 pub const PAD_X_MAX: f64 = 512.0;
 pub const PAD_Y_MAX: f64 = 512.0;

diff --git a/src/input/source/hidraw/opineo.rs b/src/input/source/hidraw/opineo.rs
@@ -2,7 +2,7 @@ use std::{error::Error, fmt::Debug};
 
 use crate::{
     drivers::opineo::{
-        driver::{self, Driver},
+        driver::{self, Driver, LPAD_NAMES, RPAD_NAMES},
         event,
     },
     input::{
@@ -34,10 +34,10 @@ impl OrangePiNeoTouchpad {
         // Query the udev module to determine if this is the left or right touchpad.
         let name = device_info.name();
         let touchpad_side = {
-            if name == "OPI0001:00" {
+            if LPAD_NAMES.contains(&name.as_str()) {
                 log::debug!("Detected left pad.");
                 TouchpadSide::Left
-            } else if name == "OPI0002:00" {
+            } else if RPAD_NAMES.contains(&name.as_str()) {
                 log::debug!("Detected right pad.");
                 TouchpadSide::Right
             } else {