From c94045c007c7e91dd0cf5ecd8836dbf9f9d7c864 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 18 Oct 2021 05:19:49 +0200 Subject: tracker/trackhat: simplify connection state tracking --- tracker-trackhat/settings.cpp | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'tracker-trackhat/settings.cpp') diff --git a/tracker-trackhat/settings.cpp b/tracker-trackhat/settings.cpp index 28b97c0a..ecc693b8 100644 --- a/tracker-trackhat/settings.cpp +++ b/tracker-trackhat/settings.cpp @@ -75,11 +75,10 @@ void trackhat_camera::set_pt_options() s.point_filter_coefficient = *t.point_filter_coefficient; } -int trackhat_camera::init_regs() +bool trackhat_camera::init_regs() { unsigned attempts = 0; constexpr unsigned max_attempts = 5; - TH_ErrorCode error; auto exp = (uint8_t)t.exposure; auto exp2 = (uint8_t)(exp == 0xff ? 0xf0 : 0xff); @@ -109,26 +108,32 @@ start: for (const auto& reg : regs) { trackHat_SetRegister_t r{reg[0], reg[1], reg[2]}; - error = trackHat_SetRegisterValue(&device, &r); - if (error != TH_SUCCESS) + auto status = th_check(trackHat_SetRegisterValue(&*device, &r)); + if (status == TH_SUCCESS) + continue; + else if (status == TH_FAILED_TO_SET_REGISTER) + goto retry; + else goto error; } if (int elapsed = (int)t.elapsed_ms(); elapsed > 250) qDebug() << "tracker/trackhat: setting registers took" << elapsed << "ms"; - return TH_SUCCESS; + return true; -error: +retry: if (attempts++ < max_attempts) { - qDebug() << "tracker/trackhat: set register retry attempt" - << attempts << "/" << max_attempts; - portable::sleep(10); + auto dbg = qDebug(); + dbg << "tracker/trackhat: set register retry attempt"; + dbg.space(); dbg.nospace(); + dbg << attempts << "/" << max_attempts; + portable::sleep(50); goto start; } - qDebug() << "tracker/trackhat: failed to set registers"; - - return error; +error: + device.disconnect(); + return false; } -- cgit v1.2.3