From 6e256c81217ed3a22fd160d9c903ae44a3bf23bb Mon Sep 17 00:00:00 2001 From: Lennart Reiher Date: Wed, 10 Jul 2024 12:47:26 +0000 Subject: [PATCH 1/2] fix missing cpm_ts typos after pr #21 --- etsi_its_conversion/etsi_its_conversion/src/Converter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etsi_its_conversion/etsi_its_conversion/src/Converter.cpp b/etsi_its_conversion/etsi_its_conversion/src/Converter.cpp index 2714509dd..87526cf78 100644 --- a/etsi_its_conversion/etsi_its_conversion/src/Converter.cpp +++ b/etsi_its_conversion/etsi_its_conversion/src/Converter.cpp @@ -389,7 +389,7 @@ void Converter::udpCallback(const udp_msgs::msg::UdpPacket::UniquePtr udp_msg) { #else publisher_cpm_ts_->publish(msg); #endif - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_cpm_CollectivePerceptionMessage, asn1_structp); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_cpm_ts_CollectivePerceptionMessage, asn1_structp); } else { #ifdef ROS1 @@ -590,7 +590,7 @@ void Converter::rosCallbackCpmTs(const etsi_its_cpm_ts_msgs::msg::CollectivePerc RCLCPP_ERROR(this->get_logger(), #endif "Check of struct failed: %s", error_buffer); - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_cpm_CollectivePerceptionMessage, &asn1_struct); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_cpm_ts_CollectivePerceptionMessage, &asn1_struct); return; } asn_encode_to_new_buffer_result_t ret = asn_encode_to_new_buffer(0, ATS_UNALIGNED_BASIC_PER, &asn_DEF_cpm_ts_CollectivePerceptionMessage, &asn1_struct); @@ -601,7 +601,7 @@ void Converter::rosCallbackCpmTs(const etsi_its_cpm_ts_msgs::msg::CollectivePerc RCLCPP_ERROR(this->get_logger(), #endif "Failed to encode message: %s", ret.result.failed_type->xml_tag); - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_cpm_CollectivePerceptionMessage, &asn1_struct); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_cpm_ts_CollectivePerceptionMessage, &asn1_struct); free(ret.buffer); return; } @@ -632,7 +632,7 @@ void Converter::rosCallbackCpmTs(const etsi_its_cpm_ts_msgs::msg::CollectivePerc RCLCPP_DEBUG(this->get_logger(), #endif "Published CPM bitstring"); - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_cpm_CollectivePerceptionMessage, &asn1_struct); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_cpm_ts_CollectivePerceptionMessage, &asn1_struct); free(ret.buffer); } From 2be325ba0284cfa67ffef27ac3fe68d4c93bfed1 Mon Sep 17 00:00:00 2001 From: Lennart Reiher Date: Wed, 10 Jul 2024 13:09:54 +0000 Subject: [PATCH 2/2] fix yet another missing type adjustment --- etsi_its_conversion/etsi_its_conversion/src/Converter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etsi_its_conversion/etsi_its_conversion/src/Converter.cpp b/etsi_its_conversion/etsi_its_conversion/src/Converter.cpp index 87526cf78..6c0ab0f3e 100644 --- a/etsi_its_conversion/etsi_its_conversion/src/Converter.cpp +++ b/etsi_its_conversion/etsi_its_conversion/src/Converter.cpp @@ -373,7 +373,7 @@ void Converter::udpCallback(const udp_msgs::msg::UdpPacket::UniquePtr udp_msg) { ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_cpm_ts_CollectivePerceptionMessage, asn1_structp); return; } - if (logLevelIsDebug()) asn_fprint(stdout, &asn_DEF_cpm_ts_CollectivePerceptionMessage, asn1_struct); + if (logLevelIsDebug()) asn_fprint(stdout, &asn_DEF_cpm_ts_CollectivePerceptionMessage, asn1_structp); // convert struct to ROS msg and publish #ifdef ROS1