diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2022-03-28 22:49:31 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-03-29 00:04:50 +0200 |
commit | 6173590161f8ca4d84c030820c9f47e1f6a52561 (patch) | |
tree | 6ac62faaedfadfd8e1cfcad32ae589fd347000bf | |
parent | 13dc777d25b3697070b54c77d5e76f2b6082914b (diff) |
tracker/trackhat: fix settings not propagating to tracker
-rw-r--r-- | tracker-trackhat/camera.cpp | 10 | ||||
-rw-r--r-- | tracker-trackhat/settings.cpp | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/tracker-trackhat/camera.cpp b/tracker-trackhat/camera.cpp index b645f3af..49e20e41 100644 --- a/tracker-trackhat/camera.cpp +++ b/tracker-trackhat/camera.cpp @@ -72,12 +72,10 @@ pt_camera::result trackhat_camera::get_frame(pt_frame& frame_) if (!device.ensure_connected()) goto error; - if (sig.test_and_clear()) - { - set_pt_options(); - if (!init_regs()) - goto error; - } + if (sig.test_and_clear() && !init_regs()) + goto error; + + set_pt_options(); { trackHat_ExtendedPoints_t points; diff --git a/tracker-trackhat/settings.cpp b/tracker-trackhat/settings.cpp index 1598d843..201ca4ae 100644 --- a/tracker-trackhat/settings.cpp +++ b/tracker-trackhat/settings.cpp @@ -70,11 +70,12 @@ void trackhat_camera::set_pt_options() s.dynamic_pose = t.model == model_cap; s.init_phase_timeout = 500; - s.camera_name = "TrackHat Sensor (WIP)"; + s.camera_name = QStringLiteral("TrackHat Sensor (WIP)"); s.active_model_panel = t.model == model_cap ? 1 : 0; s.enable_point_filter = t.enable_point_filter; s.point_filter_coefficient = *t.point_filter_coefficient; + s.point_filter_deadzone = *t.point_filter_deadzone; } bool trackhat_camera::set_regs(const uint8_t(*regs)[3], unsigned len) |