From 124215a183bd0875243077a6f13a8ceb34e7baa8 Mon Sep 17 00:00:00 2001 From: Vladimir Ermakov Date: Thu, 6 Jun 2024 12:18:51 +0000 Subject: [PATCH] Imported upstream version '1.19.0' of 'upstream' --- libmavconn/CHANGELOG.rst | 3 +++ libmavconn/package.xml | 2 +- mavros/CHANGELOG.rst | 10 ++++++++++ mavros/package.xml | 2 +- mavros/src/plugins/global_position.cpp | 17 +---------------- mavros_extras/CHANGELOG.rst | 3 +++ mavros_extras/package.xml | 2 +- mavros_msgs/CHANGELOG.rst | 3 +++ mavros_msgs/package.xml | 2 +- test_mavros/CHANGELOG.rst | 3 +++ test_mavros/package.xml | 2 +- 11 files changed, 28 insertions(+), 21 deletions(-) diff --git a/libmavconn/CHANGELOG.rst b/libmavconn/CHANGELOG.rst index 80c301474..f22006f01 100644 --- a/libmavconn/CHANGELOG.rst +++ b/libmavconn/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package libmavconn ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.19.0 (2024-06-06) +------------------- + 1.18.0 (2024-03-03) ------------------- diff --git a/libmavconn/package.xml b/libmavconn/package.xml index 311d0d166..641541e67 100644 --- a/libmavconn/package.xml +++ b/libmavconn/package.xml @@ -1,7 +1,7 @@ libmavconn - 1.18.0 + 1.19.0 MAVLink communication library. This library provide unified connection handling classes diff --git a/mavros/CHANGELOG.rst b/mavros/CHANGELOG.rst index 5d7c7b682..a7475f88c 100644 --- a/mavros/CHANGELOG.rst +++ b/mavros/CHANGELOG.rst @@ -2,6 +2,16 @@ Changelog for package mavros ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.19.0 (2024-06-06) +------------------- +* gps_global_origin: remove LLA to ECEF conversion + gps_global_origin is being published as + geographic_msgs::GeoPointStamped + message, which wants LLA format + https://docs.ros.org/en/api/geographic_msgs/html/msg/GeoPointStamped.html + FIX https://github.com/mavlink/mavros/issues/1381 +* Contributors: Beniamino Pozzan + 1.18.0 (2024-03-03) ------------------- * sys_status.cpp: improve timeout code diff --git a/mavros/package.xml b/mavros/package.xml index d7a30a6f6..d36fdd58d 100644 --- a/mavros/package.xml +++ b/mavros/package.xml @@ -1,7 +1,7 @@ mavros - 1.18.0 + 1.19.0 MAVROS -- MAVLink extendable communication node for ROS with proxy for Ground Control Station. diff --git a/mavros/src/plugins/global_position.cpp b/mavros/src/plugins/global_position.cpp index c8e35f395..d8ef442d3 100644 --- a/mavros/src/plugins/global_position.cpp +++ b/mavros/src/plugins/global_position.cpp @@ -233,22 +233,7 @@ class GlobalPositionPlugin : public plugin::PluginBase { g_origin->position.longitude = glob_orig.longitude / 1E7; g_origin->position.altitude = glob_orig.altitude / 1E3 + m_uas->geoid_to_ellipsoid_height(&g_origin->position); // convert height amsl to height above the ellipsoid - try { - /** - * @brief Conversion from geodetic coordinates (LLA) to ECEF (Earth-Centered, Earth-Fixed) - * Note: "earth" frame, in ECEF, of the global origin - */ - GeographicLib::Geocentric earth(GeographicLib::Constants::WGS84_a(), - GeographicLib::Constants::WGS84_f()); - - earth.Forward(g_origin->position.latitude, g_origin->position.longitude, g_origin->position.altitude, - g_origin->position.latitude, g_origin->position.longitude, g_origin->position.altitude); - - gp_global_origin_pub.publish(g_origin); - } - catch (const std::exception& e) { - ROS_INFO_STREAM("GP: Caught exception: " << e.what() << std::endl); - } + gp_global_origin_pub.publish(g_origin); } /** @todo Handler for GLOBAL_POSITION_INT_COV */ diff --git a/mavros_extras/CHANGELOG.rst b/mavros_extras/CHANGELOG.rst index 45adc4dcf..df1e9245b 100644 --- a/mavros_extras/CHANGELOG.rst +++ b/mavros_extras/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package mavros_extras ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.19.0 (2024-06-06) +------------------- + 1.18.0 (2024-03-03) ------------------- * [camera plugin] Fix image_index and capture_result not properly filled diff --git a/mavros_extras/package.xml b/mavros_extras/package.xml index a705e7ada..18c7a39aa 100644 --- a/mavros_extras/package.xml +++ b/mavros_extras/package.xml @@ -1,7 +1,7 @@ mavros_extras - 1.18.0 + 1.19.0 Extra nodes and plugins for MAVROS. diff --git a/mavros_msgs/CHANGELOG.rst b/mavros_msgs/CHANGELOG.rst index a2b3709a4..a1790fa83 100644 --- a/mavros_msgs/CHANGELOG.rst +++ b/mavros_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package mavros_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.19.0 (2024-06-06) +------------------- + 1.18.0 (2024-03-03) ------------------- * sys_status.cpp: Add a SYS_STATUS message publisher diff --git a/mavros_msgs/package.xml b/mavros_msgs/package.xml index 0bc299b5e..d83207030 100644 --- a/mavros_msgs/package.xml +++ b/mavros_msgs/package.xml @@ -1,7 +1,7 @@ mavros_msgs - 1.18.0 + 1.19.0 mavros_msgs defines messages for MAVROS. diff --git a/test_mavros/CHANGELOG.rst b/test_mavros/CHANGELOG.rst index 1c98394ef..c456ccfda 100644 --- a/test_mavros/CHANGELOG.rst +++ b/test_mavros/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package test_mavros ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.19.0 (2024-06-06) +------------------- + 1.18.0 (2024-03-03) ------------------- diff --git a/test_mavros/package.xml b/test_mavros/package.xml index c10efa19e..df4ba9c74 100644 --- a/test_mavros/package.xml +++ b/test_mavros/package.xml @@ -1,7 +1,7 @@ test_mavros - 1.18.0 + 1.19.0 Tests for MAVROS package Vladimir Ermakov