rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

LP-2 fixed compilation errors around usage of isinf() and isnan()

Browse Source
This commit is contained in:
Philippe Renon 2015-10-04 22:42:26 +02:00 committed by James Duley
parent e22061cc8e
commit 2df89769c9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/gcs/src/plugins/hitl/il2simulator.cpp
View File

@ -65,7 +65,7 @@
#include "extensionsystem/pluginmanager.h" #include "extensionsystem/pluginmanager.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/threadmanager.h> #include <coreplugin/threadmanager.h>
#include <math.h> #include <cmath>
const float IL2Simulator::FT2M = 12 * .254; const float IL2Simulator::FT2M = 12 * .254;
const float IL2Simulator::KT2MPS = 0.514444444; const float IL2Simulator::KT2MPS = 0.514444444;
@ -194,13 +194,13 @@ void IL2Simulator::processUpdate(const QByteArray & inp)
current.Y = old.Y + (current.dY * current.dT); current.Y = old.Y + (current.dY * current.dT);
// accelerations (filtered) // accelerations (filtered)
if (isnan(old.ddX) || isinf(old.ddX)) { if (std::isnan(old.ddX) || std::isinf(old.ddX)) {
old.ddX = 0; old.ddX = 0;
} }
if (isnan(old.ddY) || isinf(old.ddY)) { if (std::isnan(old.ddY) || std::isinf(old.ddY)) {
old.ddY = 0; old.ddY = 0;
} }
if (isnan(old.ddZ) || isinf(old.ddZ)) { if (std::isnan(old.ddZ) || std::isinf(old.ddZ)) {
old.ddZ = 0; old.ddZ = 0;
} }
#define SPEED_FILTER 10 #define SPEED_FILTER 10
@ -210,13 +210,13 @@ void IL2Simulator::processUpdate(const QByteArray & inp)
#define TURN_FILTER 10 #define TURN_FILTER 10
// turn speeds (filtered) // turn speeds (filtered)
if (isnan(old.dAzimuth) || isinf(old.dAzimuth)) { if (std::isnan(old.dAzimuth) || std::isinf(old.dAzimuth)) {
old.dAzimuth = 0; old.dAzimuth = 0;
} }
if (isnan(old.dPitch) || isinf(old.dPitch)) { if (std::isnan(old.dPitch) || std::isinf(old.dPitch)) {
old.dPitch = 0; old.dPitch = 0;
} }
if (isnan(old.dRoll) || isinf(old.dRoll)) { if (std::isnan(old.dRoll) || std::isinf(old.dRoll)) {
old.dRoll = 0; old.dRoll = 0;
} }
current.dAzimuth = (angleDifference(current.azimuth, old.azimuth) / current.dT + TURN_FILTER * (old.dAzimuth)) / (TURN_FILTER + 1); current.dAzimuth = (angleDifference(current.azimuth, old.azimuth) / current.dT + TURN_FILTER * (old.dAzimuth)) / (TURN_FILTER + 1);