Skip to content

Commit 3529e99

Browse files
micro-ROS foxy Library auto-update 06-07-2021 06:18 (#358)
Co-authored-by: pablogs9 <[email protected]>
1 parent b1e034f commit 3529e99

File tree

10 files changed

+148
-13
lines changed

10 files changed

+148
-13
lines changed

built_packages

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git acb2fb6f7b5bde2
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 aec6e900cdb12765db71bd4cc990c7de37e2cab2
15+
https://github.com/ros2/rclc 1a6a50be0486628875200843080720636b848d21
1616
https://github.com/micro-ROS/micro_ros_msgs.git c8af6d4f246d1b324e6578ec967c8ddc1f4093d5
1717
https://github.com/ros-controls/control_msgs 812bc0ed390d765865b02eeea78bf6e0587381af
1818
https://github.com/ros2/rcl_interfaces.git ee04e046132be9d9fdcdaeff8dd54a5d0d9aa022
@@ -30,5 +30,5 @@ https://github.com/ros2/libyaml_vendor.git 4d360d783b3018dfaed6d9ab9c736b720c109
3030
https://github.com/ros2/rosidl.git 75964cbdb3ba13854e749dcd2dd8274b73a5360c
3131
https://github.com/ros2/rmw.git 6d23f9fc6bfe4616e1efeeefee7a927635a83afe
3232
https://github.com/ros2/rosidl_defaults.git cbc7ffd38d98c5b15823fc62b0891d2264ae4472
33-
https://github.com/eProsima/Micro-CDR.git bf546d5d10ef0a81e0a6f8561c7e9a54ef0b20b0
34-
https://github.com/eProsima/Micro-XRCE-DDS-Client.git 3e2a144b44add2a789ecdfd116686c981738839e
33+
https://github.com/eProsima/Micro-CDR.git 21c99e0d8d140c50b45f13c8ed3716cb9fa0fb27
34+
https://github.com/eProsima/Micro-XRCE-DDS-Client.git f989c34c153dc848f83e64f0c2328be42c2aa971

src/cortex-m0plus/libmicroros.a

2.45 KB
Binary file not shown.

src/cortex-m3/libmicroros.a

2.5 KB
Binary file not shown.
2.47 KB
Binary file not shown.
2.54 KB
Binary file not shown.
2.54 KB
Binary file not shown.

src/mk20dx256/libmicroros.a

2.61 KB
Binary file not shown.
2.61 KB
Binary file not shown.

src/rclc/executor.h

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,141 @@ rclc_executor_add_guard_condition(
434434
rcl_guard_condition_t * gc,
435435
rclc_gc_callback_t callback);
436436

437+
438+
/**
439+
* Removes a subscription from an executor.
440+
* * An error is returned if {@link rclc_executor_t.handles} array is empty.
441+
* * An error is returned if subscription is not found in {@link rclc_executor_t.handles}.
442+
* * The total number_of_subscriptions field of {@link rclc_executor_t.info}
443+
* is decremented by one.
444+
*
445+
* <hr>
446+
* Attribute | Adherence
447+
* ------------------ | -------------
448+
* Allocates Memory | No
449+
* Thread-Safe | No
450+
* Uses Atomics | No
451+
* Lock-Free | Yes
452+
*
453+
* \param [inout] executor pointer to initialized executor
454+
* \param [in] subscription pointer to an allocated and initialized subscription previously added to executor
455+
* \return `RCL_RET_OK` if add-operation was successful
456+
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer
457+
* \return `RCL_RET_ERROR` if any other error occured
458+
*/
459+
rcl_ret_t
460+
rclc_executor_remove_subscription(
461+
rclc_executor_t * executor,
462+
const rcl_subscription_t * subscription);
463+
464+
465+
/**
466+
* Removes a timer from an executor.
467+
* * An error is returned if {@link rclc_executor_t.handles} array is empty.
468+
* * An error is returned if timer is not found in {@link rclc_executor_t.handles}.
469+
* * The total number_of_timers field of {@link rclc_executor_t.info}
470+
* is incremented by one.
471+
*
472+
* <hr>
473+
* Attribute | Adherence
474+
* ------------------ | -------------
475+
* Allocates Memory | No
476+
* Thread-Safe | No
477+
* Uses Atomics | No
478+
* Lock-Free | Yes
479+
*
480+
* \param [inout] executor pointer to initialized executor
481+
* \param [in] timer pointer to an allocated and initialized timer previously added to executor
482+
* \return `RCL_RET_OK` if add-operation was successful
483+
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer
484+
* \return `RCL_RET_ERROR` if any other error occured
485+
*/
486+
rcl_ret_t
487+
rclc_executor_remove_timer(
488+
rclc_executor_t * executor,
489+
const rcl_timer_t * timer);
490+
491+
492+
/**
493+
* Removes a client from an executor.
494+
* * An error is returned if {@link rclc_executor_t.handles} array is empty.
495+
* * An error is returned if client is not found in {@link rclc_executor_t.handles}.
496+
* * The total number_of_clients field of {@link rclc_executor_t.info}
497+
* is incremented by one.
498+
*
499+
* <hr>
500+
* Attribute | Adherence
501+
* ------------------ | -------------
502+
* Allocates Memory | No
503+
* Thread-Safe | No
504+
* Uses Atomics | No
505+
* Lock-Free | Yes
506+
*
507+
* \param [inout] executor pointer to initialized executor
508+
* \param [in] client pointer to an allocated and initialized client previously added to executor
509+
* \return `RCL_RET_OK` if add-operation was successful
510+
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer
511+
* \return `RCL_RET_ERROR` if any other error occured
512+
*/
513+
rcl_ret_t
514+
rclc_executor_remove_client(
515+
rclc_executor_t * executor,
516+
const rcl_client_t * client);
517+
518+
519+
/**
520+
* Removes a service from an executor.
521+
* * An error is returned if {@link rclc_executor_t.handles} array is empty.
522+
* * An error is returned if service is not found in {@link rclc_executor_t.handles}.
523+
* * The total number_of_services field of {@link rclc_executor_t.info}
524+
* is incremented by one.
525+
*
526+
* <hr>
527+
* Attribute | Adherence
528+
* ------------------ | -------------
529+
* Allocates Memory | No
530+
* Thread-Safe | No
531+
* Uses Atomics | No
532+
* Lock-Free | Yes
533+
*
534+
* \param [inout] executor pointer to initialized executor
535+
* \param [in] service pointer to an allocated and initialized service previously added to executor
536+
* \return `RCL_RET_OK` if add-operation was successful
537+
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer
538+
* \return `RCL_RET_ERROR` if any other error occured
539+
*/
540+
rcl_ret_t
541+
rclc_executor_remove_service(
542+
rclc_executor_t * executor,
543+
const rcl_service_t * service);
544+
545+
/**
546+
* Removes a guard_condition from an executor.
547+
* * An error is returned if {@link rclc_executor_t.handles} array is empty.
548+
* * An error is returned if guard_condition is not found in {@link rclc_executor_t.handles}.
549+
* * The total number_of_guard_conditions field of {@link rclc_executor_t.info}
550+
* is incremented by one.
551+
*
552+
* <hr>
553+
* Attribute | Adherence
554+
* ------------------ | -------------
555+
* Allocates Memory | No
556+
* Thread-Safe | No
557+
* Uses Atomics | No
558+
* Lock-Free | Yes
559+
*
560+
* \param [inout] executor pointer to initialized executor
561+
* \param [in] guard_condition pointer to an allocated and initialized guard_condition previously added to executor
562+
* \return `RCL_RET_OK` if add-operation was successful
563+
* \return `RCL_RET_INVALID_ARGUMENT` if any parameter is a null pointer
564+
* \return `RCL_RET_ERROR` if any other error occured
565+
*/
566+
rcl_ret_t
567+
rclc_executor_remove_guard_condition(
568+
rclc_executor_t * executor,
569+
const rcl_guard_condition_t * guard_condition);
570+
571+
437572
/**
438573
* The spin-some function checks one-time for new data from the DDS-queue.
439574
* * the timeout is defined in {@link rclc_executor_t.timeout_ns} and can

src/uxr/client/core/session/session.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -400,22 +400,22 @@ UXRDLLAPI void uxr_flash_output_streams(
400400
/**
401401
* @brief Keeps communication between the Client and the Agent.
402402
* This function involves the following actions:
403-
* 1. flashing all the output streams sending the data through the transport,
403+
* 1. flushing all the output streams sending the data through the transport,
404404
* 2. listening messages from the Agent calling the associated callback (topic and status).
405405
* The aforementioned actions will be performed in a loop until the waiting time for a new message
406-
* exceeds the `time`.
406+
* exceeds the `timeout`.
407407
* @param session A uxrSession structure previously initialized.
408-
* @param time The waiting time in milliseconds.
408+
* @param timeout The waiting time in milliseconds.
409409
* @return `true` in case of the Agent confirms the reception of all the output messages. `false` in other case.
410410
*/
411411
UXRDLLAPI bool uxr_run_session_time(
412412
uxrSession* session,
413-
int time);
413+
int timeout);
414414

415415
/**
416416
* @brief Keeps communication between the Client and the Agent.
417417
* This function involves the following actions:
418-
* 1. flashing all the output streams sending the data through the transport,
418+
* 1. flushing all the output streams sending the data through the transport,
419419
* 2. listening messages from the Agent calling the associated callback (topic and status).
420420
* The aforementioned actions will be performed in a loop until the `timeout` is exceeded.
421421
* @param session A uxrSession structure previously initialized.
@@ -429,7 +429,7 @@ UXRDLLAPI bool uxr_run_session_timeout(
429429
/**
430430
* @brief Keeps communication between the Client and the Agent.
431431
* This function involves the following actions:
432-
* 1. flashing all the output streams sending the data through the transport,
432+
* 1. flushing all the output streams sending the data through the transport,
433433
* 2. listening messages from the Agent calling the associated callback (topic, status, request and replies).
434434
* The aforementioned actions will be performed in a loop until a data message is received
435435
* or the `timeout` is exceeded.
@@ -444,7 +444,7 @@ UXRDLLAPI bool uxr_run_session_until_data(
444444
/**
445445
* @brief Keeps communication between the Client and the Agent.
446446
* This function involves the following actions:
447-
* 1. flashing all the output streams sending the data through the transport,
447+
* 1. flushing all the output streams sending the data through the transport,
448448
* 2. listening messages from the Agent calling the associated callback (topic and status).
449449
* The aforementioned actions will be performed in a loop until a message is received
450450
* or the `timeout` is exceeded.
@@ -459,7 +459,7 @@ UXRDLLAPI bool uxr_run_session_until_timeout(
459459
/**
460460
* @brief Keeps communication between the Client and the Agent.
461461
* This function involves the following actions:
462-
* 1. flashing all the output streams sending the data through the transport,
462+
* 1. flushing all the output streams sending the data through the transport,
463463
* 2. listening messages from the Agent calling the associated callback (topic and status).
464464
* The aforementioned actions will be performed in a loop until a the `timeout` is exceeded
465465
* or the output reliable streams confirm the delivery of all their messages.
@@ -474,7 +474,7 @@ UXRDLLAPI bool uxr_run_session_until_confirm_delivery(
474474
/**
475475
* @brief Keeps communication between the Client and the Agent.
476476
* This function involves the following actions:
477-
* 1. flashing all the output streams sending the data through the transport,
477+
* 1. flushing all the output streams sending the data through the transport,
478478
* 2. listening messages from the Agent calling the associated callback (topic and status).
479479
* The aforementioned actions will be performed in a loop until a the `timeout` is exceeded
480480
* or all the requested status are received.
@@ -496,7 +496,7 @@ UXRDLLAPI bool uxr_run_session_until_all_status(
496496
/**
497497
* @brief Keeps communication between the Client and the Agent.
498498
* This function involves the following actions:
499-
* 1. flashing all the output streams sending the data through the transport,
499+
* 1. flushing all the output streams sending the data through the transport,
500500
* 2. listening messages from the Agent calling the associated callback (topic and status).
501501
* The aforementioned actions will be performed in a loop until a the `timeout` is exceeded
502502
* or one of the requested status is received.

0 commit comments

Comments
 (0)