fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 00:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

FlightTask: fix CI: static field requiring definition in cpp file, errors with clang linker (CI) but not with GCC

Browse Source
This commit is contained in:
Matthias Grob
2018-04-05 07:30:12 +02:00
committed by Beat Küng
parent 23fe822955
commit e193240e98
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/tasks/FlightTask.cpp
+3 -1
View File
@@ -1,10 +1,12 @@
#include "FlightTask.hpp"
#include <mathlib/mathlib.h>
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();
src/lib/FlightTasks/tasks/FlightTask.hpp
+1 -1
View File
@@ -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 */