Merge pull request #5 from nzantopp/bugfix/default-parameter-python

Fix: Ensure parameters are initialized with default values if undefined in `params.yml`
ika-rwth-aachen · Nov 20, 2024 · c7b3afc · c7b3afc
2 parents a003f1c + 9d219be
commit c7b3afc
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 0 deletions.
diff --git a/samples/ros2_cpp_all_pkg/src/ros2_cpp_node.cpp b/samples/ros2_cpp_all_pkg/src/ros2_cpp_node.cpp
@@ -104,6 +104,7 @@ void Ros2CppNode::declareAndLoadParameter(const std::string& name,
         ss << param;
       }
       RCLCPP_WARN_STREAM(this->get_logger(), ss.str());
+      this->set_parameters({rclcpp::Parameter(name, rclcpp::ParameterValue(param))});
     }
   }
 

diff --git a/samples/ros2_cpp_component_pkg/src/ros2_cpp_node.cpp b/samples/ros2_cpp_component_pkg/src/ros2_cpp_node.cpp
@@ -97,6 +97,7 @@ void Ros2CppNode::declareAndLoadParameter(const std::string& name,
         ss << param;
       }
       RCLCPP_WARN_STREAM(this->get_logger(), ss.str());
+      this->set_parameters({rclcpp::Parameter(name, rclcpp::ParameterValue(param))});
     }
   }
 

diff --git a/samples/ros2_cpp_lifecycle_pkg/src/ros2_cpp_node.cpp b/samples/ros2_cpp_lifecycle_pkg/src/ros2_cpp_node.cpp
@@ -99,6 +99,7 @@ void Ros2CppNode::declareAndLoadParameter(const std::string& name,
         ss << param;
       }
       RCLCPP_WARN_STREAM(this->get_logger(), ss.str());
+      this->set_parameters({rclcpp::Parameter(name, rclcpp::ParameterValue(param))});
     }
   }
 

diff --git a/samples/ros2_cpp_pkg/src/ros2_cpp_node.cpp b/samples/ros2_cpp_pkg/src/ros2_cpp_node.cpp
@@ -94,6 +94,7 @@ void Ros2CppNode::declareAndLoadParameter(const std::string& name,
         ss << param;
       }
       RCLCPP_WARN_STREAM(this->get_logger(), ss.str());
+      this->set_parameters({rclcpp::Parameter(name, rclcpp::ParameterValue(param))});
     }
   }
 

diff --git a/samples/ros2_python_all_pkg/ros2_python_all_pkg/ros2_python_node.py b/samples/ros2_python_all_pkg/ros2_python_all_pkg/ros2_python_node.py
@@ -91,6 +91,7 @@ def declareAndLoadParameter(self,
             else:
                 self.get_logger().warn(f"Missing parameter '{name}', using default value: {default}")
                 param = default
+                self.set_parameters([rclpy.Parameter(name=name, value=param)])
 
         # add parameter to auto-reconfigurable parameters
         if add_to_auto_reconfigurable_params:

diff --git a/samples/ros2_python_pkg/ros2_python_pkg/ros2_python_node.py b/samples/ros2_python_pkg/ros2_python_pkg/ros2_python_node.py
@@ -87,6 +87,7 @@ def declareAndLoadParameter(self,
             else:
                 self.get_logger().warn(f"Missing parameter '{name}', using default value: {default}")
                 param = default
+                self.set_parameters([rclpy.Parameter(name=name, value=param)])
 
         # add parameter to auto-reconfigurable parameters
         if add_to_auto_reconfigurable_params:

diff --git a/templates/ros2_cpp_pkg/{{ package_name }}/src/{{ node_name }}.cpp.jinja b/templates/ros2_cpp_pkg/{{ package_name }}/src/{{ node_name }}.cpp.jinja
@@ -128,6 +128,7 @@ void {{ node_class_name }}::declareAndLoadParameter(const std::string& name,
         ss << param;
       }
       RCLCPP_WARN_STREAM(this->get_logger(), ss.str());
+      this->set_parameters({rclcpp::Parameter(name, rclcpp::ParameterValue(param))});
     }
   }
 

diff --git a/templates/ros2_python_pkg/{{ package_name }}/{{ package_name }}/{{ node_name }}.py.jinja b/templates/ros2_python_pkg/{{ package_name }}/{{ package_name }}/{{ node_name }}.py.jinja
@@ -108,6 +108,7 @@ class {{ node_class_name }}(Node):
             else:
                 self.get_logger().warn(f"Missing parameter '{name}', using default value: {default}")
                 param = default
+                self.set_parameters([rclpy.Parameter(name=name, value=param)])
 
         # add parameter to auto-reconfigurable parameters
         if add_to_auto_reconfigurable_params:
-Original file line number
+Diff line change
@@ Expand Up @@
             ss << param;
           }
           RCLCPP_WARN_STREAM(this->get_logger(), ss.str());
+          this->set_parameters({rclcpp::Parameter(name, rclcpp::ParameterValue(param))});
         }
       }
@@ Expand Down @@