From 3e18fe054833622c420e7725bc2754a1249c2ee8 Mon Sep 17 00:00:00 2001 From: Jacob Dahl Date: Tue, 6 Aug 2024 14:36:57 -0800 Subject: [PATCH 1/3] depcrecation errors --- mavros/setup.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mavros/setup.cfg b/mavros/setup.cfg index f332eeeeb..645a394dc 100644 --- a/mavros/setup.cfg +++ b/mavros/setup.cfg @@ -3,7 +3,7 @@ name = 'mavros' description = 'Helper scripts and module for MAVROS' license = 'Triple licensed under GPLv3, LGPLv3 and BSD' author = 'Vladimir Ermakov' -author-email = 'vooon341@gmail.com' +author_email = 'vooon341@gmail.com' maintainer = 'Vladimir Ermakov' maintainer_email = 'vooon341@gmail.com' keywords = 'ROS' @@ -21,10 +21,10 @@ console_scripts = mav=mavros.cmd:cli [develop] -script-dir=$base/lib/mavros +script_dir=$base/lib/mavros [install] -install-scripts=$base/lib/mavros +install_scripts=$base/lib/mavros [yapf] blank_line_before_nested_class_or_def = True From 95a279589ac3526148d758c98ca226377e9ecc96 Mon Sep 17 00:00:00 2001 From: Jacob Dahl Date: Tue, 6 Aug 2024 21:46:47 -0800 Subject: [PATCH 2/3] fix -Wdeprecated-enum-float-conversion in GeographicLib --- mavros/include/mavros/mavros_uas.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mavros/include/mavros/mavros_uas.hpp b/mavros/include/mavros/mavros_uas.hpp index 2aed4b41d..45e1c90e4 100644 --- a/mavros/include/mavros/mavros_uas.hpp +++ b/mavros/include/mavros/mavros_uas.hpp @@ -161,7 +161,7 @@ class Data inline double geoid_to_ellipsoid_height(const T lla) { if (egm96_5) { - return GeographicLib::Geoid::GEOIDTOELLIPSOID * (*egm96_5)(lla->latitude, lla->longitude); + return int(GeographicLib::Geoid::GEOIDTOELLIPSOID) * (*egm96_5)(lla->latitude, lla->longitude); } else { return 0.0; } @@ -181,7 +181,7 @@ class Data inline double ellipsoid_to_geoid_height(const T lla) { if (egm96_5) { - return GeographicLib::Geoid::ELLIPSOIDTOGEOID * (*egm96_5)(lla->latitude, lla->longitude); + return int(GeographicLib::Geoid::ELLIPSOIDTOGEOID) * (*egm96_5)(lla->latitude, lla->longitude); } else { return 0.0; } From e71aa9129960c2761578f94a07518493e8c3c289 Mon Sep 17 00:00:00 2001 From: Jacob Dahl Date: Wed, 21 Aug 2024 10:50:13 -0800 Subject: [PATCH 3/3] use GeographicLib::Geoid::ConvertHeight --- mavros/include/mavros/mavros_uas.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mavros/include/mavros/mavros_uas.hpp b/mavros/include/mavros/mavros_uas.hpp index 45e1c90e4..06b1a83d8 100644 --- a/mavros/include/mavros/mavros_uas.hpp +++ b/mavros/include/mavros/mavros_uas.hpp @@ -161,7 +161,7 @@ class Data inline double geoid_to_ellipsoid_height(const T lla) { if (egm96_5) { - return int(GeographicLib::Geoid::GEOIDTOELLIPSOID) * (*egm96_5)(lla->latitude, lla->longitude); + return egm96_5->ConvertHeight(lla->latitude, lla->longitude, 0.0, GeographicLib::Geoid::GEOIDTOELLIPSOID); } else { return 0.0; } @@ -181,7 +181,7 @@ class Data inline double ellipsoid_to_geoid_height(const T lla) { if (egm96_5) { - return int(GeographicLib::Geoid::ELLIPSOIDTOGEOID) * (*egm96_5)(lla->latitude, lla->longitude); + return egm96_5->ConvertHeight(lla->latitude, lla->longitude, 0.0, GeographicLib::Geoid::ELLIPSOIDTOGEOID); } else { return 0.0; }