Skip to content

Commit 19afc9e

Browse files
Remove controller_frequency as dynamic parameter
Signed-off-by: Nils-Christian Iseke <nilsmailiseke@gmail.com>
1 parent 299f1fa commit 19afc9e

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

nav2_controller/src/controller_server.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -860,9 +860,7 @@ ControllerServer::dynamicParametersCallback(std::vector<rclcpp::Parameter> param
860860
}
861861

862862
if (param_type == ParameterType::PARAMETER_DOUBLE) {
863-
if (param_name == "controller_frequency") {
864-
controller_frequency_ = parameter.as_double();
865-
} else if (param_name == "min_x_velocity_threshold") {
863+
if (param_name == "min_x_velocity_threshold") {
866864
min_x_velocity_threshold_ = parameter.as_double();
867865
} else if (param_name == "min_y_velocity_threshold") {
868866
min_y_velocity_threshold_ = parameter.as_double();

nav2_controller/test/test_dynamic_parameters.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ TEST(WPTest, test_dynamic_parameters)
6262
controller->get_node_services_interface());
6363

6464
auto results = rec_param->set_parameters_atomically(
65-
{rclcpp::Parameter("controller_frequency", 100.0),
66-
rclcpp::Parameter("min_x_velocity_threshold", 100.0),
65+
{rclcpp::Parameter("min_x_velocity_threshold", 100.0),
6766
rclcpp::Parameter("min_y_velocity_threshold", 100.0),
6867
rclcpp::Parameter("min_theta_velocity_threshold", 100.0),
6968
rclcpp::Parameter("failure_tolerance", 5.0)});
@@ -72,7 +71,6 @@ TEST(WPTest, test_dynamic_parameters)
7271
controller->get_node_base_interface(),
7372
results);
7473

75-
EXPECT_EQ(controller->get_parameter("controller_frequency").as_double(), 100.0);
7674
EXPECT_EQ(controller->get_parameter("min_x_velocity_threshold").as_double(), 100.0);
7775
EXPECT_EQ(controller->get_parameter("min_y_velocity_threshold").as_double(), 100.0);
7876
EXPECT_EQ(controller->get_parameter("min_theta_velocity_threshold").as_double(), 100.0);

nav2_docking/opennav_docking/src/docking_server.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -842,9 +842,7 @@ DockingServer::dynamicParametersCallback(std::vector<rclcpp::Parameter> paramete
842842
}
843843

844844
if (param_type == ParameterType::PARAMETER_DOUBLE) {
845-
if (param_name == "controller_frequency") {
846-
controller_frequency_ = parameter.as_double();
847-
} else if (param_name == "initial_perception_timeout") {
845+
if (param_name == "initial_perception_timeout") {
848846
initial_perception_timeout_ = parameter.as_double();
849847
} else if (param_name == "wait_charge_timeout") {
850848
wait_charge_timeout_ = parameter.as_double();

nav2_docking/opennav_docking/test/test_docking_server_unit.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,7 @@ TEST(DockingServerTests, testDynamicParams)
240240
node->get_node_services_interface());
241241

242242
auto results = rec_param->set_parameters_atomically(
243-
{rclcpp::Parameter("controller_frequency", 0.2),
244-
rclcpp::Parameter("initial_perception_timeout", 1.0),
243+
{rclcpp::Parameter("initial_perception_timeout", 1.0),
245244
rclcpp::Parameter("wait_charge_timeout", 1.2),
246245
rclcpp::Parameter("undock_linear_tolerance", 0.25),
247246
rclcpp::Parameter("undock_angular_tolerance", 0.125),
@@ -252,7 +251,6 @@ TEST(DockingServerTests, testDynamicParams)
252251

253252
rclcpp::spin_until_future_complete(node->get_node_base_interface(), results);
254253

255-
EXPECT_EQ(node->get_parameter("controller_frequency").as_double(), 0.2);
256254
EXPECT_EQ(node->get_parameter("initial_perception_timeout").as_double(), 1.0);
257255
EXPECT_EQ(node->get_parameter("wait_charge_timeout").as_double(), 1.2);
258256
EXPECT_EQ(node->get_parameter("undock_linear_tolerance").as_double(), 0.25);

0 commit comments

Comments
 (0)