Merge pull request #1 from jpbusch/rust-based-codegen

Final changes for #17.
ika-rwth-aachen · Jun 17, 2024 · 4b29035 · 4b29035
2 parents 92988ac + 8187140
commit 4b29035
Show file tree

Hide file tree

Showing 601 changed files with 2,038 additions and 1,676 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -124,7 +124,7 @@
       "args": [
         "asn1/raw/cam_en302637_2/CAM-PDU-Descriptions.asn",
         "asn1/raw/cam_en302637_2/cdd/ITS-Container.asn",
-        "-m", "cam",
+        "-t", "cam",
         "-o", "etsi_its_conversion/etsi_its_cam_conversion/include/etsi_its_cam_conversion"
       ],
       "console": "integratedTerminal",
@@ -139,7 +139,7 @@
       "args": [
         "asn1/raw/denm_en302637_3/DENM-PDU-Descriptions.asn",
         "asn1/raw/denm_en302637_3/cdd/ITS-Container.asn",
-        "-m", "denm",
+        "-t", "denm",
         "-o", "etsi_its_conversion/etsi_its_denm_conversion/include/etsi_its_denm_conversion"
       ],
       "console": "integratedTerminal",

diff --git a/README.md b/README.md
@@ -205,7 +205,7 @@ Note that an alternative Rust-based code generation is currently being tested, w
 ./utils/codegen/codegen-rust/asn1ToConversionHeader.py \
   asn1/raw/cam_en302637_2/CAM-PDU-Descriptions.asn \
   asn1/raw/cam_en302637_2/cdd/ITS-Container.asn \
-  -m cam \
+  -t cam \
   -o etsi_its_conversion/etsi_its_cam_conversion/include/etsi_its_cam_conversion
 ```
 

diff --git a/...n/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAccelerationConfidence.h b/...n/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAccelerationConfidence.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -42,13 +41,14 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_AccelerationConfidence(const AccelerationConfidence_t& in, cam_msgs::AccelerationConfidence& out) {
+
   etsi_its_primitives_conversion::toRos_INTEGER(in, out.value);
 }
 
 void toStruct_AccelerationConfidence(const cam_msgs::AccelerationConfidence& in, AccelerationConfidence_t& out) {
-  memset(&out, 0, sizeof(AccelerationConfidence_t));
 
+  memset(&out, 0, sizeof(AccelerationConfidence_t));
   etsi_its_primitives_conversion::toStruct_INTEGER(in.value, out);
 }
 
-}
+}
diff --git a/...sion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAccelerationControl.h b/...sion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAccelerationControl.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -42,15 +41,16 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_AccelerationControl(const AccelerationControl_t& in, cam_msgs::AccelerationControl& out) {
+
   etsi_its_primitives_conversion::toRos_BIT_STRING(in, out.value);
   out.bits_unused = in.bits_unused;
 }
 
 void toStruct_AccelerationControl(const cam_msgs::AccelerationControl& in, AccelerationControl_t& out) {
-  memset(&out, 0, sizeof(AccelerationControl_t));
 
+  memset(&out, 0, sizeof(AccelerationControl_t));
   etsi_its_primitives_conversion::toStruct_BIT_STRING(in.value, out);
   out.bits_unused = in.bits_unused;
 }
 
-}
+}
diff --git a/...ion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAccidentSubCauseCode.h b/...ion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAccidentSubCauseCode.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -42,13 +41,14 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_AccidentSubCauseCode(const AccidentSubCauseCode_t& in, cam_msgs::AccidentSubCauseCode& out) {
+
   etsi_its_primitives_conversion::toRos_INTEGER(in, out.value);
 }
 
 void toStruct_AccidentSubCauseCode(const cam_msgs::AccidentSubCauseCode& in, AccidentSubCauseCode_t& out) {
-  memset(&out, 0, sizeof(AccidentSubCauseCode_t));
 
+  memset(&out, 0, sizeof(AccidentSubCauseCode_t));
   etsi_its_primitives_conversion::toStruct_INTEGER(in.value, out);
 }
 
-}
+}
diff --git a/..._its_conversion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertActionID.h b/..._its_conversion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertActionID.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,8 +27,8 @@ SOFTWARE.
 #pragma once
 
 #include <etsi_its_cam_coding/ActionID.h>
-#include <etsi_its_cam_conversion/convertSequenceNumber.h>
 #include <etsi_its_cam_conversion/convertStationID.h>
+#include <etsi_its_cam_conversion/convertSequenceNumber.h>
 #ifdef ROS1
 #include <etsi_its_cam_msgs/ActionID.h>
 namespace cam_msgs = etsi_its_cam_msgs;
@@ -42,15 +41,17 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_ActionID(const ActionID_t& in, cam_msgs::ActionID& out) {
+
   toRos_StationID(in.originatingStationID, out.originating_station_id);
   toRos_SequenceNumber(in.sequenceNumber, out.sequence_number);
 }
 
 void toStruct_ActionID(const cam_msgs::ActionID& in, ActionID_t& out) {
+
   memset(&out, 0, sizeof(ActionID_t));
 
   toStruct_StationID(in.originating_station_id, out.originatingStationID);
   toStruct_SequenceNumber(in.sequence_number, out.sequenceNumber);
 }
 
-}
+}
diff --git a/...sion/include/etsi_its_cam_conversion/convertAdverseWeatherConditionAdhesionSubCauseCode.h b/...sion/include/etsi_its_cam_conversion/convertAdverseWeatherConditionAdhesionSubCauseCode.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -42,13 +41,14 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_AdverseWeatherConditionAdhesionSubCauseCode(const AdverseWeatherCondition_AdhesionSubCauseCode_t& in, cam_msgs::AdverseWeatherConditionAdhesionSubCauseCode& out) {
+
   etsi_its_primitives_conversion::toRos_INTEGER(in, out.value);
 }
 
 void toStruct_AdverseWeatherConditionAdhesionSubCauseCode(const cam_msgs::AdverseWeatherConditionAdhesionSubCauseCode& in, AdverseWeatherCondition_AdhesionSubCauseCode_t& out) {
-  memset(&out, 0, sizeof(AdverseWeatherCondition_AdhesionSubCauseCode_t));
 
+  memset(&out, 0, sizeof(AdverseWeatherCondition_AdhesionSubCauseCode_t));
   etsi_its_primitives_conversion::toStruct_INTEGER(in.value, out);
 }
 
-}
+}
diff --git a/...si_its_cam_conversion/convertAdverseWeatherConditionExtremeWeatherConditionSubCauseCode.h b/...si_its_cam_conversion/convertAdverseWeatherConditionExtremeWeatherConditionSubCauseCode.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -42,13 +41,14 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_AdverseWeatherConditionExtremeWeatherConditionSubCauseCode(const AdverseWeatherCondition_ExtremeWeatherConditionSubCauseCode_t& in, cam_msgs::AdverseWeatherConditionExtremeWeatherConditionSubCauseCode& out) {
+
   etsi_its_primitives_conversion::toRos_INTEGER(in, out.value);
 }
 
 void toStruct_AdverseWeatherConditionExtremeWeatherConditionSubCauseCode(const cam_msgs::AdverseWeatherConditionExtremeWeatherConditionSubCauseCode& in, AdverseWeatherCondition_ExtremeWeatherConditionSubCauseCode_t& out) {
-  memset(&out, 0, sizeof(AdverseWeatherCondition_ExtremeWeatherConditionSubCauseCode_t));
 
+  memset(&out, 0, sizeof(AdverseWeatherCondition_ExtremeWeatherConditionSubCauseCode_t));
   etsi_its_primitives_conversion::toStruct_INTEGER(in.value, out);
 }
 
-}
+}
diff --git a/...include/etsi_its_cam_conversion/convertAdverseWeatherConditionPrecipitationSubCauseCode.h b/...include/etsi_its_cam_conversion/convertAdverseWeatherConditionPrecipitationSubCauseCode.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -42,13 +41,14 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_AdverseWeatherConditionPrecipitationSubCauseCode(const AdverseWeatherCondition_PrecipitationSubCauseCode_t& in, cam_msgs::AdverseWeatherConditionPrecipitationSubCauseCode& out) {
+
   etsi_its_primitives_conversion::toRos_INTEGER(in, out.value);
 }
 
 void toStruct_AdverseWeatherConditionPrecipitationSubCauseCode(const cam_msgs::AdverseWeatherConditionPrecipitationSubCauseCode& in, AdverseWeatherCondition_PrecipitationSubCauseCode_t& out) {
-  memset(&out, 0, sizeof(AdverseWeatherCondition_PrecipitationSubCauseCode_t));
 
+  memset(&out, 0, sizeof(AdverseWeatherCondition_PrecipitationSubCauseCode_t));
   etsi_its_primitives_conversion::toStruct_INTEGER(in.value, out);
 }
 
-}
+}
diff --git a/...on/include/etsi_its_cam_conversion/convertAdverseWeatherConditionVisibilitySubCauseCode.h b/...on/include/etsi_its_cam_conversion/convertAdverseWeatherConditionVisibilitySubCauseCode.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -42,13 +41,14 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_AdverseWeatherConditionVisibilitySubCauseCode(const AdverseWeatherCondition_VisibilitySubCauseCode_t& in, cam_msgs::AdverseWeatherConditionVisibilitySubCauseCode& out) {
+
   etsi_its_primitives_conversion::toRos_INTEGER(in, out.value);
 }
 
 void toStruct_AdverseWeatherConditionVisibilitySubCauseCode(const cam_msgs::AdverseWeatherConditionVisibilitySubCauseCode& in, AdverseWeatherCondition_VisibilitySubCauseCode_t& out) {
-  memset(&out, 0, sizeof(AdverseWeatherCondition_VisibilitySubCauseCode_t));
 
+  memset(&out, 0, sizeof(AdverseWeatherCondition_VisibilitySubCauseCode_t));
   etsi_its_primitives_conversion::toStruct_INTEGER(in.value, out);
 }
 
-}
+}
diff --git a/..._its_conversion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAltitude.h b/..._its_conversion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAltitude.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,8 +27,8 @@ SOFTWARE.
 #pragma once
 
 #include <etsi_its_cam_coding/Altitude.h>
-#include <etsi_its_cam_conversion/convertAltitudeConfidence.h>
 #include <etsi_its_cam_conversion/convertAltitudeValue.h>
+#include <etsi_its_cam_conversion/convertAltitudeConfidence.h>
 #ifdef ROS1
 #include <etsi_its_cam_msgs/Altitude.h>
 namespace cam_msgs = etsi_its_cam_msgs;
@@ -42,15 +41,17 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_Altitude(const Altitude_t& in, cam_msgs::Altitude& out) {
+
   toRos_AltitudeValue(in.altitudeValue, out.altitude_value);
   toRos_AltitudeConfidence(in.altitudeConfidence, out.altitude_confidence);
 }
 
 void toStruct_Altitude(const cam_msgs::Altitude& in, Altitude_t& out) {
+
   memset(&out, 0, sizeof(Altitude_t));
 
   toStruct_AltitudeValue(in.altitude_value, out.altitudeValue);
   toStruct_AltitudeConfidence(in.altitude_confidence, out.altitudeConfidence);
 }
 
-}
+}
diff --git a/...rsion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAltitudeConfidence.h b/...rsion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAltitudeConfidence.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +27,6 @@ SOFTWARE.
 #pragma once
 
 #include <etsi_its_cam_coding/AltitudeConfidence.h>
-
 #ifdef ROS1
 #include <etsi_its_cam_msgs/AltitudeConfidence.h>
 namespace cam_msgs = etsi_its_cam_msgs;
@@ -41,13 +39,14 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_AltitudeConfidence(const AltitudeConfidence_t& in, cam_msgs::AltitudeConfidence& out) {
+
   out.value = in;
 }
 
 void toStruct_AltitudeConfidence(const cam_msgs::AltitudeConfidence& in, AltitudeConfidence_t& out) {
-  memset(&out, 0, sizeof(AltitudeConfidence_t));
 
+  memset(&out, 0, sizeof(AltitudeConfidence_t));
   out = in.value;
 }
 
-}
+}
diff --git a/...conversion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAltitudeValue.h b/...conversion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertAltitudeValue.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -42,13 +41,14 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_AltitudeValue(const AltitudeValue_t& in, cam_msgs::AltitudeValue& out) {
+
   etsi_its_primitives_conversion::toRos_INTEGER(in, out.value);
 }
 
 void toStruct_AltitudeValue(const cam_msgs::AltitudeValue& in, AltitudeValue_t& out) {
-  memset(&out, 0, sizeof(AltitudeValue_t));
 
+  memset(&out, 0, sizeof(AltitudeValue_t));
   etsi_its_primitives_conversion::toStruct_INTEGER(in.value, out);
 }
 
-}
+}
diff --git a/...onversion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertBasicContainer.h b/...onversion/etsi_its_cam_conversion/include/etsi_its_cam_conversion/convertBasicContainer.h
@@ -2,7 +2,6 @@
 MIT License
 
 Copyright (c) 2023 Institute for Automotive Engineering (ika), RWTH Aachen University
-Copyright (c) 2024 Instituto de Telecomunicações, Universidade de Aveiro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,8 +27,8 @@ SOFTWARE.
 #pragma once
 
 #include <etsi_its_cam_coding/BasicContainer.h>
-#include <etsi_its_cam_conversion/convertReferencePosition.h>
 #include <etsi_its_cam_conversion/convertStationType.h>
+#include <etsi_its_cam_conversion/convertReferencePosition.h>
 #ifdef ROS1
 #include <etsi_its_cam_msgs/BasicContainer.h>
 namespace cam_msgs = etsi_its_cam_msgs;
@@ -42,15 +41,17 @@ namespace cam_msgs = etsi_its_cam_msgs::msg;
 namespace etsi_its_cam_conversion {
 
 void toRos_BasicContainer(const BasicContainer_t& in, cam_msgs::BasicContainer& out) {
+
   toRos_StationType(in.stationType, out.station_type);
   toRos_ReferencePosition(in.referencePosition, out.reference_position);
 }
 
 void toStruct_BasicContainer(const cam_msgs::BasicContainer& in, BasicContainer_t& out) {
+
   memset(&out, 0, sizeof(BasicContainer_t));
 
   toStruct_StationType(in.station_type, out.stationType);
   toStruct_ReferencePosition(in.reference_position, out.referencePosition);
 }
 
-}
+}