Skip to content

Commit 85d37c9

Browse files
micro-ROS foxy Library auto-update 25-05-2022 13:33 (#1019)
Co-authored-by: Acuadros95 <[email protected]>
1 parent 6d32c65 commit 85d37c9

File tree

17 files changed

+70
-5
lines changed

17 files changed

+70
-5
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/ament_package.git 3397bb0ae1cc93d93e1e27da31c0bcb0f4fe0
66
https://github.com/ament/googletest.git 7c20e2597a2d1503cf9afa159206ab8e9b233830
77
https://github.com/ament/uncrustify_vendor.git 0291bc988c45846400aca50cb973bf04a4de3d56
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
1111
https://github.com/micro-ROS/rcl 2132f688d46f1fc850bfc3d4a09b7145f0f2eee6
1212
https://github.com/micro-ROS/rcutils a8dd9189045a01212850264938f9973cb94ca6ae
13-
https://github.com/micro-ROS/rmw-microxrcedds.git bde5c13ab5f1cf37a659d490e93914bc5f62a9ab
13+
https://github.com/micro-ROS/rmw-microxrcedds.git d30a81fd9b3f0221ee0851d798b3a8f6d4489166
1414
https://github.com/micro-ROS/rosidl_typesupport.git 007649631c321081d5ccce1173c7079565d95596
15-
https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git 862f0758b2b45623fce9d66c1f39e690f6299dad
15+
https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git b02e3d342228e9f041515c270e7497208fff7a17
1616
https://github.com/ros-controls/control_msgs 338ef98b4a4d763fe5df39e86a1967844ceb506e
1717
https://github.com/ros2/ament_cmake_ros.git 7b6b599c3fc8023806db2a97b344e8610902adac
1818
https://github.com/ros2/common_interfaces.git 6356bc82f3a034f5d2c61c6760df0007a6cadfb0

src/cortex-m0plus/libmicroros.a

1022 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.
842 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.
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/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

0 commit comments

Comments
 (0)