From 16df7f9ea8a2f5d7148eed155f1ed2c44d15a9ba Mon Sep 17 00:00:00 2001 From: Philip Manke Date: Mon, 8 Jan 2024 14:05:30 +0100 Subject: [PATCH 1/2] Remove option 'keep_out_of_sequence' for worker - obsolete. Fix data type of sensor temperature --- interface/cuvis.hpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/interface/cuvis.hpp b/interface/cuvis.hpp index e511e0a..67a1687 100644 --- a/interface/cuvis.hpp +++ b/interface/cuvis.hpp @@ -1157,7 +1157,7 @@ namespace cuvis ACQ_STUB_1a(hardware_queue_size, cuvis_comp_hardware_queue_size, int_t, size_t); ACQ_STUB_1a(hardware_queue_used, cuvis_comp_hardware_queue_used, int_t, size_t); - ACQ_STUB_1a(temperature, cuvis_comp_temperature, int_t, int); + ACQ_STUB_1a(temperature, cuvis_comp_temperature, double_t, int); #undef ACQ_STUB_1a @@ -2574,7 +2574,6 @@ namespace cuvis inline WorkerArgs::WorkerArgs() : worker_count(std::thread::hardware_concurrency()), poll_interval(std::chrono::milliseconds(5)), - keep_out_of_sequence(false), worker_queue_hard_limit(100), worker_queue_soft_limit(90), can_drop(false) @@ -2583,10 +2582,8 @@ namespace cuvis inline WorkerArgs::operator cuvis_worker_settings_t() const { cuvis_worker_settings_t args; - args.worker_count = worker_count; args.poll_interval = (std::int32_t)(poll_interval.count()); - args.keep_out_of_sequence = (int)keep_out_of_sequence; args.worker_queue_hard_limit = worker_queue_hard_limit; args.worker_queue_soft_limit = worker_queue_soft_limit; args.can_drop = can_drop; From 2aa0cfd6844ae2b9482cc42abfe45f05ca0b3d07 Mon Sep 17 00:00:00 2001 From: Philip Manke Date: Mon, 8 Jan 2024 14:19:11 +0100 Subject: [PATCH 2/2] Return temperature as double_t --- interface/cuvis.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/cuvis.hpp b/interface/cuvis.hpp index 67a1687..2ca9c40 100644 --- a/interface/cuvis.hpp +++ b/interface/cuvis.hpp @@ -1157,7 +1157,7 @@ namespace cuvis ACQ_STUB_1a(hardware_queue_size, cuvis_comp_hardware_queue_size, int_t, size_t); ACQ_STUB_1a(hardware_queue_used, cuvis_comp_hardware_queue_used, int_t, size_t); - ACQ_STUB_1a(temperature, cuvis_comp_temperature, double_t, int); + ACQ_STUB_1a(temperature, cuvis_comp_temperature, double_t, double_t); #undef ACQ_STUB_1a