From df9ebf261fb7dd3014e72a4683633ac5dba8156a Mon Sep 17 00:00:00 2001 From: Jae Lee Date: Sun, 16 May 2021 22:59:32 +0000 Subject: [PATCH] d/illixr: Update ILLIXR driver. --- src/xrt/drivers/illixr/illixr_component.cpp | 17 ++--------------- src/xrt/drivers/illixr/illixr_prober.c | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/xrt/drivers/illixr/illixr_component.cpp b/src/xrt/drivers/illixr/illixr_component.cpp index 7b412c585..d802678f9 100644 --- a/src/xrt/drivers/illixr/illixr_component.cpp +++ b/src/xrt/drivers/illixr/illixr_component.cpp @@ -24,18 +24,11 @@ class illixr_plugin : public plugin { public: illixr_plugin(std::string name_, phonebook *pb_) - : plugin{name_, pb_}, sb{pb->lookup_impl()}, sb_pose{pb->lookup_impl()}, - sb_eyebuffer{sb->publish("eyebuffer")}, sb_vsync_estimate{sb->subscribe_latest( - "vsync_estimate")} + : plugin{name_, pb_}, sb{pb->lookup_impl()}, sb_pose{pb->lookup_impl()} {} const std::shared_ptr sb; const std::shared_ptr sb_pose; - const std::unique_ptr> sb_eyebuffer; - const std::unique_ptr> sb_vsync_estimate; - fast_pose_type prev_pose; /* stores a copy of pose each time - illixr_read_pose() is called */ - std::chrono::time_point sample_time; /* when prev_pose was stored */ }; static illixr_plugin *illixr_plugin_obj = nullptr; @@ -60,9 +53,6 @@ illixr_read_pose() const fast_pose_type fast_pose = illixr_plugin_obj->sb_pose->get_fast_pose(); const pose_type pose = fast_pose.pose; - // record when the pose was read for use in write_frame - illixr_plugin_obj->sample_time = std::chrono::system_clock::now(); - ret.orientation.x = pose.orientation.x(); ret.orientation.y = pose.orientation.y(); ret.orientation.z = pose.orientation.z(); @@ -71,8 +61,5 @@ illixr_read_pose() ret.position.y = pose.position.y(); ret.position.z = pose.position.z(); - // store pose in static variable for use in write_frame - illixr_plugin_obj->prev_pose = fast_pose; // copy member variables - return ret; -} \ No newline at end of file +} diff --git a/src/xrt/drivers/illixr/illixr_prober.c b/src/xrt/drivers/illixr/illixr_prober.c index 437bc4e9b..964bb8c95 100644 --- a/src/xrt/drivers/illixr/illixr_prober.c +++ b/src/xrt/drivers/illixr/illixr_prober.c @@ -62,7 +62,7 @@ struct xrt_auto_prober * illixr_create_auto_prober() { struct illixr_prober *dp = U_TYPED_CALLOC(struct illixr_prober); - dp->base.name = "IlliXR"; + dp->base.name = "ILLIXR"; dp->base.destroy = illixr_prober_destroy; dp->base.lelo_dallas_autoprobe = illixr_prober_autoprobe;