From 52b0bb0c42657b5751c8cd1371e1a69b2304529c Mon Sep 17 00:00:00 2001 From: Patrick Nicolas Date: Mon, 9 Jun 2025 18:47:28 +0200 Subject: [PATCH] update monado --- flake.nix | 2 +- monado-rev | 2 +- server/driver/wivrn_hmd.cpp | 13 +++++++------ server/driver/wivrn_hmd.h | 12 ++++++------ 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index 67bd4600..39a4b4eb 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,7 @@ # Keep in sync with CMakeLists.txt monado rev rev = builtins.readFile ./monado-rev; # Nix will output the correct hash when it doesn't match - hash = "sha256-KSHnJ+H/JdLFg/oFERDk+dXTJY44yUP04WHxa7xp6LY="; + hash = "sha256-+PiWxnvMXaSFc+67r17GBRXo7kbjikSElawNMJCydrk="; }; }; diff --git a/monado-rev b/monado-rev index 26d0187f..f6c566ab 100644 --- a/monado-rev +++ b/monado-rev @@ -1 +1 @@ -9f9d26270ef5131f94adaecc4d6b87aebe50d841 +bb9bcee2a3be75592de819d9e3fb2c8ed27bb7dc diff --git a/server/driver/wivrn_hmd.cpp b/server/driver/wivrn_hmd.cpp index 582ba8d3..b5378316 100644 --- a/server/driver/wivrn_hmd.cpp +++ b/server/driver/wivrn_hmd.cpp @@ -147,12 +147,12 @@ void wivrn_hmd::update_battery(const from_headset::battery & new_battery) battery = new_battery; } -void wivrn_hmd::get_view_poses(const xrt_vec3 * default_eye_relation, - int64_t at_timestamp_ns, - uint32_t view_count, - xrt_space_relation * out_head_relation, - xrt_fov * out_fovs, - xrt_pose * out_poses) +xrt_result_t wivrn_hmd::get_view_poses(const xrt_vec3 * default_eye_relation, + int64_t at_timestamp_ns, + uint32_t view_count, + xrt_space_relation * out_head_relation, + xrt_fov * out_fovs, + xrt_pose * out_poses) { auto [extrapolation_time, view] = views.get_at(at_timestamp_ns); cnx->add_predict_offset(extrapolation_time); @@ -180,6 +180,7 @@ void wivrn_hmd::get_view_poses(const xrt_vec3 * default_eye_relation, out_fovs[eye] = view.fovs[eye]; out_poses[eye] = view.poses[eye]; } + return XRT_SUCCESS; } xrt_result_t wivrn_hmd::get_battery_status(bool * out_present, diff --git a/server/driver/wivrn_hmd.h b/server/driver/wivrn_hmd.h index f3cb0ebf..c90f4f4b 100644 --- a/server/driver/wivrn_hmd.h +++ b/server/driver/wivrn_hmd.h @@ -67,12 +67,12 @@ public: void set_foveated_size(uint32_t width, uint32_t height); xrt_result_t get_tracked_pose(xrt_input_name name, int64_t at_timestamp_ns, xrt_space_relation *); - void get_view_poses(const xrt_vec3 * default_eye_relation, - int64_t at_timestamp_ns, - uint32_t view_count, - xrt_space_relation * out_head_relation, - xrt_fov * out_fovs, - xrt_pose * out_poses); + xrt_result_t get_view_poses(const xrt_vec3 * default_eye_relation, + int64_t at_timestamp_ns, + uint32_t view_count, + xrt_space_relation * out_head_relation, + xrt_fov * out_fovs, + xrt_pose * out_poses); xrt_result_t get_battery_status(bool * out_present, bool * out_charging, float * out_charge);