Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Gramazio Kohler Research
Copyright (c) 2018 ETH Zurich, Gramazio Kohler Research

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ 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.
SOFTWARE.
34 changes: 18 additions & 16 deletions docker/ros2/integration-tests-launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@
from launch_ros.substitutions import FindPackageShare
from launch.actions import ExecuteProcess, IncludeLaunchDescription

def generate_launch_description():
return LaunchDescription([
# Start rosbridge_websocket
IncludeLaunchDescription(
PathJoinSubstitution([
FindPackageShare('rosbridge_server'),
'launch',
'rosbridge_websocket_launch.xml'
])
),

# Start fibonacci_server.py with python3
ExecuteProcess(
cmd=['python3', "/fibonacci_server.py"],
output='screen'
)
])
def generate_launch_description():
return LaunchDescription(
[
# Start rosbridge_websocket
IncludeLaunchDescription(
PathJoinSubstitution(
[
FindPackageShare("rosbridge_server"),
"launch",
"rosbridge_websocket_launch.xml",
]
),
launch_arguments={"delay_between_messages": "0.0"}.items(),
),
# Start fibonacci_server.py with python3
ExecuteProcess(cmd=["python3", "/fibonacci_server.py"], output="screen"),
]
)