Skip to content
This repository has been archived by the owner on Sep 8, 2021. It is now read-only.

Commit

Permalink
Generic Drake/ROS systems + RS Flip Flop example (#6)
Browse files Browse the repository at this point in the history
* Stub code builds

Signed-off-by: Shane Loretz <[email protected]>

* Misc fixes to get it to build (but not link) with stub example

Signed-off-by: Shane Loretz <[email protected]>

* Fix comments on publisher system

Signed-off-by: Shane Loretz <[email protected]>

* ROS interface implementation fleshed out

Signed-off-by: Shane Loretz <[email protected]>

* Possible RosInterfaceSystem impl

Signed-off-by: Shane Loretz <[email protected]>

* Possible RosSubscriberSystem impl

Signed-off-by: Shane Loretz <[email protected]>

* Possible RosPublisherSystem implementation

Signed-off-by: Shane Loretz <[email protected]>

* RosPublisherSystem uses separate Serializer interface

Signed-off-by: Shane Loretz <[email protected]>

* RosSubscriberSystem uses separate Serializer interface

Signed-off-by: Shane Loretz <[email protected]>

* Add RS-flip-flop example

Signed-off-by: Shane Loretz <[email protected]>

* Add get_type_support() to SerializerInterface

Signed-off-by: Shane Loretz <[email protected]>

* Hello world pub example

Publisher and ROS interface working, subscriber not yet working.

Signed-off-by: Shane Loretz <[email protected]>
Signed-off-by: Shane Loretz <[email protected]>

* Fix includes for DrakeRosInterface and RosInterfaceSystem

Signed-off-by: Shane Loretz <[email protected]>

* ROS Subscriber works in Python

Signed-off-by: Shane Loretz <[email protected]>

* Implement flip-flop example in Python

Signed-off-by: Shane Loretz <[email protected]>

* Update README for C++ or Python example

Signed-off-by: Shane Loretz <[email protected]>

* Try more whitespace

Signed-off-by: Shane Loretz <[email protected]>

* Bullet to numbered list

Signed-off-by: Shane Loretz <[email protected]>

* Commands to play with the example

Signed-off-by: Shane Loretz <[email protected]>

* Blank line at EOF

Signed-off-by: Shane Loretz <[email protected]>

* Add linter tests

Signed-off-by: Shane Loretz <[email protected]>

* Add LICENSE file and header comments

Signed-off-by: Shane Loretz <[email protected]>

* Remove unused String import

Signed-off-by: Shane Loretz <[email protected]>

* Satisfy uncrustify

Signed-off-by: Shane Loretz <[email protected]>

* Satisfy cpplint

Signed-off-by: Shane Loretz <[email protected]>

* Custom node name, node opts, and init opts

This adds a way to provide the node name and node options, as well as a
way to externally manage init/shutdown on a context. If the given node
options have a valid context, then DrakeRos won't call init or shutdown
on it. In this way external code can pass init options.

Signed-off-by: Shane Loretz <[email protected]>
Signed-off-by: Shane Loretz <[email protected]>

* Add additional publish triggers

Signed-off-by: Shane Loretz <[email protected]>

* Subscriber already unsubs on destruction

Signed-off-by: Shane Loretz <[email protected]>

* Allow setting QoS on Python systems

Adds half a type caster (Python -> C++) for rclpy.qos.QoSProfile to
rclcpp::QoS.
Adds QoS arguments to Python publisher and subscriber systems.
Updates the Python example to pass QoS.

Signed-off-by: Shane Loretz <[email protected]>
Signed-off-by: Shane Loretz <[email protected]>

* Expose publish triggers to Python systems

Signed-off-by: Shane Loretz <[email protected]>

* Throw exception if Serialization fails

Signed-off-by: Shane Loretz <[email protected]>

* Remove obsolete comment

Signed-off-by: Shane Loretz <[email protected]>

* NodeOptions defaults to global context

Signed-off-by: Shane Loretz <[email protected]>

* Add integration test

Signed-off-by: Shane Loretz <[email protected]>

* Add Python integration test

Signed-off-by: Shane Loretz <[email protected]>

* Remove debug print

Signed-off-by: Shane Loretz <[email protected]>

* Fix bug where context wasn't being shut down

Signed-off-by: Shane Loretz <[email protected]>

* Add tests for DrakeRos

Signed-off-by: Shane Loretz <[email protected]>

* Do more in Python

Signed-off-by: Shane Loretz <[email protected]>
  • Loading branch information
sloretz authored Sep 8, 2021
1 parent fb5f115 commit 3a96616
Show file tree
Hide file tree
Showing 27 changed files with 2,674 additions and 0 deletions.
202 changes: 202 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
113 changes: 113 additions & 0 deletions drake_ros_systems/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
cmake_minimum_required(VERSION 3.10)
project(drake_ros_systems)

# Default to C99
if(NOT CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 99)
endif()

# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic -Werror)
endif()

find_package(ament_cmake_ros REQUIRED)
find_package(drake REQUIRED)
# Must use Drake's fork of Pybind11
find_package(pybind11 REQUIRED HINTS "${drake_DIR}/../pybind11" NO_DEFAULT_PATH)
find_package(rclcpp REQUIRED)
find_package(rosidl_runtime_c REQUIRED)
find_package(rosidl_typesupport_cpp REQUIRED)

add_library(drake_ros_systems
src/drake_ros.cpp
src/publisher.cpp
src/ros_interface_system.cpp
src/ros_publisher_system.cpp
src/ros_subscriber_system.cpp
src/subscription.cpp
)
target_link_libraries(drake_ros_systems PUBLIC
drake::drake
rclcpp::rclcpp
rosidl_runtime_c::rosidl_runtime_c
rosidl_typesupport_cpp::rosidl_typesupport_cpp
)
target_include_directories(drake_ros_systems
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
"$<INSTALL_INTERFACE:include>"
)

add_subdirectory(example)

ament_export_dependencies(drake)
ament_export_dependencies(rclcpp)
ament_export_dependencies(rosidl_generator_c)

install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
)

install(
DIRECTORY include/
DESTINATION include
)

###
# Python bindings
###
pybind11_add_module(py_drake_ros_systems SHARED
src/python_bindings/module_drake_ros_systems.cpp
)
set_target_properties(py_drake_ros_systems PROPERTIES OUTPUT_NAME "drake_ros_systems")
target_link_libraries(py_drake_ros_systems PRIVATE
drake_ros_systems
)
target_include_directories(drake_ros_systems
PRIVATE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/python_bindings>"
)

# Sets PYTHON_INSTALL_DIR
_ament_cmake_python_get_python_install_dir()

install(
TARGETS py_drake_ros_systems
DESTINATION "${PYTHON_INSTALL_DIR}"
)
### End Python bindings

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
find_package(test_msgs REQUIRED)
ament_lint_auto_find_test_dependencies()

ament_add_gtest(test_integration test/integration.cpp)

# TODO(sloretz) Why isn't pybind11::embed including python libs?
find_package(PythonLibs REQUIRED)

target_link_libraries(test_integration
drake::drake
drake_ros_systems
${test_msgs_TARGETS}
pybind11::embed
# TODO(sloretz) Remove when this is included in pybind11::embed
${PYTHON_LIBRARIES}
)

ament_add_gtest(test_drake_ros test/drake_ros.cpp)
target_link_libraries(test_drake_ros
drake_ros_systems
)
endif()

ament_package()
Loading

0 comments on commit 3a96616

Please sign in to comment.