Skip to content

Commit 4a09800

Browse files
committed
add naming changes from state to lifecycle_state
1 parent 3ba484f commit 4a09800

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

controller_manager/src/controller_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1836,7 +1836,7 @@ void ControllerManager::activate_controllers(
18361836
}
18371837
controller->assign_interfaces(std::move(command_loans), std::move(state_loans));
18381838

1839-
auto new_state = controller->get_state();
1839+
auto new_state = controller->get_lifecycle_state();
18401840
try
18411841
{
18421842
found_it->periodicity_statistics->Reset();

controller_manager/test/test_release_interfaces.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@ TEST_F(TestReleaseExclusiveInterfaces, test_exclusive_interface_switching_failur
233233

234234
ASSERT_EQ(
235235
lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE,
236-
abstract_test_controller1.c->get_state().id());
236+
abstract_test_controller1.c->get_lifecycle_state().id());
237237
ASSERT_EQ(
238238
lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE,
239-
abstract_test_controller2.c->get_state().id());
239+
abstract_test_controller2.c->get_lifecycle_state().id());
240240

241241
{ // Test starting the first controller
242242
RCLCPP_INFO(cm_->get_logger(), "Starting controller #1");
@@ -251,10 +251,10 @@ TEST_F(TestReleaseExclusiveInterfaces, test_exclusive_interface_switching_failur
251251
EXPECT_EQ(controller_interface::return_type::OK, switch_future.get());
252252
ASSERT_EQ(
253253
lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE,
254-
abstract_test_controller1.c->get_state().id());
254+
abstract_test_controller1.c->get_lifecycle_state().id());
255255
ASSERT_EQ(
256256
lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE,
257-
abstract_test_controller2.c->get_state().id());
257+
abstract_test_controller2.c->get_lifecycle_state().id());
258258
}
259259

260260
{ // Test starting the second controller when the first is running
@@ -271,9 +271,9 @@ TEST_F(TestReleaseExclusiveInterfaces, test_exclusive_interface_switching_failur
271271
EXPECT_EQ(controller_interface::return_type::OK, switch_future.get());
272272
ASSERT_EQ(
273273
lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE,
274-
abstract_test_controller1.c->get_state().id());
274+
abstract_test_controller1.c->get_lifecycle_state().id());
275275
ASSERT_EQ(
276276
lifecycle_msgs::msg::State::PRIMARY_STATE_ACTIVE,
277-
abstract_test_controller2.c->get_state().id());
277+
abstract_test_controller2.c->get_lifecycle_state().id());
278278
}
279279
}

0 commit comments

Comments
 (0)