rename RCL_LIFECYCLE_RET_T to lifecycle_msgs::msgs::Transition::TRANSITION_CALLBACK_* (#345)

This commit is contained in:
Karsten Knese 2017-08-02 14:04:34 -07:00 committed by GitHub
parent a41245e6bf
commit 9281e32f82
8 changed files with 156 additions and 116 deletions

View file

@ -245,40 +245,51 @@ LifecycleNode::get_node_parameters_interface()
////
bool
LifecycleNode::register_on_configure(std::function<rcl_lifecycle_ret_t(const State &)> fcn)
LifecycleNode::register_on_configure(
std::function<rcl_lifecycle_transition_key_t(const State &)> fcn)
{
return impl_->register_callback(lifecycle_msgs::msg::State::TRANSITION_STATE_CONFIGURING, fcn);
return impl_->register_callback(
lifecycle_msgs::msg::State::TRANSITION_STATE_CONFIGURING, fcn);
}
bool
LifecycleNode::register_on_cleanup(std::function<rcl_lifecycle_ret_t(const State &)> fcn)
LifecycleNode::register_on_cleanup(
std::function<rcl_lifecycle_transition_key_t(const State &)> fcn)
{
return impl_->register_callback(lifecycle_msgs::msg::State::TRANSITION_STATE_CLEANINGUP, fcn);
return impl_->register_callback(
lifecycle_msgs::msg::State::TRANSITION_STATE_CLEANINGUP, fcn);
}
bool
LifecycleNode::register_on_shutdown(std::function<rcl_lifecycle_ret_t(const State &)> fcn)
LifecycleNode::register_on_shutdown(
std::function<rcl_lifecycle_transition_key_t(const State &)> fcn)
{
return impl_->register_callback(lifecycle_msgs::msg::State::TRANSITION_STATE_SHUTTINGDOWN, fcn);
return impl_->register_callback(
lifecycle_msgs::msg::State::TRANSITION_STATE_SHUTTINGDOWN, fcn);
}
bool
LifecycleNode::register_on_activate(std::function<rcl_lifecycle_ret_t(const State &)> fcn)
LifecycleNode::register_on_activate(
std::function<rcl_lifecycle_transition_key_t(const State &)> fcn)
{
return impl_->register_callback(lifecycle_msgs::msg::State::TRANSITION_STATE_ACTIVATING, fcn);
return impl_->register_callback(
lifecycle_msgs::msg::State::TRANSITION_STATE_ACTIVATING, fcn);
}
bool
LifecycleNode::register_on_deactivate(std::function<rcl_lifecycle_ret_t(const State &)> fcn)
LifecycleNode::register_on_deactivate(
std::function<rcl_lifecycle_transition_key_t(const State &)> fcn)
{
return impl_->register_callback(lifecycle_msgs::msg::State::TRANSITION_STATE_DEACTIVATING, fcn);
return impl_->register_callback(
lifecycle_msgs::msg::State::TRANSITION_STATE_DEACTIVATING, fcn);
}
bool
LifecycleNode::register_on_error(std::function<rcl_lifecycle_ret_t(const State &)> fcn)
LifecycleNode::register_on_error(
std::function<rcl_lifecycle_transition_key_t(const State &)> fcn)
{
return impl_->register_callback(lifecycle_msgs::msg::State::TRANSITION_STATE_ERRORPROCESSING,
fcn);
return impl_->register_callback(
lifecycle_msgs::msg::State::TRANSITION_STATE_ERRORPROCESSING, fcn);
}
const State &
@ -307,7 +318,7 @@ LifecycleNode::trigger_transition(const Transition & transition)
const State &
LifecycleNode::trigger_transition(
const Transition & transition, rcl_lifecycle_ret_t & cb_return_code)
const Transition & transition, rcl_lifecycle_transition_key_t & cb_return_code)
{
return trigger_transition(transition.id(), cb_return_code);
}
@ -320,7 +331,7 @@ LifecycleNode::trigger_transition(uint8_t transition_id)
const State &
LifecycleNode::trigger_transition(
uint8_t transition_id, rcl_lifecycle_ret_t & cb_return_code)
uint8_t transition_id, rcl_lifecycle_transition_key_t & cb_return_code)
{
return impl_->trigger_transition(transition_id, cb_return_code);
}
@ -333,7 +344,7 @@ LifecycleNode::configure()
}
const State &
LifecycleNode::configure(rcl_lifecycle_ret_t & cb_return_code)
LifecycleNode::configure(rcl_lifecycle_transition_key_t & cb_return_code)
{
return impl_->trigger_transition(
lifecycle_msgs::msg::Transition::TRANSITION_CONFIGURE, cb_return_code);
@ -347,7 +358,7 @@ LifecycleNode::cleanup()
}
const State &
LifecycleNode::cleanup(rcl_lifecycle_ret_t & cb_return_code)
LifecycleNode::cleanup(rcl_lifecycle_transition_key_t & cb_return_code)
{
return impl_->trigger_transition(
lifecycle_msgs::msg::Transition::TRANSITION_CLEANUP, cb_return_code);
@ -361,7 +372,7 @@ LifecycleNode::activate()
}
const State &
LifecycleNode::activate(rcl_lifecycle_ret_t & cb_return_code)
LifecycleNode::activate(rcl_lifecycle_transition_key_t & cb_return_code)
{
return impl_->trigger_transition(
lifecycle_msgs::msg::Transition::TRANSITION_ACTIVATE, cb_return_code);
@ -375,7 +386,7 @@ LifecycleNode::deactivate()
}
const State &
LifecycleNode::deactivate(rcl_lifecycle_ret_t & cb_return_code)
LifecycleNode::deactivate(rcl_lifecycle_transition_key_t & cb_return_code)
{
return impl_->trigger_transition(
lifecycle_msgs::msg::Transition::TRANSITION_DEACTIVATE, cb_return_code);
@ -389,7 +400,7 @@ LifecycleNode::shutdown()
}
const State &
LifecycleNode::shutdown(rcl_lifecycle_ret_t & cb_return_code)
LifecycleNode::shutdown(rcl_lifecycle_transition_key_t & cb_return_code)
{
return impl_->trigger_transition(
lifecycle_msgs::msg::Transition::TRANSITION_SHUTDOWN, cb_return_code);