Skip to content

Commit 6fea3d0

Browse files
micro-ROS foxy Library auto-update 29-07-2021 06:18 (#401)
Co-authored-by: pablogs9 <[email protected]>
1 parent 82149d2 commit 6fea3d0

File tree

13 files changed

+108
-28
lines changed

13 files changed

+108
-28
lines changed

built_packages

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ https://github.com/ament/googletest.git 059029afcd06de344ad0ef72dc4554ada268060c
66
https://github.com/ament/ament_cmake.git 589cf00e21b100f2844b127bb53743b7bf29ee7b
77
https://github.com/ament/ament_lint.git 418a69c7e0f922adc889ac1bc2a7dcf721bf7060
88
https://github.com/ros2/ament_cmake_ros.git 7b6b599c3fc8023806db2a97b344e8610902adac
9-
https://github.com/micro-ROS/rmw-microxrcedds.git e483ca62ff3d0843748b4aa8008bdc6de61abba7
9+
https://github.com/micro-ROS/rmw-microxrcedds.git 8594729864049188151136e74cb859b5bba01ecc
1010
https://github.com/micro-ROS/rcl fc14a9a73f5e0579ec0c902a1a4375c9a013cabf
1111
https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git acb2fb6f7b5bde21b47fd7e8c03d84f20b302887
1212
https://github.com/micro-ROS/rosidl_typesupport.git 5d974dbee4cd6988ce33923246eb404db327fad8
1313
https://github.com/micro-ROS/rcutils 0fd0c442dfa343dcfd0cb3674012039bed0c9389
1414
https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing d11b87737245b8456bbada44dfa7b1d670b1c4d0
15-
https://github.com/ros2/rclc 1ac4a28dbe4b788ae9a05b7a001c717fb304f183
15+
https://github.com/ros2/rclc 5ad7f6b3bdd3f63075e2092a4a0bda1a81420a18
1616
https://github.com/micro-ROS/micro_ros_msgs.git c8af6d4f246d1b324e6578ec967c8ddc1f4093d5
1717
https://github.com/ros-controls/control_msgs 338ef98b4a4d763fe5df39e86a1967844ceb506e
1818
https://github.com/ros2/rcl_interfaces.git ee04e046132be9d9fdcdaeff8dd54a5d0d9aa022
@@ -31,4 +31,4 @@ https://github.com/ros2/rosidl.git 75964cbdb3ba13854e749dcd2dd8274b73a5360c
3131
https://github.com/ros2/rmw.git 6d23f9fc6bfe4616e1efeeefee7a927635a83afe
3232
https://github.com/ros2/rosidl_defaults.git cbc7ffd38d98c5b15823fc62b0891d2264ae4472
3333
https://github.com/eProsima/Micro-CDR.git 21c99e0d8d140c50b45f13c8ed3716cb9fa0fb27
34-
https://github.com/eProsima/Micro-XRCE-DDS-Client.git 2693d83bd9c37bd4615c38163b9078084fc79730
34+
https://github.com/eProsima/Micro-XRCE-DDS-Client.git 4ccec07f4089ec1ec49e72c4ed0484ae6515cd75

src/cortex-m0plus/libmicroros.a

1.89 KB
Binary file not shown.

src/cortex-m3/libmicroros.a

3.51 KB
Binary file not shown.
372 Bytes
Binary file not shown.
388 Bytes
Binary file not shown.
384 Bytes
Binary file not shown.

src/mk20dx256/libmicroros.a

1.44 KB
Binary file not shown.
1.44 KB
Binary file not shown.

src/rclc/executor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ rclc_executor_add_subscription(
233233
rclc_executor_t * executor,
234234
rcl_subscription_t * subscription,
235235
void * msg,
236-
rclc_callback_t callback,
236+
rclc_subscription_callback_t callback,
237237
rclc_executor_handle_invocation_t invocation);
238238

239239
/**

src/rclc/executor_handle.h

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,17 @@ extern "C"
3131
typedef enum
3232
{
3333
SUBSCRIPTION,
34+
SUBSCRIPTION_WITH_CONTEXT,
3435
TIMER,
36+
// TIMER_WITH_CONTEXT, // TODO
3537
CLIENT,
38+
CLIENT_WITH_REQUEST_ID,
39+
// CLIENT_WITH_CONTEXT, // TODO
3640
SERVICE,
41+
SERVICE_WITH_REQUEST_ID,
42+
SERVICE_WITH_CONTEXT,
3743
GUARD_CONDITION,
44+
// GUARD_CONDITION_WITH_CONTEXT, //TODO
3845
NONE
3946
} rclc_executor_handle_type_t;
4047

@@ -46,21 +53,13 @@ typedef enum
4653
ALWAYS
4754
} rclc_executor_handle_invocation_t;
4855

49-
typedef enum
50-
{
51-
CB_UNDEFINED,
52-
CB_WITHOUT_REQUEST_ID,
53-
CB_WITH_REQUEST_ID,
54-
CB_WITH_CONTEXT,
55-
} rclc_executor_handle_callback_type_t;
56-
57-
58-
/// Type definition for callback function.
59-
typedef void (* rclc_callback_t)(const void *);
60-
6156
/// Type definition for subscription callback function
6257
/// - incoming message
63-
// typedef void (* rclc_subscription_callback_t)(const void *);
58+
typedef void (* rclc_subscription_callback_t)(const void *);
59+
60+
/// Type definition (duplicate) for subscription callback function (alias for foxy and galactic).
61+
/// - incoming message
62+
typedef rclc_subscription_callback_t rclc_callback_t;
6463

6564
/// Type definition for subscription callback function
6665
/// - incoming message
@@ -137,7 +136,7 @@ typedef struct
137136

138137
/// Storage for callbacks
139138
union {
140-
rclc_callback_t callback;
139+
rclc_subscription_callback_t subscription_callback;
141140
rclc_subscription_callback_with_context_t subscription_callback_with_context;
142141
rclc_service_callback_t service_callback;
143142
rclc_service_callback_with_request_id_t service_callback_with_reqid;
@@ -159,8 +158,6 @@ typedef struct
159158
/// Interval variable. Flag, which is true, if new data is available from DDS queue
160159
/// (is set after calling rcl_take)
161160
bool data_available;
162-
/// callback type for service/client
163-
rclc_executor_handle_callback_type_t callback_type;
164161
} rclc_executor_handle_t;
165162

166163
/// Information about total number of subscriptions, guard_conditions, timers, subscription etc.

0 commit comments

Comments
 (0)