Skip to content

Commit 628ad3d

Browse files
micro-ROS galactic Library auto-update 20-08-2021 06:17 (#426)
Co-authored-by: pablogs9 <[email protected]>
1 parent 130b431 commit 628ad3d

File tree

10 files changed

+67
-3
lines changed

10 files changed

+67
-3
lines changed

built_packages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ https://github.com/eProsima/Micro-CDR.git 21c99e0d8d140c50b45f13c8ed3716cb9fa0fb
44
https://github.com/eProsima/Micro-XRCE-DDS-Client.git 4ccec07f4089ec1ec49e72c4ed0484ae6515cd75
55
https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git 35b1212db08f67c0af727dcb1803cb417b84dcba
66
https://github.com/micro-ROS/rcutils 500ee3fcb16bf6260453c75b50c3d7785d724443
7-
https://github.com/ros2/rclc a540329f97e8910efd0151c8528f40d53ade9e9e
7+
https://github.com/ros2/rclc a26bbe52097497048c424d530af3ba36a5127725
88
https://github.com/micro-ROS/rosidl_typesupport.git 0e03d18809cb08215877ff856a916ec35a066561
99
https://github.com/micro-ROS/rmw-microxrcedds.git 30658350495ea891301e11c000f9e22d2ebea62a
1010
https://github.com/micro-ROS/rcl ae6b2abc43f71ad9e7d1fce6da76d0e2cc88578a

src/cortex-m0plus/libmicroros.a

3.81 KB
Binary file not shown.

src/cortex-m3/libmicroros.a

3.78 KB
Binary file not shown.
3.77 KB
Binary file not shown.
3.75 KB
Binary file not shown.
3.75 KB
Binary file not shown.

src/mk20dx256/libmicroros.a

3.74 KB
Binary file not shown.
3.74 KB
Binary file not shown.

src/rclc/executor.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ rclc_executor_add_subscription(
260260
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer (NULL context is ignored)
261261
* \return `RCL_RET_ERROR` if any other error occured
262262
*/
263+
RCLC_PUBLIC
263264
rcl_ret_t
264265
rclc_executor_add_subscription_with_context(
265266
rclc_executor_t * executor,
@@ -504,6 +505,7 @@ rclc_executor_add_guard_condition(
504505
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer
505506
* \return `RCL_RET_ERROR` if any other error occured
506507
*/
508+
RCLC_PUBLIC
507509
rcl_ret_t
508510
rclc_executor_remove_subscription(
509511
rclc_executor_t * executor,
@@ -531,6 +533,7 @@ rclc_executor_remove_subscription(
531533
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer
532534
* \return `RCL_RET_ERROR` if any other error occured
533535
*/
536+
RCLC_PUBLIC
534537
rcl_ret_t
535538
rclc_executor_remove_timer(
536539
rclc_executor_t * executor,
@@ -558,6 +561,7 @@ rclc_executor_remove_timer(
558561
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer
559562
* \return `RCL_RET_ERROR` if any other error occured
560563
*/
564+
RCLC_PUBLIC
561565
rcl_ret_t
562566
rclc_executor_remove_client(
563567
rclc_executor_t * executor,
@@ -585,6 +589,7 @@ rclc_executor_remove_client(
585589
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer
586590
* \return `RCL_RET_ERROR` if any other error occured
587591
*/
592+
RCLC_PUBLIC
588593
rcl_ret_t
589594
rclc_executor_remove_service(
590595
rclc_executor_t * executor,
@@ -611,6 +616,7 @@ rclc_executor_remove_service(
611616
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer
612617
* \return `RCL_RET_ERROR` if any other error occured
613618
*/
619+
RCLC_PUBLIC
614620
rcl_ret_t
615621
rclc_executor_remove_guard_condition(
616622
rclc_executor_t * executor,

src/rclc_lifecycle/rclc_lifecycle.h

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@
2323
#include <rcl/error_handling.h>
2424
#include <rcl_lifecycle/rcl_lifecycle.h>
2525

26-
#include "rclc/node.h"
26+
#include <lifecycle_msgs/srv/change_state.h>
27+
#include <lifecycle_msgs/srv/get_state.h>
28+
#include <lifecycle_msgs/srv/get_available_states.h>
29+
30+
#include <rclc/node.h>
31+
#include <rclc/executor.h>
2732
#include "rclc_lifecycle/visibility_control.h"
2833

2934
typedef struct rclc_lifecycle_callback_map_t
@@ -38,8 +43,61 @@ typedef struct rclc_lifecycle_node_t
3843
rcl_node_t * node;
3944
rcl_lifecycle_state_machine_t * state_machine;
4045
rclc_lifecycle_callback_map_t callbacks;
46+
bool publish_transitions;
47+
48+
lifecycle_msgs__srv__ChangeState_Request cs_req;
49+
lifecycle_msgs__srv__ChangeState_Response cs_res;
50+
lifecycle_msgs__srv__GetState_Request gs_req;
51+
lifecycle_msgs__srv__GetState_Response gs_res;
52+
lifecycle_msgs__srv__GetAvailableStates_Request gas_req;
53+
lifecycle_msgs__srv__GetAvailableStates_Response gas_res;
4154
} rclc_lifecycle_node_t;
4255

56+
/// Structure which encapsulates a ROS Lifecycle Node.
57+
typedef struct rclc_lifecycle_service_context_t
58+
{
59+
rclc_lifecycle_node_t * lifecycle_node;
60+
} rclc_lifecycle_service_context_t;
61+
62+
RCLC_LIFECYCLE_PUBLIC
63+
rcl_ret_t
64+
rclc_lifecycle_init_get_state_server(
65+
rclc_lifecycle_node_t * lifecycle_node,
66+
rclc_executor_t * executor);
67+
68+
RCLC_LIFECYCLE_PUBLIC
69+
rcl_ret_t
70+
rclc_lifecycle_init_get_available_states_server(
71+
rclc_lifecycle_node_t * lifecycle_node,
72+
rclc_executor_t * executor);
73+
74+
RCLC_LIFECYCLE_PUBLIC
75+
rcl_ret_t
76+
rclc_lifecycle_init_change_state_server(
77+
rclc_lifecycle_node_t * lifecycle_node,
78+
rclc_executor_t * executor);
79+
80+
RCLC_LIFECYCLE_PUBLIC
81+
void
82+
rclc_lifecycle_get_state_callback(
83+
const void * req,
84+
void * res,
85+
void * context);
86+
87+
RCLC_LIFECYCLE_PUBLIC
88+
void
89+
rclc_lifecycle_get_available_states_callback(
90+
const void * req,
91+
void * res,
92+
void * context);
93+
94+
RCLC_LIFECYCLE_PUBLIC
95+
void
96+
rclc_lifecycle_change_state_callback(
97+
const void * req,
98+
void * res,
99+
void * context);
100+
43101
RCLC_LIFECYCLE_PUBLIC
44102
rcl_ret_t
45103
rclc_make_node_a_lifecycle_node(
@@ -95,7 +153,7 @@ rclc_lifecycle_execute_callback(
95153

96154
RCLC_LIFECYCLE_PUBLIC
97155
rcl_ret_t
98-
rcl_lifecycle_node_fini(
156+
rclc_lifecycle_node_fini(
99157
rclc_lifecycle_node_t * node,
100158
rcl_allocator_t * allocator);
101159

0 commit comments

Comments
 (0)