Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement UdpSocket for both Syn. & Async modes (Send & Receive functionality) #31

Merged
merged 56 commits into from Mar 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
1bf8fdc
Refactor & add UdpReceiver class
reza-ebrahimi Feb 9, 2021
76c1e83
Add UdpSender class
reza-ebrahimi Feb 9, 2021
fae84cf
Update node class to refactored driver
reza-ebrahimi Feb 9, 2021
8066f02
Update CMake
reza-ebrahimi Feb 9, 2021
4248aee
Update tests
reza-ebrahimi Feb 9, 2021
360c01b
Resolve a conflict on test/test_udp_driver.cpp
reza-ebrahimi Feb 9, 2021
d1180b7
Update Readme
reza-ebrahimi Feb 9, 2021
c6ef079
Rename header file to cpp format
reza-ebrahimi Feb 10, 2021
f4a66f0
Rename header file to cpp format
reza-ebrahimi Feb 10, 2021
955c841
Delete old files
reza-ebrahimi Feb 15, 2021
0a55a71
Update Udp Driver Node
reza-ebrahimi Feb 15, 2021
b386742
Add message converters
reza-ebrahimi Feb 15, 2021
ad7e463
Add IoContext class
reza-ebrahimi Feb 15, 2021
212b040
Add UdpDriver class
reza-ebrahimi Feb 15, 2021
475b9a4
Add UdpSocket class
reza-ebrahimi Feb 15, 2021
dabc1a2
Add IoContext test case
reza-ebrahimi Feb 15, 2021
daeaa32
Add Udp data transmission test cases
reza-ebrahimi Feb 15, 2021
6fc9bd3
Add Udp receive test case
reza-ebrahimi Feb 15, 2021
632f4bf
Add Udp Sender test case
reza-ebrahimi Feb 15, 2021
1867589
Add UdpDriver test cases
reza-ebrahimi Feb 15, 2021
6bd5692
Update CMakeLists file
reza-ebrahimi Feb 15, 2021
bc1706e
Add converters header & source files
reza-ebrahimi Feb 18, 2021
76e6915
Add IoContext header & source files
reza-ebrahimi Feb 18, 2021
094aaaa
Add UdpSocket header & source files
reza-ebrahimi Feb 18, 2021
73fa392
Add UdpDriver header & source files
reza-ebrahimi Feb 18, 2021
1544a4f
Add visibility header file
reza-ebrahimi Feb 18, 2021
0dbe85d
Add UdpDriverNode to examples directory
reza-ebrahimi Feb 18, 2021
4a81218
Add main google test program
reza-ebrahimi Feb 18, 2021
a00f276
Add IoContext test
reza-ebrahimi Feb 18, 2021
5c84dea
Add UdpSocket test
reza-ebrahimi Feb 18, 2021
81feaf7
Add UdpDriver test
reza-ebrahimi Feb 18, 2021
ad2afbc
Add UDP communication tests
reza-ebrahimi Feb 18, 2021
4ab6718
Add UdpDriverNode test
reza-ebrahimi Feb 18, 2021
9272c69
Add changelog file
reza-ebrahimi Feb 18, 2021
cc7ffd7
Add CMakeLists file
reza-ebrahimi Feb 18, 2021
2746aef
Add package.xml file
reza-ebrahimi Feb 18, 2021
9e1cd76
Delete old udp_driver package
reza-ebrahimi Feb 18, 2021
8ae471e
Add design document
reza-ebrahimi Feb 18, 2021
ffdf760
Add std_msgs/Int* variants converters
reza-ebrahimi Feb 18, 2021
9b94f80
Update converters to ROS2 message in function names
reza-ebrahimi Feb 18, 2021
3ac4d67
Refactor converters to their ROS2 namespaces in converters directory
reza-ebrahimi Feb 18, 2021
3566e44
Add common converters header
reza-ebrahimi Feb 18, 2021
3b46d3a
Update licenses
reza-ebrahimi Feb 18, 2021
3899b6a
Reformat code
reza-ebrahimi Feb 18, 2021
f1bdef6
Remove unnecessary print
reza-ebrahimi Feb 18, 2021
94f4933
Update google test header includes to library convention
reza-ebrahimi Feb 18, 2021
d078a81
Implement unsigned integer and floating point message variants conver…
reza-ebrahimi Feb 18, 2021
a9eb38b
Fix comment in converters
reza-ebrahimi Feb 18, 2021
092c5d9
Update test and example
reza-ebrahimi Feb 18, 2021
7d01bd9
Update changelog - Bump major version to 0.1.0
reza-ebrahimi Feb 18, 2021
3ea435f
Update readme
reza-ebrahimi Feb 18, 2021
90584fb
Revert back changelog file
reza-ebrahimi Mar 1, 2021
22dfca4
Update readme
reza-ebrahimi Mar 1, 2021
c85ab19
Move udp_driver to separate package
reza-ebrahimi Mar 1, 2021
0b84856
Revert package name change
Mar 3, 2021
80269fc
Apply linter fixes
reza-ebrahimi Mar 3, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
@@ -0,0 +1,3 @@
build/
install/
log/
13 changes: 13 additions & 0 deletions CONTRIBUTING.md
@@ -0,0 +1,13 @@
Any contribution that you make to this repository will
be under the Apache 2 License, as dictated by that
[license](http://www.apache.org/licenses/LICENSE-2.0.html):

~~~
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
~~~
202 changes: 202 additions & 0 deletions LICENSE
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
17 changes: 13 additions & 4 deletions README.md
@@ -1,8 +1,17 @@
# transport_drivers

A set of ROS2 drivers for transport-layer protocols. Currently utilizes Boost::ASIO for most transport-layer functionality.

## udp_driver
A package which contains a templated C++ class (which inherits from `rclcpp::Node`) which encapsulates basic receiving (and soon sending) of UDP network data.
## Supported Drivers:

## serial_driver
A package which contains a templated C++ class (which inherits from `rclcpp::Node`) which encapsulates basic receiving (and soon sending) of serial data.
* **UDP Driver**
* Tracking PR: https://github.com/ros-drivers/transport_drivers/pull/31
* Implemented `IoContext` (The main I/O Context that can be configured as single or multi thread with async task execution support)
* Implemented `UdpSocket` (The UDP socket functionality that working in blocking and non-blocking (Async with task execution) modes)
* Implemented `UdpDriver` Facade (Facade design pattern implementation that acts as a sender and receiver UDP socket pair container)
* Implemented `ROS2` and `raw` buffer message converters for Int, UInt and Float variants in std_msgs namespace.
* Implemented `UdpDriverNode` example and its test.
* Implemented IoContext, UdpSocket and UdpDriver tests.

* **Serial Driver**
A package which contains a templated C++ class (which inherits from rclcpp::Node) which encapsulates basic receiving (and soon sending) of serial data.
88 changes: 60 additions & 28 deletions udp_driver/CMakeLists.txt
@@ -1,62 +1,94 @@
# Copyright 2018 Apex.AI, Inc.
# Co-developed by Tier IV, Inc. and Apex.AI, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#    http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Co-developed by Tier IV, Inc. and Apex.AI, Inc.
# Maintained by LeoDrive, 2021

cmake_minimum_required(VERSION 3.5)

project(udp_driver)

# Consider passing `-DCMAKE_BUILD_TYPE=Debug` option to cmake to export Debug symbols.
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif()

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")

## dependencies
find_package(ament_cmake REQUIRED)
find_package(ament_cmake_auto REQUIRED)
find_package(rclcpp REQUIRED)
find_package(std_msgs REQUIRED)
find_package(Boost REQUIRED COMPONENTS system)
find_package(Boost REQUIRED COMPONENTS system thread)
if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
endif()

include_directories(include)

ament_export_include_directories(include)
ament_auto_find_build_dependencies()
ament_auto_add_library(${PROJECT_NAME} SHARED
src/io_context.cpp
src/udp_socket.cpp
src/udp_driver.cpp
src/msg_converters/std_msgs.cpp
examples/udp_driver_node.cpp)
ament_target_dependencies(${PROJECT_NAME}
"rclcpp"
"std_msgs"
"Boost")

target_compile_options(${PROJECT_NAME} PUBLIC "-O0" PRIVATE -Wno-sign-conversion -Wno-conversion)
target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})

install(
DIRECTORY include/
DESTINATION include
DIRECTORY include
DESTINATION include
)
ament_export_include_directories(include)

if(BUILD_TESTING)
find_package(std_msgs REQUIRED)
set(TEST_LIB "${PROJECT_NAME}_test")
add_library(${TEST_LIB} SHARED test/test_driver.hpp test/test_driver.cpp)
find_package(ament_cmake_gtest REQUIRED)
find_package(ament_lint_auto REQUIRED)

ament_lint_auto_find_test_dependencies()

ament_target_dependencies(${TEST_LIB} "rclcpp" "std_msgs")
target_include_directories(${TEST_LIB} PRIVATE include)
target_link_libraries(${TEST_LIB} ${Boost_LIBRARIES})
set(TEST_FILES
test_io_context.cpp
test_udp_socket.cpp
test_udp_data.cpp
test_udp_driver.cpp
test_udp_driver_node.cpp)

foreach(file ${TEST_FILES})
get_filename_component(name "${file}" NAME_WE)
set(TEST_UDP_DRIVER_EXE ${name})

# Unit tests
find_package(ament_cmake_gtest REQUIRED)
set(TEST_UDP_DRIVER_EXE test_udp_driver)
ament_add_gtest(${TEST_UDP_DRIVER_EXE}
test/gtest_main.cpp
test/test_udp_driver.cpp)
ament_target_dependencies(${TEST_UDP_DRIVER_EXE} "Boost")
target_include_directories(${TEST_UDP_DRIVER_EXE} PRIVATE include)
target_link_libraries(${TEST_UDP_DRIVER_EXE} ${TEST_LIB})
test/gtest_main.cpp
test/${name}.cpp)
ament_target_dependencies(${TEST_UDP_DRIVER_EXE}
rclcpp
std_msgs
Boost)

find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies()
target_include_directories(${TEST_UDP_DRIVER_EXE} PRIVATE include)
target_link_libraries(${TEST_UDP_DRIVER_EXE} ${PROJECT_NAME})
endforeach()
endif()

ament_package(
CONFIG_EXTRAS_POST "udp_driver-extras.cmake"
)
ament_package()