From e193240e980b9ea7f4c42f57a7abce25a803e516 Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Wed, 8 Nov 2017 22:31:14 +0100 Subject: [PATCH] FlightTask: fix CI: static field requiring definition in cpp file, errors with clang linker (CI) but not with GCC --- src/lib/FlightTasks/tasks/FlightTask.cpp | 4 +++- src/lib/FlightTasks/tasks/FlightTask.hpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/FlightTasks/tasks/FlightTask.cpp b/src/lib/FlightTasks/tasks/FlightTask.cpp index c91d2e59a3..eefad59500 100644 --- a/src/lib/FlightTasks/tasks/FlightTask.cpp +++ b/src/lib/FlightTasks/tasks/FlightTask.cpp @@ -1,10 +1,12 @@ #include "FlightTask.hpp" #include +constexpr uint64_t FlightTask::_timeout; + int FlightTask::update() { _time = hrt_elapsed_time(&_starting_time_stamp) / 1e6f; - _deltatime = math::min((int)hrt_elapsed_time(&_last_time_stamp), _timeout) / 1e6f; + _deltatime = math::min(hrt_elapsed_time(&_last_time_stamp), _timeout) / 1e6f; _last_time_stamp = hrt_absolute_time(); updateSubscriptions(); _evaluate_vehicle_position(); diff --git a/src/lib/FlightTasks/tasks/FlightTask.hpp b/src/lib/FlightTasks/tasks/FlightTask.hpp index 2485253a26..e2e1429e11 100644 --- a/src/lib/FlightTasks/tasks/FlightTask.hpp +++ b/src/lib/FlightTasks/tasks/FlightTask.hpp @@ -89,7 +89,7 @@ public: }; protected: - static constexpr int _timeout = 500000; /*< maximal time in us before a loop or data times out */ + static constexpr uint64_t _timeout = 500000; /*< maximal time in us before a loop or data times out */ float _time = 0; /**< passed time in seconds since the task was activated */ float _deltatime = 0; /**< passed time in seconds since the task was last updated */