File tree 17 files changed +70
-5
lines changed
mk64fx512/fpv4-sp-d16-hard
mk66fx1m0/fpv4-sp-d16-hard
17 files changed +70
-5
lines changed Original file line number Diff line number Diff line change @@ -6,14 +6,14 @@ https://github.com/ament/ament_package.git de0e60e3b7370df1e2365f125046c5676daae
6
6
https://github.com/ament/googletest.git 79c4c9db1a7bc8bc5473a280499bf776173653d6
7
7
https://github.com/ament/uncrustify_vendor.git 8945c291fbd36d7980f7e4fd641601c277c178ec
8
8
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
10
10
https://github.com/micro-ROS/micro_ros_msgs.git e3664463e78ae5d0c34d86be92d707b3d9dfd27d
11
11
https://github.com/micro-ROS/micro_ros_utilities b9086c73c5f58a3bb36826ef6ec886b0441b75d9
12
12
https://github.com/micro-ROS/rcl 563fba39606ed1531a8cff747b5fd5d02fb73380
13
13
https://github.com/micro-ROS/rcutils ca15a22511f839c561666bc844139c457c26fb98
14
- https://github.com/micro-ROS/rmw-microxrcedds.git 09e77fd1e48ba1b5eb7a7f5d981a02fee9f4b981
14
+ https://github.com/micro-ROS/rmw-microxrcedds.git 7af00239277dde271d148d726be6bcdf5a1c87ec
15
15
https://github.com/micro-ROS/rosidl_typesupport.git 5ce7fdbe412ead8c34906937deb0d72836c1ab2e
16
- https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git ee17756b33b1cf2edaed257d88395e4f25d147b9
16
+ https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git 9e1e51ac0d2e128db265354f0ba56e33ef89f081
17
17
https://github.com/ros-controls/control_msgs a555c37f1a3536bb452ea555c58fdd9344d87614
18
18
https://github.com/ros2/ament_cmake_ros.git 7b6b599c3fc8023806db2a97b344e8610902adac
19
19
https://github.com/ros2/common_interfaces.git 969a56b0b59f7f70b5c4561185ea34aaa2b74e1d
Original file line number Diff line number Diff line change 67
67
68
68
#define UCLIENT_TWEAK_XRCE_WRITE_LIMIT
69
69
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
70
83
71
84
#endif // _UXR_CLIENT_CONFIG_H_
Original file line number Diff line number Diff line change @@ -24,6 +24,7 @@ extern "C"
24
24
#endif // ifdef __cplusplus
25
25
26
26
#include <uxr/client/defines.h>
27
+ #include <uxr/client/config.h>
27
28
28
29
#include <ucdr/microcdr.h>
29
30
#include <stdint.h>
@@ -40,7 +41,24 @@ extern "C"
40
41
#define UXR_SAMPLE_DELTA_SEQUENCE_MAX 8
41
42
#define UXR_PACKED_SAMPLES_SEQUENCE_MAX 8
42
43
#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
43
58
#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
44
62
45
63
typedef struct Time_t
46
64
{
Original file line number Diff line number Diff line change
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_
Original file line number Diff line number Diff line change 33
33
#endif //UCLIENT_PROFILE_UDP
34
34
35
35
#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 )
37
39
#include <uxr/client/profile/transport/ip/tcp/tcp_transport_posix.h>
38
40
#elif defined(UCLIENT_PLATFORM_WINDOWS )
39
41
#include <uxr/client/profile/transport/ip/tcp/tcp_transport_windows.h>
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ extern "C"
33
33
#define UXR_PING_BUF 16 // 4 (HEADER SIZE) + 4 (SUBHEADER_SIZE) + 8 (GET_Info payload)
34
34
35
35
#define GET_INFO_MSG_SIZE 8
36
- #define GET_INFO_REQUEST_ID 9
36
+ #define GET_INFO_REQUEST_PING_ID 10
37
37
38
38
struct uxrSession ;
39
39
You can’t perform that action at this time.
0 commit comments