From 02a9ccc4f27c7137cb6471fd6137777f40645132 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Thu, 6 Apr 2017 12:26:22 +0300 Subject: [PATCH] Removed dependency on --- src/modules/uavcan/sensors/gnss.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/uavcan/sensors/gnss.cpp b/src/modules/uavcan/sensors/gnss.cpp index 11ad01e8c1..744fd2c936 100644 --- a/src/modules/uavcan/sensors/gnss.cpp +++ b/src/modules/uavcan/sensors/gnss.cpp @@ -43,7 +43,6 @@ #include #include #include -#include const char *const UavcanGnssBridge::NAME = "gnss"; @@ -424,7 +423,7 @@ void UavcanGnssBridge::broadcast_from_orb(const uavcan::TimerEvent &) msg.covariance.resize(3, orb_msg.epv * orb_msg.epv); msg.covariance.resize(6, orb_msg.s_variance_m_s * orb_msg.s_variance_m_s); - msg.pdop = std::max(orb_msg.hdop, orb_msg.vdop); // this is a hack :( + msg.pdop = (orb_msg.hdop > orb_msg.vdop) ? orb_msg.hdop : orb_msg.vdop; // this is a hack :( // Publishing now (void) _pub_fix2.broadcast(msg);