From c5061dfc1db5ce68b037c7698f349840f8c80e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Thor=C3=A9n?= Date: Tue, 26 Aug 2025 10:15:46 +0200 Subject: [PATCH 1/3] Add error status to MONR --- atos/common/roschannels/monitorchannel.hpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/atos/common/roschannels/monitorchannel.hpp b/atos/common/roschannels/monitorchannel.hpp index 8d32b6ddf..c8d551e70 100644 --- a/atos/common/roschannels/monitorchannel.hpp +++ b/atos/common/roschannels/monitorchannel.hpp @@ -80,7 +80,7 @@ inline message_type fromISOMonr(const uint32_t id, outdata.pose.header.stamp = stamp; outdata.velocity.header.stamp = stamp; outdata.acceleration.header.stamp = stamp; - + // Set frame ids outdata.atos_header.header.frame_id = "map"; // TODO outdata.pose.header.frame_id = "map"; // TODO @@ -113,6 +113,14 @@ inline message_type fromISOMonr(const uint32_t id, outdata.acceleration.accel.angular.y = 0; outdata.acceleration.accel.angular.z = 0; + outdata.error_status.abort_request = indata.error.abortRequest; + outdata.error_status.outside_geofence = indata.error.outsideGeofence; + outdata.error_status.bad_positioning_accuracy = indata.error.badPositioningAccuracy; + outdata.error_status.engine_fault = indata.error.engineFault; + outdata.error_status.battery_fault = indata.error.batteryFault; + outdata.error_status.sync_point_ended = indata.error.syncPointEnded; + outdata.error_status.unknown_error = indata.error.unknownError; + outdata.raw_data = raw_data; return outdata; From 4fb8d76108c65d8e6fa2e459680ce09bc9bb6d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Thor=C3=A9n?= Date: Tue, 26 Aug 2025 10:18:05 +0200 Subject: [PATCH 2/3] Formatting --- atos/common/roschannels/monitorchannel.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atos/common/roschannels/monitorchannel.hpp b/atos/common/roschannels/monitorchannel.hpp index c8d551e70..479a49c83 100644 --- a/atos/common/roschannels/monitorchannel.hpp +++ b/atos/common/roschannels/monitorchannel.hpp @@ -80,7 +80,7 @@ inline message_type fromISOMonr(const uint32_t id, outdata.pose.header.stamp = stamp; outdata.velocity.header.stamp = stamp; outdata.acceleration.header.stamp = stamp; - + // Set frame ids outdata.atos_header.header.frame_id = "map"; // TODO outdata.pose.header.frame_id = "map"; // TODO From fc3561aaa6f62fca328232fe719b013622891576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Thor=C3=A9n?= Date: Tue, 26 Aug 2025 10:19:51 +0200 Subject: [PATCH 3/3] Formatting --- atos/common/roschannels/monitorchannel.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/atos/common/roschannels/monitorchannel.hpp b/atos/common/roschannels/monitorchannel.hpp index 479a49c83..216ab0989 100644 --- a/atos/common/roschannels/monitorchannel.hpp +++ b/atos/common/roschannels/monitorchannel.hpp @@ -113,13 +113,13 @@ inline message_type fromISOMonr(const uint32_t id, outdata.acceleration.accel.angular.y = 0; outdata.acceleration.accel.angular.z = 0; - outdata.error_status.abort_request = indata.error.abortRequest; - outdata.error_status.outside_geofence = indata.error.outsideGeofence; + outdata.error_status.abort_request = indata.error.abortRequest; + outdata.error_status.outside_geofence = indata.error.outsideGeofence; outdata.error_status.bad_positioning_accuracy = indata.error.badPositioningAccuracy; - outdata.error_status.engine_fault = indata.error.engineFault; - outdata.error_status.battery_fault = indata.error.batteryFault; - outdata.error_status.sync_point_ended = indata.error.syncPointEnded; - outdata.error_status.unknown_error = indata.error.unknownError; + outdata.error_status.engine_fault = indata.error.engineFault; + outdata.error_status.battery_fault = indata.error.batteryFault; + outdata.error_status.sync_point_ended = indata.error.syncPointEnded; + outdata.error_status.unknown_error = indata.error.unknownError; outdata.raw_data = raw_data;