-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #29 from ika-rwth-aachen/cam-release2
Add ETSI ITS CAM TS (release2)
- Loading branch information
Showing
1,611 changed files
with
117,422 additions
and
1,236 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| diff --git a/ETSI-ITS-CDD.asn b/ETSI-ITS-CDD.asn | ||
| index d6f5faa..14f963f 100755 | ||
| --- a/ETSI-ITS-CDD.asn | ||
| +++ b/ETSI-ITS-CDD.asn | ||
| @@ -3058,16 +3058,6 @@ StationaryVehicleSubCauseCode ::= INTEGER { | ||
| */ | ||
| StationId ::= INTEGER(0..4294967295) | ||
|
|
||
| -/** | ||
| - * This DE represents the identifier of an ITS-S. | ||
| - * The ITS-S ID may be a pseudonym. It may change over space and/or over time. | ||
| - * | ||
| - * @note: this DE is kept for backwards compatibility reasons only. It is recommended to use the @ref StationId instead. | ||
| - * @category: Basic information | ||
| - * @revision: V1.3.1 | ||
| - */ | ||
| -StationID ::= INTEGER(0..4294967295) | ||
| - | ||
| /** | ||
| * This DE represents the type of technical context the ITS-S is integrated in. | ||
| * The station type depends on the integration environment of ITS-S into vehicle, mobile devices or at infrastructure. | ||
| @@ -4182,24 +4172,6 @@ ActionId ::= SEQUENCE { | ||
| sequenceNumber SequenceNumber | ||
| } | ||
|
|
||
| -/** | ||
| - * This DF represents an identifier used to describe a protocol action taken by an ITS-S. | ||
| - * | ||
| - * It shall include the following components: | ||
| - * | ||
| - * @field originatingStationId: Id of the ITS-S that takes the action. | ||
| - * | ||
| - * @field sequenceNumber: a sequence number. | ||
| - * | ||
| - * @note: this DF is kept for backwards compatibility reasons only. It is recommended to use the @ref ActionId instead. | ||
| - * @category: Communication information | ||
| - * @revision: V1.3.1 | ||
| - */ | ||
| -ActionID ::= SEQUENCE { | ||
| - originatingStationId StationID, | ||
| - sequenceNumber SequenceNumber | ||
| -} | ||
| - | ||
| /** | ||
| * This DF shall contain a list of @ref ActionId. | ||
|
|
Submodule cam_ts103900
added at
b96bfe
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| cmake_minimum_required(VERSION 3.5) | ||
| project(etsi_its_cam_ts_coding) | ||
|
|
||
| find_package(ros_environment REQUIRED QUIET) | ||
| set(ROS_VERSION $ENV{ROS_VERSION}) | ||
|
|
||
| AUX_SOURCE_DIRECTORY(src SRC_FILES) | ||
|
|
||
| # === ROS 2 (AMENT) ============================================================ | ||
| if(${ROS_VERSION} EQUAL 2) | ||
|
|
||
| find_package(ament_cmake REQUIRED) | ||
|
|
||
| add_library(${PROJECT_NAME} SHARED | ||
| ${SRC_FILES} | ||
| ) | ||
|
|
||
| target_include_directories(${PROJECT_NAME} PUBLIC | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
| $<INSTALL_INTERFACE:include> | ||
| ) | ||
|
|
||
| ament_export_targets(${PROJECT_NAME}Targets HAS_LIBRARY_TARGET) | ||
|
|
||
| install(DIRECTORY include/ | ||
| DESTINATION include | ||
| ) | ||
|
|
||
| install(TARGETS ${PROJECT_NAME} | ||
| EXPORT ${PROJECT_NAME}Targets | ||
| ARCHIVE DESTINATION lib | ||
| LIBRARY DESTINATION lib | ||
| RUNTIME DESTINATION lib | ||
| INCLUDES DESTINATION include | ||
| ) | ||
|
|
||
| ament_package() | ||
|
|
||
| # === ROS (CATKIN) ============================================================= | ||
| elseif(${ROS_VERSION} EQUAL 1) | ||
|
|
||
| find_package(catkin REQUIRED) | ||
|
|
||
| catkin_package( | ||
| INCLUDE_DIRS include | ||
| LIBRARIES ${PROJECT_NAME} | ||
| ) | ||
|
|
||
| include_directories( | ||
| include | ||
| ${catkin_INCLUDE_DIRS} | ||
| ) | ||
|
|
||
| add_library(${PROJECT_NAME} SHARED | ||
| ${SRC_FILES} | ||
| ) | ||
|
|
||
| install(TARGETS ${PROJECT_NAME} | ||
| ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} | ||
| LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} | ||
| RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} | ||
| ) | ||
|
|
||
| install(DIRECTORY include/${PROJECT_NAME}/ | ||
| DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} | ||
| FILES_MATCHING PATTERN "*.h" | ||
| ) | ||
|
|
||
| endif() |
Oops, something went wrong.