feat: Add Pico 4 Ultra controlller profile (#2671)

alvr-org · Jan 31, 2025 · 193387d · 193387d
1 parent 92c82f7
commit 193387d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/alvr/client_openxr/src/interaction.rs b/alvr/client_openxr/src/interaction.rs
@@ -137,6 +137,7 @@ impl InteractionContext {
         let controllers_profile_path = match platform {
             p if p.is_quest() => QUEST_CONTROLLER_PROFILE_PATH, // todo: create new controller profile for quest pro and 3
             Platform::PicoNeo3 => PICO_NEO3_CONTROLLER_PROFILE_PATH,
+            Platform::Pico4Ultra => PICO4S_CONTROLLER_PROFILE_PATH,
             p if p.is_pico() => PICO4_CONTROLLER_PROFILE_PATH,
             p if p.is_vive() => FOCUS3_CONTROLLER_PROFILE_PATH,
             Platform::Yvr => YVR_CONTROLLER_PROFILE_PATH,

diff --git a/alvr/common/src/inputs.rs b/alvr/common/src/inputs.rs
@@ -18,6 +18,7 @@ interaction_profile!(VIVE, "htc/vive");
 interaction_profile!(INDEX, "valve/index");
 interaction_profile!(PICO_NEO3, "bytedance/pico_neo3");
 interaction_profile!(PICO4, "bytedance/pico4");
+interaction_profile!(PICO4S, "bytedance/pico4s");
 interaction_profile!(FOCUS3, "htc/vive_focus3");
 interaction_profile!(YVR, "yvr/touch");
 
@@ -343,6 +344,47 @@ pub static CONTROLLER_PROFILE_INFO: Lazy<HashMap<u64, InteractionProfileInfo>> =
                 .collect(),
             },
         ),
+        (
+            *PICO4S_CONTROLLER_PROFILE_ID,
+            InteractionProfileInfo {
+                path: PICO4S_CONTROLLER_PROFILE_PATH,
+                button_set: [
+                    *LEFT_X_CLICK_ID,
+                    *LEFT_X_TOUCH_ID,
+                    *LEFT_Y_CLICK_ID,
+                    *LEFT_Y_TOUCH_ID,
+                    *LEFT_MENU_CLICK_ID,
+                    *LEFT_SYSTEM_CLICK_ID,
+                    *LEFT_TRIGGER_CLICK_ID,
+                    *LEFT_TRIGGER_VALUE_ID,
+                    *LEFT_TRIGGER_TOUCH_ID,
+                    *LEFT_THUMBSTICK_Y_ID,
+                    *LEFT_THUMBSTICK_X_ID,
+                    *LEFT_THUMBSTICK_CLICK_ID,
+                    *LEFT_THUMBSTICK_TOUCH_ID,
+                    *LEFT_SQUEEZE_CLICK_ID,
+                    *LEFT_SQUEEZE_VALUE_ID,
+                    *LEFT_THUMBREST_TOUCH_ID,
+                    *RIGHT_A_CLICK_ID,
+                    *RIGHT_A_TOUCH_ID,
+                    *RIGHT_B_CLICK_ID,
+                    *RIGHT_B_TOUCH_ID,
+                    *RIGHT_SYSTEM_CLICK_ID,
+                    *RIGHT_TRIGGER_CLICK_ID,
+                    *RIGHT_TRIGGER_VALUE_ID,
+                    *RIGHT_TRIGGER_TOUCH_ID,
+                    *RIGHT_THUMBSTICK_Y_ID,
+                    *RIGHT_THUMBSTICK_X_ID,
+                    *RIGHT_THUMBSTICK_CLICK_ID,
+                    *RIGHT_THUMBSTICK_TOUCH_ID,
+                    *RIGHT_SQUEEZE_CLICK_ID,
+                    *RIGHT_SQUEEZE_VALUE_ID,
+                    *RIGHT_THUMBREST_TOUCH_ID,
+                ]
+                .into_iter()
+                .collect(),
+            },
+        ),
         (
             *FOCUS3_CONTROLLER_PROFILE_ID,
             InteractionProfileInfo {