diff --git a/platforms/common/uORB/SubscriptionBlocking.hpp b/platforms/common/uORB/SubscriptionBlocking.hpp index 71bcff1adfa..d550b81f3f5 100644 --- a/platforms/common/uORB/SubscriptionBlocking.hpp +++ b/platforms/common/uORB/SubscriptionBlocking.hpp @@ -67,10 +67,7 @@ public: void call(unsigned generation) override { // signal immediately if no interval, otherwise only if interval has elapsed - hrt_abstime last_update = _last_update.load(); - const uint32_t interval_us = _interval_us.load(); - - if ((interval_us == 0) || (hrt_elapsed_time(&last_update) >= interval_us)) { + if (interval_elapsed()) { pthread_cond_signal(&_cv); } } diff --git a/platforms/common/uORB/SubscriptionCallback.hpp b/platforms/common/uORB/SubscriptionCallback.hpp index 67c8cd693a6..541b8b4c849 100644 --- a/platforms/common/uORB/SubscriptionCallback.hpp +++ b/platforms/common/uORB/SubscriptionCallback.hpp @@ -149,14 +149,9 @@ public: // (count gate), respecting the optional interval (interval gate). const uint8_t req = _required_updates.load(); - if ((generation - _last_scheduled_generation) >= req) { - const hrt_abstime last_update = _last_update.load(); - const uint32_t interval_us = _interval_us.load(); - - if ((interval_us == 0) || (hrt_elapsed_time(&last_update) >= interval_us)) { - _last_scheduled_generation = generation; - _work_item->ScheduleNow(); - } + if (((generation - _last_scheduled_generation) >= req) && interval_elapsed()) { + _last_scheduled_generation = generation; + _work_item->ScheduleNow(); } }