Skip to content

Commit 7c8aa9b

Browse files
christophfroehlichchristophfroehlich
authored
Merge branch 'main' into patch-11
2 parents 58c80c7 + 4d77588 commit 7c8aa9b

File tree

9 files changed

+28
-14
lines changed

9 files changed

+28
-14
lines changed

‎example/package.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
<name>generate_parameter_library_example</name>
55
<version>0.5.0</version>
66
<description>Example usage of generate_parameter_library.</description>
7-
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
7+
<maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
8+
<maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
89
<maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
910
<maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
11+
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
1012
<license>BSD-3-Clause</license>
1113
<author email="paul.gesel@picknik.ai">Paul Gesel</author>
1214

‎example_cmake_python/package.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
<name>cmake_generate_parameter_module_example</name>
55
<version>0.5.0</version>
66
<description>Example usage of generate_parameter_library for a python module with cmake.</description>
7-
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
7+
<maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
8+
<maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
89
<maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
910
<maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
11+
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
1012
<license>BSD-3-Clause</license>
1113
<author email="paul.gesel@picknik.ai">Paul Gesel</author>
1214

‎example_external/package.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
<name>generate_parameter_library_example_external</name>
55
<version>0.5.0</version>
66
<description>Example usage of a parameter header generated in another package.</description>
7-
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
7+
<maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
8+
<maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
89
<maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
910
<maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
11+
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
1012
<license>BSD-3-Clause</license>
1113
<author email="auguste@forssea-robotics.fr">Auguste Bourgois</author>
1214

‎example_python/package.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
<name>generate_parameter_module_example</name>
55
<version>0.5.0</version>
66
<description>Example usage of generate_parameter_library for a python module</description>
7-
<maintainer email="paulgesel@gmail.com">paul</maintainer>
7+
<maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
8+
<maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
89
<maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
910
<maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
11+
<maintainer email="paulgesel@gmail.com">paul</maintainer>
1012
<license>BSD-3-Clause</license>
1113

1214
<depend>generate_parameter_library</depend>

‎generate_parameter_library/package.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
<name>generate_parameter_library</name>
55
<version>0.5.0</version>
66
<description>CMake to generate ROS parameter library.</description>
7-
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
7+
<maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
8+
<maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
89
<maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
910
<maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
11+
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
1012
<license>BSD-3-Clause</license>
1113
<author email="paul.gesel@picknik.ai">Paul Gesel</author>
1214

‎generate_parameter_library_py/generate_parameter_library_py/jinja_templates/cpp/set_parameter‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
param = parameters_interface_->get_parameter(prefix_ + "{{parameter_name}}");
2-
RCLCPP_DEBUG_STREAM(logger_, param.get_name() << ": " << param.get_type_name() << " = " << param.value_to_string());
2+
RCLCPP_DEBUG_STREAM(logger_, (prefix_ + "{{parameter_name}}") << ": " << param.get_type_name() << " = " << param.value_to_string());
33
{% if parameter_validations|length -%}
44
{{parameter_validations-}}
55
{% endif -%}

‎generate_parameter_library_py/generate_parameter_library_py/parse_yaml.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,9 @@ def int_to_integer_str(value: str):
101101

102102
def get_dynamic_parameter_field(yaml_parameter_name: str):
103103
tmp = yaml_parameter_name.split('.')
104-
parameter_field = tmp[-1]
105-
return parameter_field
104+
num_nested = [i for i, val in enumerate(tmp) if is_mapped_parameter(val)]
105+
field = tmp[(max(num_nested) + 1) :] if len(num_nested) else tmp[-1]
106+
return '.'.join(field)
106107

107108

108109
def get_dynamic_mapped_parameter(yaml_parameter_name: str):
@@ -115,8 +116,8 @@ def get_dynamic_mapped_parameter(yaml_parameter_name: str):
115116

116117
def get_dynamic_struct_name(yaml_parameter_name: str):
117118
tmp = yaml_parameter_name.split('.')
118-
num_nested = sum([is_mapped_parameter(val) for val in tmp])
119-
struct_name = tmp[: -(num_nested + 1)]
119+
num_nested = [i for i, val in enumerate(tmp) if is_mapped_parameter(val)]
120+
struct_name = tmp[: (min(num_nested))] if len(num_nested) else ''
120121
return '.'.join(struct_name)
121122

122123

@@ -806,7 +807,7 @@ def parse_params(self, name, value, nested_name_list):
806807
var = VariableDeclaration(code_gen_variable)
807808

808809
# check if runtime parameter
809-
is_runtime_parameter = is_mapped_parameter(self.struct_tree.struct_name)
810+
is_runtime_parameter = is_mapped_parameter(param_name)
810811

811812
if is_runtime_parameter:
812813
declare_parameter_set = SetRuntimeParameter(param_name, code_gen_variable)

‎generate_parameter_library_py/package.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
<name>generate_parameter_library_py</name>
55
<version>0.5.0</version>
66
<description>Python to generate ROS parameter library.</description>
7-
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
7+
<maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
8+
<maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
89
<maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
910
<maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
11+
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
1012
<license>BSD-3-Clause</license>
1113
<author email="paul.gesel@picknik.ai">Paul Gesel</author>
1214

‎parameter_traits/package.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
<name>parameter_traits</name>
55
<version>0.5.0</version>
66
<description>Functions and types for rclcpp::Parameter</description>
7-
<maintainer email="maybe@tylerjw.dev">Tyler Weaver</maintainer>
8-
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
7+
<maintainer email="bence.magyar.robotics@gmail.com">bmagyar</maintainer>
8+
<maintainer email="christoph.froehlich@ait.ac.at">christophfroehlich</maintainer>
99
<maintainer email="nathanbrooks@picknik.ai">Nathan Brooks</maintainer>
1010
<maintainer email="shaurya.kumar@picknik.ai">Shaurya Kumar</maintainer>
11+
<maintainer email="paul.gesel@picknik.ai">Paul Gesel</maintainer>
1112
<license>BSD-3-Clause</license>
1213

1314
<buildtool_depend>ament_cmake</buildtool_depend>

0 commit comments

Comments
 (0)