Merge branch 'main' into feature/ivim

ika-rwth-aachen · Nov 29, 2024 · 33cfaa4 · 33cfaa4
2 parents f4079ca + f986a23
commit 33cfaa4
Show file tree

Hide file tree

Showing 17 changed files with 482 additions and 443 deletions.
diff --git a/.../etsi_its_denm_conversion/include/etsi_its_denm_conversion/convertVehicleIdentification.h b/.../etsi_its_denm_conversion/include/etsi_its_denm_conversion/convertVehicleIdentification.h
@@ -42,25 +42,25 @@ namespace etsi_its_denm_conversion {
 
 void toRos_VehicleIdentification(const denm_VehicleIdentification_t& in, denm_msgs::VehicleIdentification& out) {
   if (in.wMInumber) {
-    toRos_WMInumber(*in.wMInumber, out.wm_inumber);
-    out.wm_inumber_is_present = true;
+    toRos_WMInumber(*in.wMInumber, out.w_m_inumber);
+    out.w_m_inumber_is_present = true;
   }
   if (in.vDS) {
-    toRos_VDS(*in.vDS, out.vds);
-    out.vds_is_present = true;
+    toRos_VDS(*in.vDS, out.v_ds);
+    out.v_ds_is_present = true;
   }
 }
 
 void toStruct_VehicleIdentification(const denm_msgs::VehicleIdentification& in, denm_VehicleIdentification_t& out) {
   memset(&out, 0, sizeof(denm_VehicleIdentification_t));
 
-  if (in.wm_inumber_is_present) {
+  if (in.w_m_inumber_is_present) {
     out.wMInumber = (denm_WMInumber_t*) calloc(1, sizeof(denm_WMInumber_t));
-    toStruct_WMInumber(in.wm_inumber, *out.wMInumber);
+    toStruct_WMInumber(in.w_m_inumber, *out.wMInumber);
   }
-  if (in.vds_is_present) {
+  if (in.v_ds_is_present) {
     out.vDS = (denm_VDS_t*) calloc(1, sizeof(denm_VDS_t));
-    toStruct_VDS(in.vds, *out.vDS);
+    toStruct_VDS(in.v_ds, *out.vDS);
   }
 }
 

diff --git a/...i_its_mapem_ts_conversion/include/etsi_its_mapem_ts_conversion/convertNodeOffsetPointXY.h b/...i_its_mapem_ts_conversion/include/etsi_its_mapem_ts_conversion/convertNodeOffsetPointXY.h
@@ -49,27 +49,27 @@ void toRos_NodeOffsetPointXY(const mapem_ts_NodeOffsetPointXY_t& in, mapem_ts_ms
   switch (in.present) {
   case mapem_ts_NodeOffsetPointXY_PR_node_XY1:
     toRos_NodeXY20b(in.choice.node_XY1, out.node_xy1);
-    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y1;
+    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY1;
     break;
   case mapem_ts_NodeOffsetPointXY_PR_node_XY2:
     toRos_NodeXY22b(in.choice.node_XY2, out.node_xy2);
-    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y2;
+    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY2;
     break;
   case mapem_ts_NodeOffsetPointXY_PR_node_XY3:
     toRos_NodeXY24b(in.choice.node_XY3, out.node_xy3);
-    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y3;
+    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY3;
     break;
   case mapem_ts_NodeOffsetPointXY_PR_node_XY4:
     toRos_NodeXY26b(in.choice.node_XY4, out.node_xy4);
-    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y4;
+    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY4;
     break;
   case mapem_ts_NodeOffsetPointXY_PR_node_XY5:
     toRos_NodeXY28b(in.choice.node_XY5, out.node_xy5);
-    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y5;
+    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY5;
     break;
   case mapem_ts_NodeOffsetPointXY_PR_node_XY6:
     toRos_NodeXY32b(in.choice.node_XY6, out.node_xy6);
-    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y6;
+    out.choice = mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY6;
     break;
   case mapem_ts_NodeOffsetPointXY_PR_node_LatLon:
     toRos_NodeLLmD64b(in.choice.node_LatLon, out.node_lat_lon);
@@ -83,27 +83,27 @@ void toStruct_NodeOffsetPointXY(const mapem_ts_msgs::NodeOffsetPointXY& in, mape
   memset(&out, 0, sizeof(mapem_ts_NodeOffsetPointXY_t));
 
   switch (in.choice) {
-  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y1:
+  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY1:
     toStruct_NodeXY20b(in.node_xy1, out.choice.node_XY1);
     out.present = mapem_ts_NodeOffsetPointXY_PR::mapem_ts_NodeOffsetPointXY_PR_node_XY1;
     break;
-  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y2:
+  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY2:
     toStruct_NodeXY22b(in.node_xy2, out.choice.node_XY2);
     out.present = mapem_ts_NodeOffsetPointXY_PR::mapem_ts_NodeOffsetPointXY_PR_node_XY2;
     break;
-  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y3:
+  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY3:
     toStruct_NodeXY24b(in.node_xy3, out.choice.node_XY3);
     out.present = mapem_ts_NodeOffsetPointXY_PR::mapem_ts_NodeOffsetPointXY_PR_node_XY3;
     break;
-  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y4:
+  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY4:
     toStruct_NodeXY26b(in.node_xy4, out.choice.node_XY4);
     out.present = mapem_ts_NodeOffsetPointXY_PR::mapem_ts_NodeOffsetPointXY_PR_node_XY4;
     break;
-  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y5:
+  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY5:
     toStruct_NodeXY28b(in.node_xy5, out.choice.node_XY5);
     out.present = mapem_ts_NodeOffsetPointXY_PR::mapem_ts_NodeOffsetPointXY_PR_node_XY5;
     break;
-  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_X_Y6:
+  case mapem_ts_msgs::NodeOffsetPointXY::CHOICE_NODE_XY6:
     toStruct_NodeXY32b(in.node_xy6, out.choice.node_XY6);
     out.present = mapem_ts_NodeOffsetPointXY_PR::mapem_ts_NodeOffsetPointXY_PR_node_XY6;
     break;

diff --git a/etsi_its_msgs/etsi_its_denm_msgs/msg/PositioningSolutionType.msg b/etsi_its_msgs/etsi_its_denm_msgs/msg/PositioningSolutionType.msg
@@ -32,7 +32,7 @@ uint8 value
 uint8 NO_POSITIONING_SOLUTION = 0
 uint8 S_GNSS = 1
 uint8 D_GNSS = 2
-uint8 S_GNSS_PLUS_D_R = 3
-uint8 D_GNSS_PLUS_D_R = 4
+uint8 S_GNS_SPLUS_DR = 3
+uint8 D_GNS_SPLUS_DR = 4
 uint8 D_R = 5
 
diff --git a/etsi_its_msgs/etsi_its_denm_msgs/msg/VehicleIdentification.msg b/etsi_its_msgs/etsi_its_denm_msgs/msg/VehicleIdentification.msg
@@ -32,9 +32,9 @@
 # }
 # ------------------------------------------------------------------------------
 
-WMInumber wm_inumber
-bool wm_inumber_is_present
+WMInumber w_m_inumber
+bool w_m_inumber_is_present
 
-VDS vds
-bool vds_is_present
+VDS v_ds
+bool v_ds_is_present
 
diff --git a/etsi_its_msgs/etsi_its_mapem_ts_msgs/msg/NodeOffsetPointXY.msg b/etsi_its_msgs/etsi_its_mapem_ts_msgs/msg/NodeOffsetPointXY.msg
@@ -39,22 +39,22 @@
 uint8 choice
 
 NodeXY20b node_xy1
-uint8 CHOICE_NODE_X_Y1 = 0
+uint8 CHOICE_NODE_XY1 = 0
 
 NodeXY22b node_xy2
-uint8 CHOICE_NODE_X_Y2 = 1
+uint8 CHOICE_NODE_XY2 = 1
 
 NodeXY24b node_xy3
-uint8 CHOICE_NODE_X_Y3 = 2
+uint8 CHOICE_NODE_XY3 = 2
 
 NodeXY26b node_xy4
-uint8 CHOICE_NODE_X_Y4 = 3
+uint8 CHOICE_NODE_XY4 = 3
 
 NodeXY28b node_xy5
-uint8 CHOICE_NODE_X_Y5 = 4
+uint8 CHOICE_NODE_XY5 = 4
 
 NodeXY32b node_xy6
-uint8 CHOICE_NODE_X_Y6 = 5
+uint8 CHOICE_NODE_XY6 = 5
 
 NodeLLmD64b node_lat_lon
 uint8 CHOICE_NODE_LAT_LON = 6

diff --git a/etsi_its_msgs/etsi_its_spatem_ts_msgs/msg/IntersectionStatusObject.msg b/etsi_its_msgs/etsi_its_spatem_ts_msgs/msg/IntersectionStatusObject.msg
@@ -56,8 +56,8 @@ uint8 BIT_INDEX_TRAFFIC_DEPENDENT_OPERATION = 6
 uint8 BIT_INDEX_STANDBY_OPERATION = 7
 uint8 BIT_INDEX_FAILURE_MODE = 8
 uint8 BIT_INDEX_OFF = 9
-uint8 BIT_INDEX_RECENT_M_A_PMESSAGE_UPDATE = 10
-uint8 BIT_INDEX_RECENT_CHANGE_IN_M_A_PASSIGNED_LANES_IDS_USED = 11
-uint8 BIT_INDEX_NO_VALID_M_A_PIS_AVAILABLE_AT_THIS_TIME = 12
-uint8 BIT_INDEX_NO_VALID_SPATIS_AVAILABLE_AT_THIS_TIME = 13
+uint8 BIT_INDEX_RECENT_MA_PMESSAGE_UPDATE = 10
+uint8 BIT_INDEX_RECENT_CHANGE_IN_MA_PASSIGNED_LANES_I_DS_USED = 11
+uint8 BIT_INDEX_NO_VALID_MA_PIS_AVAILABLE_AT_THIS_TIME = 12
+uint8 BIT_INDEX_NO_VALID_SPA_TIS_AVAILABLE_AT_THIS_TIME = 13
 
diff --git a/etsi_its_msgs/etsi_its_vam_ts_msgs/msg/TrajectoryInterceptionConfidence.msg b/etsi_its_msgs/etsi_its_vam_ts_msgs/msg/TrajectoryInterceptionConfidence.msg
@@ -48,8 +48,8 @@
 uint8 value
 uint8 MIN = 0
 uint8 MAX = 3
-uint8 LESSTHAN50PERCENT = 0
-uint8 BETWEEN50AND70_PERCENT = 1
-uint8 BETWEEN70AND90_PERCENT = 2
+uint8 LESSTHAN50_PERCENT = 0
+uint8 BETWEEN50_AND70_PERCENT = 1
+uint8 BETWEEN70_AND90_PERCENT = 2
 uint8 ABOVE90_PERCENT = 3