Skip to content

Commit c0af207

Browse files
micro-ROS humble Library auto-update 25-05-2022 13:33 (#1015)
Co-authored-by: Acuadros95 <[email protected]>
1 parent 7398de7 commit c0af207

File tree

33 files changed

+127
-62
lines changed

33 files changed

+127
-62
lines changed

built_packages

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ https://github.com/ament/ament_package.git a80f40af065e4f708b88ca024f10bfd21bb17
66
https://github.com/ament/googletest.git 6df7425fdcbd368d2d1b99ffd89b9168014abb07
77
https://github.com/ament/uncrustify_vendor.git d647c05b96bc2b2edf4db652a3fc9ebf0fd52f3c
88
https://github.com/eProsima/Micro-CDR.git cb4403a8780095df94a7b1936b1e00153c90070d
9-
https://github.com/eProsima/Micro-XRCE-DDS-Client.git 9b9278c0b3a633aa7ad634bda2fd2c4f04093dcf
9+
https://github.com/eProsima/Micro-XRCE-DDS-Client.git e3f6439013a1a9ecb0d4011d19d7a4cec2c84655
1010
https://github.com/micro-ROS/micro_ros_msgs.git e3664463e78ae5d0c34d86be92d707b3d9dfd27d
11-
https://github.com/micro-ROS/micro_ros_utilities 84fc67aa3ba1175973bacbc53cf9b2ebd18942ae
11+
https://github.com/micro-ROS/micro_ros_utilities 0a39e769bb42b329addbe999c95b1cf216e01349
1212
https://github.com/micro-ROS/rcl 98bb690e17b147f194bd2c92786784814539702e
1313
https://github.com/micro-ROS/rcutils 7293e01924b9f259d7ca7cfadaea81a09dda389a
14-
https://github.com/micro-ROS/rmw-microxrcedds.git 6a93ba6a3d4d1c5add33cc2967c85d70029fd67b
14+
https://github.com/micro-ROS/rmw-microxrcedds.git 6273365d9efaa34c23c7c9a1bf889bd1726edae6
1515
https://github.com/micro-ROS/rosidl_typesupport.git d21bde140e1a4b413f6725888470b758a739171d
16-
https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git cc8dd6c06981e0f0ab3ac10e6f233db0e8e04c06
16+
https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git 106fda6a43a912e09480d7b705f3ca4a31a1803c
1717
https://github.com/ros-controls/control_msgs a555c37f1a3536bb452ea555c58fdd9344d87614
1818
https://github.com/ros2/ament_cmake_ros.git bbbc6ec4dea550f12d68863c558eb7f54be151e4
1919
https://github.com/ros2/common_interfaces.git 980fc1858d104555f6f260e502c5ed96cd6b6e99

src/actionlib_msgs/msg/detail/goal_status__struct.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ enum
3838
/// Constant 'PREEMPTED'.
3939
/**
4040
* The goal received a cancel request after it started executing
41-
* and has since completed its execution (Terminal State).
41+
* and has since completed its execution (Terminal State).
4242
*/
4343
enum
4444
{
@@ -68,7 +68,7 @@ enum
6868
/// Constant 'REJECTED'.
6969
/**
7070
* The goal was rejected by the action server without being processed,
71-
* because the goal was unattainable or invalid (Terminal State).
71+
* because the goal was unattainable or invalid (Terminal State).
7272
*/
7373
enum
7474
{
@@ -88,7 +88,7 @@ enum
8888
/// Constant 'RECALLING'.
8989
/**
9090
* The goal received a cancel request before it started executing, but
91-
* the action server has not yet confirmed that the goal is canceled.
91+
* the action server has not yet confirmed that the goal is canceled.
9292
*/
9393
enum
9494
{
@@ -108,7 +108,7 @@ enum
108108
/// Constant 'LOST'.
109109
/**
110110
* An action client can determine that a goal is LOST. This should not
111-
* be sent over the wire by an action server.
111+
* be sent over the wire by an action server.
112112
*/
113113
enum
114114
{

src/control_msgs/action/detail/follow_joint_trajectory__struct.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ typedef struct control_msgs__action__FollowJointTrajectory_Result
124124
/// - INVALID_GOAL: The reason for the invalid goal (e.g., the requested
125125
/// trajectory is in the past).
126126
/// - INVALID_JOINTS: The mismatch between the expected controller joints
127-
/// and those provided in the goal.
127+
/// and those provided in the goal.
128128
/// - PATH_TOLERANCE_VIOLATED and GOAL_TOLERANCE_VIOLATED: Which joint
129-
/// violated which tolerance, and by how much.
129+
/// violated which tolerance, and by how much.
130130
rosidl_runtime_c__String error_string;
131131
} control_msgs__action__FollowJointTrajectory_Result;
132132

src/cortex-m0plus/libmicroros.a

1020 Bytes
Binary file not shown.

src/cortex-m3/libmicroros.a

1.12 KB
Binary file not shown.

src/cortex-m4/libmicroros.a

1.31 KB
Binary file not shown.
840 Bytes
Binary file not shown.
1.29 KB
Binary file not shown.
1.18 KB
Binary file not shown.

src/esp32/libmicroros.a

4.5 KB
Binary file not shown.

src/geometry_msgs/msg/detail/inertia__struct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ typedef struct geometry_msgs__msg__Inertia
3131
/// Center of mass
3232
geometry_msgs__msg__Vector3 com;
3333
/// Inertia Tensor
34-
/// | ixx ixy ixz |
34+
/// | ixx ixy ixz |
3535
/// I = | ixy iyy iyz |
3636
/// | ixz iyz izz |
3737
double ixx;
1.18 KB
Binary file not shown.

src/mk20dx256/libmicroros.a

1.14 KB
Binary file not shown.
1.14 KB
Binary file not shown.
1.14 KB
Binary file not shown.

src/sensor_msgs/msg/detail/camera_info__struct.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ extern "C"
3333
* camera namespace on topic "camera_info" and accompanied by up to five
3434
* image topics named:
3535
*
36-
* image_raw - raw data from the camera driver, possibly Bayer encoded
36+
* image_raw - raw data from the camera driver, possibly Bayer encoded
3737
* image - monochrome, distorted
38-
* image_color - color, distorted
38+
* image_color - color, distorted
3939
* image_rect - monochrome, rectified
40-
* image_rect_color - color, rectified
40+
* image_rect_color - color, rectified
4141
*
4242
* The image_pipeline contains packages (image_proc, stereo_image_proc)
4343
* for producing the four processed image topics from image_raw and
@@ -55,7 +55,7 @@ extern "C"
5555
*/
5656
typedef struct sensor_msgs__msg__CameraInfo
5757
{
58-
/// Image acquisition info #
58+
/// Image acquisition info #
5959
///
6060
/// Time of image acquisition, camera coordinate frame ID
6161
/// Header timestamp should be acquisition time of image
@@ -65,7 +65,7 @@ typedef struct sensor_msgs__msg__CameraInfo
6565
/// +y should point down in the image
6666
/// +z should point into the plane of the image
6767
std_msgs__msg__Header header;
68-
/// Calibration Parameters #
68+
/// Calibration Parameters #
6969
///
7070
/// These are fixed during camera calibration. Their values will be the #
7171
/// same in all messages until the camera is recalibrated. Note that #
@@ -74,7 +74,7 @@ typedef struct sensor_msgs__msg__CameraInfo
7474
/// The internal parameters can be used to warp a raw (distorted) image #
7575
/// to: #
7676
/// 1. An undistorted image (requires D and K) #
77-
/// 2. A rectified image (requires D, K, R) #
77+
/// 2. A rectified image (requires D, K, R) #
7878
/// The projection matrix P projects 3D points into the rectified image.#
7979
///
8080
/// The image dimensions with which the camera was calibrated.
@@ -89,7 +89,7 @@ typedef struct sensor_msgs__msg__CameraInfo
8989
/// For "plumb_bob", the 5 parameters are: (k1, k2, t1, t2, k3).
9090
rosidl_runtime_c__double__Sequence d;
9191
/// Intrinsic camera matrix for the raw (distorted) images.
92-
/// [fx 0 cx]
92+
/// [fx 0 cx]
9393
/// K = [ 0 fy cy]
9494
/// [ 0 0 1]
9595
/// Projects 3D points in the camera coordinate frame to 2D pixel
@@ -104,28 +104,28 @@ typedef struct sensor_msgs__msg__CameraInfo
104104
/// 3x3 row-major matrix
105105
double r[9];
106106
/// Projection/camera matrix
107-
/// [fx' 0 cx' Tx]
107+
/// [fx' 0 cx' Tx]
108108
/// P = [ 0 fy' cy' Ty]
109-
/// [ 0 0 1 0]
109+
/// [ 0 0 1 0]
110110
/// By convention, this matrix specifies the intrinsic (camera) matrix
111-
/// of the processed (rectified) image. That is, the left 3x3 portion
112-
/// is the normal camera intrinsic matrix for the rectified image.
111+
/// of the processed (rectified) image. That is, the left 3x3 portion
112+
/// is the normal camera intrinsic matrix for the rectified image.
113113
/// It projects 3D points in the camera coordinate frame to 2D pixel
114-
/// coordinates using the focal lengths (fx', fy') and principal point
115-
/// (cx', cy') - these may differ from the values in K.
114+
/// coordinates using the focal lengths (fx', fy') and principal point
115+
/// (cx', cy') - these may differ from the values in K.
116116
/// For monocular cameras, Tx = Ty = 0. Normally, monocular cameras will
117-
/// also have R = the identity and P[1:3,1:3] = K.
117+
/// also have R = the identity and P[1:3,1:3] = K.
118118
/// For a stereo pair, the fourth column [Tx Ty 0]' is related to the
119119
/// position of the optical center of the second camera in the first
120120
/// camera's frame. We assume Tz = 0 so both cameras are in the same
121121
/// stereo image plane. The first camera always has Tx = Ty = 0. For
122122
/// the right (second) camera of a horizontal stereo pair, Ty = 0 and
123-
/// Tx = -fx' * B, where B is the baseline between the cameras.
123+
/// Tx = -fx' * B, where B is the baseline between the cameras.
124124
/// Given a 3D point [X Y Z]', the projection (x, y) of the point onto
125125
/// the rectified image is given by:
126-
/// [u v w]' = P * [X Y Z 1]'
127-
/// x = u / w
128-
/// y = v / w
126+
/// [u v w]' = P * [X Y Z 1]'
127+
/// x = u / w
128+
/// y = v / w
129129
/// This holds for both images of a stereo pair.
130130
/// 3x4 row-major matrix
131131
double p[12];
@@ -136,7 +136,7 @@ typedef struct sensor_msgs__msg__CameraInfo
136136
/// may be changed freely without recalibrating the camera. #
137137
///
138138
/// Binning refers here to any camera setting which combines rectangular
139-
/// neighborhoods of pixels into larger "super-pixels." It reduces the
139+
/// neighborhoods of pixels into larger "super-pixels." It reduces the
140140
/// resolution of the output image to
141141
/// (width / binning_x) x (height / binning_y).
142142
/// The default values binning_x = binning_y = 0 is considered the same
@@ -146,9 +146,9 @@ typedef struct sensor_msgs__msg__CameraInfo
146146
/// Region of interest (subwindow of full camera resolution), given in
147147
/// full resolution (unbinned) image coordinates. A particular ROI
148148
/// always denotes the same window of pixels on the camera sensor,
149-
/// regardless of binning settings.
149+
/// regardless of binning settings.
150150
/// The default setting of roi (all values 0) is considered the same as
151-
/// full resolution (roi.width = width, roi.height = height).
151+
/// full resolution (roi.width = width, roi.height = height).
152152
sensor_msgs__msg__RegionOfInterest roi;
153153
} sensor_msgs__msg__CameraInfo;
154154

src/sensor_msgs/msg/detail/channel_float32__struct.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ extern "C"
3232
* point.
3333
*
3434
* Channel names in existing practice include:
35-
* "u", "v" - row and column (respectively) in the left stereo image.
35+
* "u", "v" - row and column (respectively) in the left stereo image.
3636
* This is opposite to usual conventions but remains for
37-
* historical reasons. The newer PointCloud2 message has no
37+
* historical reasons. The newer PointCloud2 message has no
3838
* such problem.
3939
* "rgb" - For point clouds produced by color stereo cameras. uint8
4040
* (R,G,B) values packed into the least significant 24 bits,
41-
* in order.
41+
* in order.
4242
* "intensity" - laser or pixel intensity.
43-
* "distance"
43+
* "distance"
4444
*/
4545
typedef struct sensor_msgs__msg__ChannelFloat32
4646
{

src/sensor_msgs/msg/detail/compressed_image__struct.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ typedef struct sensor_msgs__msg__CompressedImage
3939
/// +z should point into to plane of the image
4040
std_msgs__msg__Header header;
4141
/// Specifies the format of the data
42-
/// Acceptable values:
43-
/// jpeg, png, tiff
42+
/// Acceptable values:
43+
/// jpeg, png, tiff
4444
rosidl_runtime_c__String format;
4545
/// Compressed image buffer
4646
rosidl_runtime_c__uint8__Sequence data;

src/sensor_msgs/msg/detail/illuminance__struct.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ extern "C"
3333
*
3434
* All other Photometric and Radiometric measurements should not use this message.
3535
* This message cannot represent:
36-
* - Luminous intensity (candela/light source output)
36+
* - Luminous intensity (candela/light source output)
3737
* - Luminance (nits/light output per area)
38-
* - Irradiance (watt/area), etc.
38+
* - Irradiance (watt/area), etc.
3939
*/
4040
typedef struct sensor_msgs__msg__Illuminance
4141
{

src/sensor_msgs/msg/detail/joint_state__struct.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ extern "C"
3232
* This is a message that holds data to describe the state of a set of torque controlled joints.
3333
*
3434
* The state of each joint (revolute or prismatic) is defined by:
35-
* * the position of the joint (rad or m),
36-
* * the velocity of the joint (rad/s or m/s) and
37-
* * the effort that is applied in the joint (Nm or N).
35+
* * the position of the joint (rad or m),
36+
* * the velocity of the joint (rad/s or m/s) and
37+
* * the effort that is applied in the joint (Nm or N).
3838
*
3939
* Each joint is uniquely identified by its name
4040
* The header specifies the time at which the joint states were recorded. All the joint states

src/sensor_msgs/msg/detail/nav_sat_fix__struct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ typedef struct sensor_msgs__msg__NavSatFix
6868
/// header.frame_id is the frame of reference reported by the satellite
6969
/// receiver, usually the location of the antenna. This is a
7070
/// Euclidean frame relative to the vehicle, not a reference
71-
/// ellipsoid.
71+
/// ellipsoid.
7272
std_msgs__msg__Header header;
7373
/// Satellite fix status information.
7474
sensor_msgs__msg__NavSatStatus status;

src/statistics_msgs/msg/detail/metrics_message__struct.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ extern "C"
3434
* measure a system's CPU % for a given window yields the following data points over a window of time:
3535
*
3636
* - average cpu %
37-
* - std deviation
38-
* - min
37+
* - std deviation
38+
* - min
3939
* - max
4040
* - sample count
4141
*

src/stereo_msgs/msg/detail/disparity_image__struct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ typedef struct stereo_msgs__msg__DisparityImage
4949
/// The disparity search range defines the horopter, or 3D volume that the
5050
/// stereo algorithm can "see". Points with Z outside of:
5151
/// Z_min = fT / max_disparity
52-
/// Z_max = fT / min_disparity
52+
/// Z_max = fT / min_disparity
5353
/// could not be found.
5454
float min_disparity;
5555
float max_disparity;

src/unique_identifier_msgs/msg/detail/uuid__struct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extern "C"
2121
/**
2222
* A universally unique identifier (UUID).
2323
*
24-
* http://en.wikipedia.org/wiki/Universally_unique_identifier
24+
* http://en.wikipedia.org/wiki/Universally_unique_identifier
2525
* http://tools.ietf.org/html/rfc4122.html
2626
*/
2727
typedef struct unique_identifier_msgs__msg__UUID

src/uxr/client/config.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,18 @@
6767

6868
#define UCLIENT_TWEAK_XRCE_WRITE_LIMIT
6969

70+
/* #undef UCLIENT_HARD_LIVELINESS_CHECK */
71+
72+
#ifdef UCLIENT_HARD_LIVELINESS_CHECK
73+
#define UXR_CONFIG_HARD_LIVELINESS_CHECK_TIMEOUT_STR "10000"
74+
#endif
75+
76+
77+
// Version checks
78+
#if UXR_CLIENT_VERSION_MAJOR >= 3
79+
#error UCLIENT_HARD_LIVELINESS_CHECK shall be included in session API
80+
#error MTU must be included in CREATE_CLIENT_Payload properties
81+
#error Reorder ObjectInfo https://github.com/eProsima/Micro-XRCE-DDS/issues/137
82+
#endif
7083

7184
#endif // _UXR_CLIENT_CONFIG_H_

src/uxr/client/core/type/xrce_types.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ extern "C"
2424
#endif // ifdef __cplusplus
2525

2626
#include <uxr/client/defines.h>
27+
#include <uxr/client/config.h>
2728

2829
#include <ucdr/microcdr.h>
2930
#include <stdint.h>
@@ -40,7 +41,24 @@ extern "C"
4041
#define UXR_SAMPLE_DELTA_SEQUENCE_MAX 8
4142
#define UXR_PACKED_SAMPLES_SEQUENCE_MAX 8
4243
#define UXR_TRANSPORT_LOCATOR_SEQUENCE_MAX 4
44+
45+
#ifdef UCLIENT_PROFILE_SHARED_MEMORY
46+
#define PROFILE_SHARED_MEMORY_SEQ_COUNT 1
47+
#else
48+
#define PROFILE_SHARED_MEMORY_SEQ_COUNT 0
49+
#endif // ifdef UCLIENT_PROFILE_SHARED_MEMORY
50+
51+
#ifdef UCLIENT_HARD_LIVELINESS_CHECK
52+
#define HARD_LIVELINESS_CHECK_SEQ_COUNT 1
53+
#else
54+
#define HARD_LIVELINESS_CHECK_SEQ_COUNT 0
55+
#endif // ifdef UCLIENT_HARD_LIVELINESS_CHECK
56+
57+
#if (PROFILE_SHARED_MEMORY_SEQ_COUNT + HARD_LIVELINESS_CHECK_SEQ_COUNT) == 0
4358
#define UXR_PROPERTY_SEQUENCE_MAX 1
59+
#else
60+
#define UXR_PROPERTY_SEQUENCE_MAX PROFILE_SHARED_MEMORY_SEQ_COUNT + HARD_LIVELINESS_CHECK_SEQ_COUNT
61+
#endif // if (PROFILE_SHARED_MEMORY_SEQ_COUNT + HARD_LIVELINESS_CHECK_SEQ_COUNT) == 0
4462

4563
typedef struct Time_t
4664
{
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima).
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#ifndef UXR_CLIENT_PROFILE_TRANSPORT_IP_TCP_TCPTRANSPORTPOSIXNOPOLL_H_
16+
#define UXR_CLIENT_PROFILE_TRANSPORT_IP_TCP_TCPTRANSPORTPOSIXNOPOLL_H_
17+
18+
#ifdef __cplusplus
19+
extern "C"
20+
{
21+
#endif // ifdef __cplusplus
22+
23+
typedef struct uxrTCPPlatform
24+
{
25+
int fd;
26+
} uxrTCPPlatform;
27+
28+
#ifdef __cplusplus
29+
}
30+
#endif // ifdef __cplusplus
31+
32+
#endif // UXR_CLIENT_PROFILE_TRANSPORT_IP_TCP_TCPTRANSPORTPOSIXNOPOLL_H_

src/uxr/client/transport.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
#endif //UCLIENT_PROFILE_UDP
3434

3535
#ifdef UCLIENT_PROFILE_TCP
36-
#if defined(UCLIENT_PLATFORM_POSIX)
36+
#if defined(UCLIENT_PLATFORM_POSIX_NOPOLL)
37+
#include <uxr/client/profile/transport/ip/tcp/tcp_transport_posix_nopoll.h>
38+
#elif defined(UCLIENT_PLATFORM_POSIX)
3739
#include <uxr/client/profile/transport/ip/tcp/tcp_transport_posix.h>
3840
#elif defined(UCLIENT_PLATFORM_WINDOWS)
3941
#include <uxr/client/profile/transport/ip/tcp/tcp_transport_windows.h>

src/uxr/client/util/ping.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern "C"
3333
#define UXR_PING_BUF 16 // 4 (HEADER SIZE) + 4 (SUBHEADER_SIZE) + 8 (GET_Info payload)
3434

3535
#define GET_INFO_MSG_SIZE 8
36-
#define GET_INFO_REQUEST_ID 9
36+
#define GET_INFO_REQUEST_PING_ID 10
3737

3838
struct uxrSession;
3939

src/visualization_msgs/msg/detail/interactive_marker_control__struct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ typedef struct visualization_msgs__msg__InteractiveMarkerControl
153153
/// - The markers can be defined in an arbitrary coordinate frame,
154154
/// but will be transformed into the local frame of the interactive marker.
155155
/// - If the header of a marker is empty, its pose will be interpreted as
156-
/// relative to the pose of the parent interactive marker.
156+
/// relative to the pose of the parent interactive marker.
157157
visualization_msgs__msg__Marker__Sequence markers;
158158
/// In VIEW_FACING mode, set this to true if you don't want the markers
159159
/// to be aligned with the camera view point. The markers will show up

0 commit comments

Comments
 (0)