Skip to content

Commit 7a9ad21

Browse files
committed
add naming changes from state to lifecycle_state
1 parent b03e680 commit 7a9ad21

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
@@ -1949,7 +1949,7 @@ void ControllerManager::activate_controllers(
19491949
}
19501950
controller->assign_interfaces(std::move(command_loans), std::move(state_loans));
19511951

1952-
auto new_state = controller->get_state();
1952+
auto new_state = controller->get_lifecycle_state();
19531953
try
19541954
{
19551955
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
@@ -355,10 +355,10 @@ TEST_F(TestReleaseExclusiveInterfaces, test_exclusive_interface_switching_failur
355355

356356
ASSERT_EQ(
357357
lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE,
358-
abstract_test_controller1.c->get_state().id());
358+
abstract_test_controller1.c->get_lifecycle_state().id());
359359
ASSERT_EQ(
360360
lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE,
361-
abstract_test_controller2.c->get_state().id());
361+
abstract_test_controller2.c->get_lifecycle_state().id());
362362

363363
{ // Test starting the first controller
364364
RCLCPP_INFO(cm_->get_logger(), "Starting controller #1");
@@ -373,10 +373,10 @@ TEST_F(TestReleaseExclusiveInterfaces, test_exclusive_interface_switching_failur
373373
EXPECT_EQ(controller_interface::return_type::OK, switch_future.get());
374374
ASSERT_EQ(
375375
lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE,
376-
abstract_test_controller1.c->get_state().id());
376+
abstract_test_controller1.c->get_lifecycle_state().id());
377377
ASSERT_EQ(
378378
lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE,
379-
abstract_test_controller2.c->get_state().id());
379+
abstract_test_controller2.c->get_lifecycle_state().id());
380380
}
381381

382382
{ // Test starting the second controller when the first is running
@@ -393,9 +393,9 @@ TEST_F(TestReleaseExclusiveInterfaces, test_exclusive_interface_switching_failur
393393
EXPECT_EQ(controller_interface::return_type::OK, switch_future.get());
394394
ASSERT_EQ(
395395
lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE,
396-
abstract_test_controller1.c->get_state().id());
396+
abstract_test_controller1.c->get_lifecycle_state().id());
397397
ASSERT_EQ(
398398
lifecycle_msgs::msg::State::PRIMARY_STATE_ACTIVE,
399-
abstract_test_controller2.c->get_state().id());
399+
abstract_test_controller2.c->get_lifecycle_state().id());
400400
}
401401
}

0 commit comments

Comments
 (0)