niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

28
rclcpp_lifecycle/include/rclcpp_lifecycle/lifecycle_node.hpp
View file

@ -373,7 +373,8 @@ public:
RCLCPP_LIFECYCLE_PUBLIC
const State &
trigger_transition(const Transition & transition, rcl_lifecycle_ret_t & cb_return_code);
trigger_transition(
const Transition & transition, rcl_lifecycle_transition_key_t & cb_return_code);
RCLCPP_LIFECYCLE_PUBLIC
const State &
@ -381,7 +382,8 @@ public:
RCLCPP_LIFECYCLE_PUBLIC
const State &
trigger_transition(uint8_t transition_id, rcl_lifecycle_ret_t & cb_return_code);
trigger_transition(
uint8_t transition_id, rcl_lifecycle_transition_key_t & cb_return_code);
RCLCPP_LIFECYCLE_PUBLIC
const State &
@ -389,7 +391,7 @@ public:
RCLCPP_LIFECYCLE_PUBLIC
const State &
configure(rcl_lifecycle_ret_t & cb_return_code);
configure(rcl_lifecycle_transition_key_t & cb_return_code);
RCLCPP_LIFECYCLE_PUBLIC
const State &
@ -397,7 +399,7 @@ public:
RCLCPP_LIFECYCLE_PUBLIC
const State &
cleanup(rcl_lifecycle_ret_t & cb_return_code);
cleanup(rcl_lifecycle_transition_key_t & cb_return_code);
RCLCPP_LIFECYCLE_PUBLIC
const State &
@ -405,7 +407,7 @@ public:
RCLCPP_LIFECYCLE_PUBLIC
const State &
activate(rcl_lifecycle_ret_t & cb_return_code);
activate(rcl_lifecycle_transition_key_t & cb_return_code);
RCLCPP_LIFECYCLE_PUBLIC
const State &
@ -413,7 +415,7 @@ public:
RCLCPP_LIFECYCLE_PUBLIC
const State &
deactivate(rcl_lifecycle_ret_t & cb_return_code);
deactivate(rcl_lifecycle_transition_key_t & cb_return_code);
RCLCPP_LIFECYCLE_PUBLIC
const State &
@ -421,31 +423,31 @@ public:
RCLCPP_LIFECYCLE_PUBLIC
const State &
shutdown(rcl_lifecycle_ret_t & cb_return_code);
shutdown(rcl_lifecycle_transition_key_t & cb_return_code);
RCLCPP_LIFECYCLE_PUBLIC
bool
register_on_configure(std::function<rcl_lifecycle_ret_t(const State &)> fcn);
register_on_configure(std::function<rcl_lifecycle_transition_key_t(const State &)> fcn);
RCLCPP_LIFECYCLE_PUBLIC
bool
register_on_cleanup(std::function<rcl_lifecycle_ret_t(const State &)> fcn);
register_on_cleanup(std::function<rcl_lifecycle_transition_key_t(const State &)> fcn);
RCLCPP_LIFECYCLE_PUBLIC
bool
register_on_shutdown(std::function<rcl_lifecycle_ret_t(const State &)> fcn);
register_on_shutdown(std::function<rcl_lifecycle_transition_key_t(const State &)> fcn);
RCLCPP_LIFECYCLE_PUBLIC
bool
register_on_activate(std::function<rcl_lifecycle_ret_t(const State &)> fcn);
register_on_activate(std::function<rcl_lifecycle_transition_key_t(const State &)> fcn);
RCLCPP_LIFECYCLE_PUBLIC
bool
register_on_deactivate(std::function<rcl_lifecycle_ret_t(const State &)> fcn);
register_on_deactivate(std::function<rcl_lifecycle_transition_key_t(const State &)> fcn);
RCLCPP_LIFECYCLE_PUBLIC
bool
register_on_error(std::function<rcl_lifecycle_ret_t(const State &)> fcn);
register_on_error(std::function<rcl_lifecycle_transition_key_t(const State &)> fcn);
protected:
RCLCPP_LIFECYCLE_PUBLIC

12
rclcpp_lifecycle/include/rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp
View file

@ -49,7 +49,7 @@ public:
* \return true by default
*/
RCLCPP_LIFECYCLE_PUBLIC
virtual rcl_lifecycle_ret_t
virtual rcl_lifecycle_transition_key_t
on_configure(const State & previous_state);
/// Callback function for cleanup transition
@ -57,7 +57,7 @@ public:
* \return true by default
*/
RCLCPP_LIFECYCLE_PUBLIC
virtual rcl_lifecycle_ret_t
virtual rcl_lifecycle_transition_key_t
on_cleanup(const State & previous_state);
/// Callback function for shutdown transition
@ -65,7 +65,7 @@ public:
* \return true by default
*/
RCLCPP_LIFECYCLE_PUBLIC
virtual rcl_lifecycle_ret_t
virtual rcl_lifecycle_transition_key_t
on_shutdown(const State & previous_state);
/// Callback function for activate transition
@ -73,7 +73,7 @@ public:
* \return true by default
*/
RCLCPP_LIFECYCLE_PUBLIC
virtual rcl_lifecycle_ret_t
virtual rcl_lifecycle_transition_key_t
on_activate(const State & previous_state);
/// Callback function for deactivate transition
@ -81,7 +81,7 @@ public:
* \return true by default
*/
RCLCPP_LIFECYCLE_PUBLIC
virtual rcl_lifecycle_ret_t
virtual rcl_lifecycle_transition_key_t
on_deactivate(const State & previous_state);
/// Callback function for errorneous transition
@ -89,7 +89,7 @@ public:
* \return false by default
*/
RCLCPP_LIFECYCLE_PUBLIC
virtual rcl_lifecycle_ret_t
virtual rcl_lifecycle_transition_key_t
on_error(const State & previous_state);
};