Skip to content

Commit

Permalink
fix handling of asn-types with dashes like "XYZ-addGrpC"
Browse files Browse the repository at this point in the history
  • Loading branch information
lreiher committed Sep 18, 2024
1 parent 8633eb7 commit 917c37c
Show file tree
Hide file tree
Showing 121 changed files with 2,711 additions and 82 deletions.
58 changes: 54 additions & 4 deletions etsi_its_msgs/etsi_its_mapem_ts_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ if(${ROS_VERSION} EQUAL 2)
"msg/ComputedLaneoffsetYaxis.msg"
"msg/ComputedLaneregional.msg"
"msg/ConnectingLane.msg"
"msg/ConnectionManeuverAssistAddGrpC.msg"
"msg/ConnectionManeuverAssist.msg"
"msg/ConnectionManeuverAssistregional.msg"
"msg/Connection.msg"
"msg/ConnectionTrajectory.msg"
"msg/ConnectionTrajectoryAddGrpC.msg"
"msg/ConnectsToList.msg"
"msg/CountryCode.msg"
"msg/CS1.msg"
Expand Down Expand Up @@ -132,6 +133,7 @@ if(${ROS_VERSION} EQUAL 2)
"msg/IntersectionGeometryregional.msg"
"msg/IntersectionID.msg"
"msg/IntersectionReferenceID.msg"
"msg/IntersectionStateAddGrpC.msg"
"msg/IntersectionStateList.msg"
"msg/IntersectionState.msg"
"msg/IntersectionStateregional.msg"
Expand All @@ -142,8 +144,17 @@ if(${ROS_VERSION} EQUAL 2)
"msg/ItsPduHeader.msg"
"msg/ItsStationPositionList.msg"
"msg/ItsStationPosition.msg"
"msg/LaneAttributesAddGrpC.msg"
"msg/LaneAttributesBarrier.msg"
"msg/LaneAttributesBike.msg"
"msg/LaneAttributesCrosswalk.msg"
"msg/LaneAttributes.msg"
"msg/LaneAttributesParking.msg"
"msg/LaneAttributesregional.msg"
"msg/LaneAttributesSidewalk.msg"
"msg/LaneAttributesStriping.msg"
"msg/LaneAttributesTrackedVehicle.msg"
"msg/LaneAttributesVehicle.msg"
"msg/LaneConnectionID.msg"
"msg/LaneDataAttributeList.msg"
"msg/LaneDataAttribute.msg"
Expand All @@ -167,11 +178,13 @@ if(${ROS_VERSION} EQUAL 2)
"msg/LongitudinalAccelerationValue.msg"
"msg/ManeuverAssistList.msg"
"msg/ManufacturerIdentifier.msg"
"msg/MapDataAddGrpC.msg"
"msg/MapData.msg"
"msg/MapDataregional.msg"
"msg/MAPEM.msg"
"msg/MergeDivergeNodeAngle.msg"
"msg/MinuteOfTheYear.msg"
"msg/MovementEventAddGrpC.msg"
"msg/MovementEventList.msg"
"msg/MovementEvent.msg"
"msg/MovementEventregional.msg"
Expand All @@ -180,17 +193,24 @@ if(${ROS_VERSION} EQUAL 2)
"msg/MovementState.msg"
"msg/MovementStateregional.msg"
"msg/MsgCount.msg"
"msg/NodeAttributeSet.msg"
"msg/NodeAttributeSetAddGrpC.msg"
"msg/NodeAttributeSetXY.msg"
"msg/NodeAttributeSetXYregional.msg"
"msg/NodeAttributeXYList.msg"
"msg/NodeAttributeXY.msg"
"msg/NodeLink.msg"
"msg/NodeListXY.msg"
"msg/NodeLLmD64b.msg"
"msg/Node.msg"
"msg/NodeOffsetPointXY.msg"
"msg/NodeOffsetPointXYregional.msg"
"msg/NodeSetXY.msg"
"msg/NodeXY20b.msg"
"msg/NodeXY22b.msg"
"msg/NodeXY24b.msg"
"msg/NodeXY26b.msg"
"msg/NodeXY28b.msg"
"msg/NodeXY32b.msg"
"msg/NodeXY.msg"
"msg/NumberOfOccupants.msg"
"msg/OffsetB09.msg"
Expand All @@ -211,6 +231,7 @@ if(${ROS_VERSION} EQUAL 2)
"msg/PosCentMass.msg"
"msg/PosConfidenceEllipse.msg"
"msg/PosFrontAx.msg"
"msg/Position3DAddGrpC.msg"
"msg/Position3D.msg"
"msg/Position3Dregional.msg"
"msg/PositionalAccuracy.msg"
Expand All @@ -237,14 +258,41 @@ if(${ROS_VERSION} EQUAL 2)
"msg/PtActivationType.msg"
"msg/PtvRequestType.msg"
"msg/ReferencePosition.msg"
"msg/RegAdvisorySpeed.msg"
"msg/RegComputedLane.msg"
"msg/RegConnectionManeuverAssist.msg"
"msg/RegGenericLane.msg"
"msg/RegIntersectionGeometry.msg"
"msg/RegIntersectionState.msg"
"msg/RegionId.msg"
"msg/Reg.msg"
"msg/RegLaneAttributes.msg"
"msg/RegLaneDataAttribute.msg"
"msg/RegMapData.msg"
"msg/RegMovementEvent.msg"
"msg/RegMovementState.msg"
"msg/RegNodeAttributeSetXY.msg"
"msg/RegNodeOffsetPointXY.msg"
"msg/RegPosition3D.msg"
"msg/RegRequestorDescription.msg"
"msg/RegRequestorType.msg"
"msg/RegRestrictionUserType.msg"
"msg/RegRoadSegment.msg"
"msg/RegRTCMcorrections.msg"
"msg/RegSignalControlZone.msg"
"msg/RegSignalRequestMessage.msg"
"msg/RegSignalRequest.msg"
"msg/RegSignalRequestPackage.msg"
"msg/RegSignalStatusMessage.msg"
"msg/RegSignalStatus.msg"
"msg/RegSignalStatusPackage.msg"
"msg/RegSPAT.msg"
"msg/RegulatorySpeedLimit.msg"
"msg/RejectedReason.msg"
"msg/RelevanceDistance.msg"
"msg/RelevanceTrafficDirection.msg"
"msg/RequestID.msg"
"msg/RequestImportanceLevel.msg"
"msg/RequestorDescriptionAddGrpC.msg"
"msg/RequestorDescription.msg"
"msg/RequestorDescriptionregional.msg"
"msg/RequestorPositionVector.msg"
Expand All @@ -258,6 +306,7 @@ if(${ROS_VERSION} EQUAL 2)
"msg/RestrictionClassAssignment.msg"
"msg/RestrictionClassID.msg"
"msg/RestrictionClassList.msg"
"msg/RestrictionUserTypeAddGrpC.msg"
"msg/RestrictionUserTypeList.msg"
"msg/RestrictionUserType.msg"
"msg/RestrictionUserTyperegional.msg"
Expand All @@ -276,7 +325,7 @@ if(${ROS_VERSION} EQUAL 2)
"msg/RTCMheader.msg"
"msg/RTCMmessageList.msg"
"msg/RTCMmessage.msg"
"msg/RTCM.msg"
"msg/RTCMRevision.msg"
"msg/ScaleB12.msg"
"msg/SegmentAttributeXYList.msg"
"msg/SegmentAttributeXY.msg"
Expand Down Expand Up @@ -304,6 +353,7 @@ if(${ROS_VERSION} EQUAL 2)
"msg/SignalStatusMessage.msg"
"msg/SignalStatusMessageregional.msg"
"msg/SignalStatus.msg"
"msg/SignalStatusPackageAddGrpC.msg"
"msg/SignalStatusPackageList.msg"
"msg/SignalStatusPackage.msg"
"msg/SignalStatusPackageregional.msg"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# ==============================================================================
# MIT License
#
# Copyright (c) 2023-2024 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
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
# ==============================================================================

# --- Auto-generated by asn1ToRosMsg.py ----------------------------------------

# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# AddGrpC data dictionary extensions to SAEJ2735
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

ItsStationPositionList its_station_position
bool its_station_position_is_present

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# ==============================================================================

# --- Auto-generated by asn1ToRosMsg.py ----------------------------------------
-addGrpC

NodeSetXY nodes

LaneConnectionID connection_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@
# ==============================================================================

# --- Auto-generated by asn1ToRosMsg.py ----------------------------------------
-Revision

uint8 value
uint8 UNKNOWN = 0
uint8 RTCM_REV2 = 1
uint8 RTCM_REV3 = 2
uint8 RESERVED = 3
PrioritizationResponseList active_prioritizations
bool active_prioritizations_is_present

22 changes: 9 additions & 13 deletions etsi_its_msgs/etsi_its_mapem_ts_msgs/msg/LaneAttributes.msg
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,13 @@
# sharedWith LaneSharing,
# laneType LaneTypeAttributes,
# regional RegionalExtension {{Reg-LaneAttributes}} OPTIONAL
# -------------------------------------------------------------------------------Vehicle
# ------------------------------------------------------------------------------
LaneDirection directional_use

LaneSharing shared_with

LaneTypeAttributes lane_type

LaneAttributesregional regional
bool regional_is_present

uint8[] value
uint8 bits_unused
int64 MIN_SIZE_BITS = 8
int64 MAX_SIZE_BITS = 8
uint8 BIT_INDEX_IS_VEHICLE_REVOCABLE_LANE = 0
uint8 BIT_INDEX_IS_VEHICLE_FLY_OVER_LANE = 1
uint8 BIT_INDEX_HOV_LANE_USE_ONLY = 2
uint8 BIT_INDEX_RESTRICTED_TO_BUS_USE = 3
uint8 BIT_INDEX_RESTRICTED_TO_TAXI_USE = 4
uint8 BIT_INDEX_RESTRICTED_FROM_PUBLIC_USE = 5
uint8 BIT_INDEX_HAS_I_RBEACON_COVERAGE = 6
uint8 BIT_INDEX_PERMISSION_ON_REQUEST = 7
33 changes: 33 additions & 0 deletions etsi_its_msgs/etsi_its_mapem_ts_msgs/msg/LaneAttributesAddGrpC.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# ==============================================================================
# MIT License
#
# Copyright (c) 2023-2024 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
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
# ==============================================================================

# --- Auto-generated by asn1ToRosMsg.py ----------------------------------------

VehicleHeight max_vehicle_height
bool max_vehicle_height_is_present

VehicleMass max_vehicle_weight
bool max_vehicle_weight_is_present

55 changes: 55 additions & 0 deletions etsi_its_msgs/etsi_its_mapem_ts_msgs/msg/LaneAttributesBarrier.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# ==============================================================================
# MIT License
#
# Copyright (c) 2023-2024 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
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
# ==============================================================================

# --- Auto-generated by asn1ToRosMsg.py ----------------------------------------

# --- ASN.1 Definition ---------------------------------------------------------
# LaneAttributes-Barrier ::= BIT STRING {
# median-RevocableLane (0),
# median (1),
# whiteLineHashing (2),
# stripedLines (3),
# doubleStripedLines (4),
# trafficCones (5),
# constructionBarrier (6),
# trafficChannels (7),
# lowCurbs (8),
# highCurbs (9)
# } (SIZE (16))
# ------------------------------------------------------------------------------

uint8[] value
uint8 bits_unused
uint8 SIZE_BITS = 16
uint8 BIT_INDEX_MEDIAN_REVOCABLE_LANE = 0
uint8 BIT_INDEX_MEDIAN = 1
uint8 BIT_INDEX_WHITE_LINE_HASHING = 2
uint8 BIT_INDEX_STRIPED_LINES = 3
uint8 BIT_INDEX_DOUBLE_STRIPED_LINES = 4
uint8 BIT_INDEX_TRAFFIC_CONES = 5
uint8 BIT_INDEX_CONSTRUCTION_BARRIER = 6
uint8 BIT_INDEX_TRAFFIC_CHANNELS = 7
uint8 BIT_INDEX_LOW_CURBS = 8
uint8 BIT_INDEX_HIGH_CURBS = 9
49 changes: 49 additions & 0 deletions etsi_its_msgs/etsi_its_mapem_ts_msgs/msg/LaneAttributesBike.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# ==============================================================================
# MIT License
#
# Copyright (c) 2023-2024 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
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
# ==============================================================================

# --- Auto-generated by asn1ToRosMsg.py ----------------------------------------

# --- ASN.1 Definition ---------------------------------------------------------
# LaneAttributes-Bike ::= BIT STRING {
# bikeRevocableLane (0),
# pedestrianUseAllowed (1),
# isBikeFlyOverLane (2),
# fixedCycleTime (3),
# biDirectionalCycleTimes (4),
# isolatedByBarrier (5),
# unsignalizedSegmentsPresent (6)
# } (SIZE (16))
# ------------------------------------------------------------------------------

uint8[] value
uint8 bits_unused
uint8 SIZE_BITS = 16
uint8 BIT_INDEX_BIKE_REVOCABLE_LANE = 0
uint8 BIT_INDEX_PEDESTRIAN_USE_ALLOWED = 1
uint8 BIT_INDEX_IS_BIKE_FLY_OVER_LANE = 2
uint8 BIT_INDEX_FIXED_CYCLE_TIME = 3
uint8 BIT_INDEX_BI_DIRECTIONAL_CYCLE_TIMES = 4
uint8 BIT_INDEX_ISOLATED_BY_BARRIER = 5
uint8 BIT_INDEX_UNSIGNALIZED_SEGMENTS_PRESENT = 6
Loading

0 comments on commit 917c37c

Please sign in to comment.