Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix depcrecation errors #1973

Merged
merged 3 commits into from
Aug 26, 2024
Merged

fix depcrecation errors #1973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e18fe0
depcrecation errors
dakejahl Aug 6, 2024
95a2795
fix -Wdeprecated-enum-float-conversion in GeographicLib
dakejahl Aug 7, 2024
e71aa91
use GeographicLib::Geoid::ConvertHeight
dakejahl Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mavros/include/mavros/mavros_uas.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 egm96_5->ConvertHeight(lla->latitude, lla->longitude, 0.0, GeographicLib::Geoid::GEOIDTOELLIPSOID);
} else {
return 0.0;
}
Expand All @@ -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 egm96_5->ConvertHeight(lla->latitude, lla->longitude, 0.0, GeographicLib::Geoid::ELLIPSOIDTOGEOID);
} else {
return 0.0;
}
Expand Down
6 changes: 3 additions & 3 deletions mavros/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Loading