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

[rcl action] Fixes after changes introduced by (#310)

Browse source
This commit is contained in:
Michel Hidalgo 2018-11-07 17:48:32 -03:00
parent e2ee3c5475
commit cca18daad2
4 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rcl_action/include/rcl_action/action_client.h
View file

@ -20,10 +20,6 @@ extern "C"
{ {
#endif #endif
// TODO(jacobperron): replace type support typedef with one defined in rosdl_generator_c
// #include "rosidl_generator_c/action_type_support_struct.h"
typedef struct rosidl_action_type_support_t rosidl_action_type_support_t;
#include "rcl_action/types.h" #include "rcl_action/types.h"
#include "rcl_action/visibility_control.h" #include "rcl_action/visibility_control.h"
#include "rcl/macros.h" #include "rcl/macros.h"

4
rcl_action/include/rcl_action/action_server.h
View file

@ -20,10 +20,6 @@ extern "C"
{ {
#endif #endif
// TODO(jacobperron): replace type support typedef with one defined in rosdl_generator_c
// #include "rosidl_generator_c/action_type_support_struct.h"
typedef struct rosidl_action_type_support_t rosidl_action_type_support_t;
#include "rcl_action/goal_handle.h" #include "rcl_action/goal_handle.h"
#include "rcl_action/types.h" #include "rcl_action/types.h"
#include "rcl_action/visibility_control.h" #include "rcl_action/visibility_control.h"

2
rcl_action/include/rcl_action/types.h
View file

@ -31,6 +31,8 @@ extern "C"
#include "rcl/macros.h" #include "rcl/macros.h"
#include "rcl/types.h" #include "rcl/types.h"
#include "rosidl_generator_c/action_type_support_struct.h"
typedef struct rosidl_action_type_support_t rosidl_action_type_support_t;
// rcl action specific ret codes in 2XXX // rcl action specific ret codes in 2XXX
/// Action name does not pass validation return code. /// Action name does not pass validation return code.

10
rcl_action/src/rcl_action/action_client.c
View file

@ -338,7 +338,7 @@ rcl_action_client_init(
}; };
ret = rcl_action_goal_service_client_init( ret = rcl_action_goal_service_client_init(
&impl->goal_client, node, &impl->goal_client, node,
&type_support->goal_service_type_support, type_support->goal_service_type_support,
impl->action_name, &goal_client_options); impl->action_name, &goal_client_options);
if (RCL_RET_OK != ret) { if (RCL_RET_OK != ret) {
RCUTILS_LOG_DEBUG_NAMED( RCUTILS_LOG_DEBUG_NAMED(
@ -351,7 +351,7 @@ rcl_action_client_init(
}; };
ret = rcl_action_cancel_service_client_init( ret = rcl_action_cancel_service_client_init(
&impl->cancel_client, node, &impl->cancel_client, node,
&type_support->cancel_service_type_support, type_support->cancel_service_type_support,
impl->action_name, &cancel_client_options); impl->action_name, &cancel_client_options);
if (RCL_RET_OK != ret) { if (RCL_RET_OK != ret) {
RCUTILS_LOG_DEBUG_NAMED( RCUTILS_LOG_DEBUG_NAMED(
@ -364,7 +364,7 @@ rcl_action_client_init(
}; };
ret = rcl_action_result_client_init( ret = rcl_action_result_client_init(
&impl->result_client, node, &impl->result_client, node,
&type_support->result_service_type_support, type_support->result_service_type_support,
impl->action_name, &result_client_options); impl->action_name, &result_client_options);
if (RCL_RET_OK != ret) { if (RCL_RET_OK != ret) {
RCUTILS_LOG_DEBUG_NAMED( RCUTILS_LOG_DEBUG_NAMED(
@ -379,7 +379,7 @@ rcl_action_client_init(
}; };
ret = rcl_action_feedback_subscription_init( ret = rcl_action_feedback_subscription_init(
&impl->feedback_subscription, node, &impl->feedback_subscription, node,
&type_support->feedback_topic_type_support, type_support->feedback_message_type_support,
impl->action_name, &feedback_subscription_options); impl->action_name, &feedback_subscription_options);
if (RCL_RET_OK != ret) { if (RCL_RET_OK != ret) {
RCUTILS_LOG_DEBUG_NAMED( RCUTILS_LOG_DEBUG_NAMED(
@ -394,7 +394,7 @@ rcl_action_client_init(
}; };
ret = rcl_action_status_subscription_init( ret = rcl_action_status_subscription_init(
&impl->status_subscription, node, &impl->status_subscription, node,
&type_support->status_topic_type_support, type_support->status_message_type_support,
impl->action_name, &status_subscription_options); impl->action_name, &status_subscription_options);
if (RCL_RET_OK != ret) { if (RCL_RET_OK != ret) {
RCUTILS_LOG_DEBUG_NAMED( RCUTILS_LOG_DEBUG_NAMED(