Merge branch 'master' into dev/protobuf-package

Author: spiralray

README.md

@@ -99,11 +99,11 @@ GitHubのProjects機能で開発方針に合わせたタスク管理をしてい
 - [2nd step - SSL Game Example](https://github.com/SSL-Roots/consai2r2/projects/3)
 - [3rd step - use ROS2 effectively](https://github.com/SSL-Roots/consai2r2/projects/2)
 
-# Controbution
+# Contribution
 
 issue, pull request 大歓迎です。
 
-[CONTORIBUTING.md](./CONTRIBUTING.md)を見てくれると嬉しいです。
+[CONTRIBUTING.md](./CONTRIBUTING.md)を見てくれると嬉しいです。
 
 # Author & Contributors
 

consai2r2_description/CMakeLists.txt

@@ -14,14 +14,21 @@ endif()
 find_package(ament_cmake REQUIRED)
 find_package(rclcpp REQUIRED)
 
+set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
+
+if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}")
+endif()
+
+ament_python_install_package(${PROJECT_NAME})
+
 include_directories(include ${CMAKE_CURRENT_BINARY_DIR})
 add_executable(${PROJECT_NAME}_node
   src/${PROJECT_NAME}_node.cpp
 )
 ament_target_dependencies(
   ${PROJECT_NAME}_node
   "rclcpp"
-  "launch_ros"
 )
 
 
@@ -39,8 +46,6 @@ install(DIRECTORY
   DESTINATION share/${PROJECT_NAME}/
 )
 
-
-
 if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   # the following line skips the linter which checks for copyrights
@@ -52,4 +57,6 @@ if(BUILD_TESTING)
   ament_lint_auto_find_test_dependencies()
 endif()
 
+set(PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}")
+
 ament_package()

consai2r2_description/consai2r2_description/__init__.py

@@ -0,0 +1,30 @@
+# Copyright (c) 2019 SSL-Roots
+#
+# 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.
+
+import consai2r2_description.parameter
+
+
+class consai2r2_parameters():
+
+    def __init__(self, node, timeout_sec=10.0):
+        param_names = consai2r2_description.parameter.list_parameters(node, timeout_sec)
+        params = consai2r2_description.parameter.get_parameters(node, param_names, timeout_sec)
+        for param_name, param_value in params.items():
+            setattr(self, param_name, param_value)

consai2r2_description/consai2r2_description/parameter.py

@@ -0,0 +1,97 @@
+# Copyright 2018 Open Source Robotics Foundation, 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
+#
+# 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.
+
+from rcl_interfaces.msg import ParameterType
+from rcl_interfaces.srv import GetParameters
+from rcl_interfaces.srv import ListParameters
+
+import rclpy
+
+
+# https://github.com/ros2/ros2cli/blob/780923c046f8e537e884d18bef33a2338f2d409c/ros2param/ros2param/api/__init__.py#L174
+def list_parameters(node, timeout_sec=10.0):
+    # create client
+    client = node.create_client(
+        ListParameters,
+        'consai2r2_description/list_parameters')
+
+    # call as soon as ready
+    ready = client.wait_for_service(timeout_sec)
+    if not ready:
+        raise RuntimeError('Wait for service timed out')
+
+    request = ListParameters.Request()
+    future = client.call_async(request)
+    rclpy.spin_until_future_complete(node, future)
+
+    # handle response
+    response = future.result()
+    if response is None:
+        raise RuntimeError("Failed to get the list of parameters'")
+
+    return response.result.names
+
+
+# https://github.com/ros2/ros2cli/blob/780923c046f8e537e884d18bef33a2338f2d409c/ros2param/ros2param/api/__init__.py#L122
+def get_parameters(node, parameter_names, timeout_sec=10.0):
+    # create client
+    client = node.create_client(
+        GetParameters,
+        'consai2r2_description/get_parameters')
+
+    # call as soon as ready
+    ready = client.wait_for_service(timeout_sec)
+    if not ready:
+        raise RuntimeError('Wait for service timed out')
+
+    request = GetParameters.Request()
+    request.names = parameter_names
+    future = client.call_async(request)
+    rclpy.spin_until_future_complete(node, future)
+
+    # handle response
+    response = future.result()
+    if response is None:
+        e = future.exception()
+        raise RuntimeError("Failed to get parameters form node 'consai2r2_description'")
+
+    return_values = {}
+
+    # https://github.com/ros2/ros2cli/blob/780923c046f8e537e884d18bef33a2338f2d409c/ros2param/ros2param/api/__init__.py#L54
+    for i, pvalue in enumerate(response.values):
+        if pvalue.type == ParameterType.PARAMETER_BOOL:
+            value = pvalue.bool_value
+        elif pvalue.type == ParameterType.PARAMETER_INTEGER:
+            value = pvalue.integer_value
+        elif pvalue.type == ParameterType.PARAMETER_DOUBLE:
+            value = pvalue.double_value
+        elif pvalue.type == ParameterType.PARAMETER_STRING:
+            value = pvalue.string_value
+        elif pvalue.type == ParameterType.PARAMETER_BYTE_ARRAY:
+            value = pvalue.byte_array_value
+        elif pvalue.type == ParameterType.PARAMETER_BOOL_ARRAY:
+            value = pvalue.bool_array_value
+        elif pvalue.type == ParameterType.PARAMETER_INTEGER_ARRAY:
+            value = pvalue.integer_array_value
+        elif pvalue.type == ParameterType.PARAMETER_DOUBLE_ARRAY:
+            value = pvalue.double_array_value
+        elif pvalue.type == ParameterType.PARAMETER_STRING_ARRAY:
+            value = pvalue.string_array_value
+        elif pvalue.type == ParameterType.PARAMETER_NOT_SET:
+            value = None
+        else:
+            raise RuntimeError("Unknown parameter type '{pvalue.type}'".format_map(locals()))
+        return_values[parameter_names[i]] = value
+
+    return return_values

consai2r2_description/launch/config.launch.py

@@ -20,9 +20,9 @@
 
 import os
 
+from ament_index_python.packages import get_package_share_directory
 from launch import LaunchDescription
 from launch_ros.actions import Node
-from ament_index_python.packages import get_package_share_directory
 
 
 def generate_launch_description():

consai2r2_description/package.xml

@@ -8,6 +8,7 @@
   <license>MIT</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>python_cmake_module</buildtool_depend>
 
   <depend>rclcpp</depend>
   <depend>launch_ros</depend>

consai2r2_examples/launch/joystick_example.launch.py

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+import os
+from ament_index_python.packages import get_package_share_directory
 from launch import LaunchDescription
 from launch.actions import DeclareLaunchArgument
 from launch.substitutions import LaunchConfiguration
@@ -49,7 +51,9 @@ def generate_launch_description():
 
     start_sender_cmd = Node(
         package='consai2r2_sender', node_executable='sim_sender',
-        output='screen'
+        output='screen',
+        parameters=[os.path.join(get_package_share_directory(
+            'consai2r2_sender'), 'config', 'grsim.yaml')]
     )
 
     ld = LaunchDescription()

consai2r2_examples/package.xml

@@ -9,6 +9,7 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <exec_depend>launch_ros</exec_depend>
+  <exec_depend>ament_index_python</exec_depend>
   <exec_depend>joy</exec_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>

consai2r2_gameviewer/CMakeLists.txt

@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.5)
+project(consai2r2_gameviewer)
+
+# Load ament and all dependencies required for this package
+find_package(ament_cmake REQUIRED)
+find_package(ament_cmake_python REQUIRED)
+
+ament_python_install_package(${PROJECT_NAME}
+    PACKAGE_DIR src/${PROJECT_NAME})
+
+install(FILES plugin.xml
+  DESTINATION share/${PROJECT_NAME}
+)
+
+install(DIRECTORY resource
+  DESTINATION share/${PROJECT_NAME}
+)
+
+install(PROGRAMS scripts/consai2r2_gameviewer
+  DESTINATION lib/${PROJECT_NAME}
+)
+
+ament_package()

consai2r2_gameviewer/package.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
+  <name>consai2r2_gameviewer</name>
+  <version>0.0.0</version>
+  <description>consai2r2_gameviewer provides a GUI plugin for displaying vision and referee messages.</description>
+  <maintainer email="macakasit@gmail.com">akshota</maintainer>
+  <license>MIT</license>
+
+  <buildtool_depend>ament_cmake</buildtool_depend>
+
+  <exec_depend>ament_index_python</exec_depend>
+  <exec_depend version_gte="0.2.19">python_qt_binding</exec_depend>
+  <exec_depend>rclpy</exec_depend>
+  <exec_depend>rqt_gui</exec_depend>
+  <exec_depend>rqt_gui_py</exec_depend>
+  <exec_depend>rqt_py_common</exec_depend>
+
+  <export>
+    <!-- <architecture_independent/> -->
+    <rqt_gui plugin="${prefix}/plugin.xml"/>
+    <build_type>ament_cmake</build_type>
+  </export>
+</package>