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

replace rcl_lifecycle_ret_t with lifecycle_msgs__TRANSITION__CALLBACK* (#153)

Browse source
This commit is contained in:
Karsten Knese 2017-08-02 14:05:03 -07:00 • committed by GitHub
parent 5cdef527de
commit 3cff9020d1
7 changed files with 94 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rcl_lifecycle/include/rcl_lifecycle/data_types.h
View file

@ -24,10 +24,7 @@ extern "C"
{
#endif
typedef int rcl_lifecycle_ret_t;
#define RCL_LIFECYCLE_RET_OK -1
#define RCL_LIFECYCLE_RET_FAILURE -2
#define RCL_LIFECYCLE_RET_ERROR -3
typedef uint8_t rcl_lifecycle_transition_key_t;
typedef struct rcl_lifecycle_transition_t rcl_lifecycle_transition_t;
@ -45,8 +42,7 @@ typedef struct rcl_lifecycle_state_t
// is "unconfigured_shutdown". However, the user only specifies
// "shutdown". So we register the "unconfigured_shutdown"
// transition with the impuls "shutdown".
// TODO(karsten1987): Introduce new type for valid_transition_keys
rcl_lifecycle_ret_t * valid_transition_keys;
rcl_lifecycle_transition_key_t * valid_transition_keys;
rcl_lifecycle_transition_t * valid_transitions;
unsigned int valid_transition_size;
} rcl_lifecycle_state_t;
@ -59,8 +55,6 @@ typedef struct rcl_lifecycle_transition_t
const rcl_lifecycle_state_t * goal;
} rcl_lifecycle_transition_t;
// TODO(karsten1987): Rename map as it is no
// associated array any longer
typedef struct rcl_lifecycle_transition_map_t
{
rcl_lifecycle_state_t * states;

4
rcl_lifecycle/include/rcl_lifecycle/rcl_lifecycle.h
View file

@ -62,7 +62,7 @@ RCL_WARN_UNUSED
const rcl_lifecycle_transition_t *
rcl_lifecycle_is_valid_callback_transition(
rcl_lifecycle_state_machine_t * state_machine,
rcl_lifecycle_ret_t key);
rcl_lifecycle_transition_key_t key);
/// Execute a transition
/*
@ -80,7 +80,7 @@ RCL_WARN_UNUSED
rcl_ret_t
rcl_lifecycle_trigger_transition(
rcl_lifecycle_state_machine_t * state_machine,
rcl_lifecycle_ret_t key, bool publish_notification);
rcl_lifecycle_transition_key_t key, bool publish_notification);
RCL_LIFECYCLE_PUBLIC
void

2
rcl_lifecycle/include/rcl_lifecycle/transition_map.h
View file

@ -57,7 +57,7 @@ rcl_ret_t
rcl_lifecycle_register_transition(
rcl_lifecycle_transition_map_t * transition_map,
rcl_lifecycle_transition_t transition,
rcl_lifecycle_ret_t key,
rcl_lifecycle_transition_key_t key,
const rcl_allocator_t * allocator);
RCL_LIFECYCLE_PUBLIC