Skip to content

Commit 0fadb7b

Browse files
micro-ROS foxy Library auto-update 14-09-2021 06:17 (#477)
Co-authored-by: pablogs9 <[email protected]>
1 parent 6dd58e4 commit 0fadb7b

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

built_packages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ https://github.com/micro-ROS/rosidl_typesupport.git 5d974dbee4cd6988ce33923246eb
2424
https://github.com/micro-ROS/micro_ros_msgs.git e3664463e78ae5d0c34d86be92d707b3d9dfd27d
2525
https://github.com/ros2/rclc 0f37874c44cf529d11f6c8f37a37693dd0ec8a1a
2626
https://github.com/micro-ROS/rcutils 4213addd56ca84bd37f1d418efb2becc1f2096db
27-
https://github.com/micro-ROS/rmw-microxrcedds.git a1b6a3a67b06a0278d29691a23482d3053466b5a
27+
https://github.com/micro-ROS/rmw-microxrcedds.git 9b577d885cdb48344f9cae1c078a231c06026227
2828
https://github.com/ros2/ament_cmake_ros.git 7b6b599c3fc8023806db2a97b344e8610902adac
2929
https://github.com/ament/ament_package.git 3397bb0ae1cc93d93e1e27da31c0bcb0f4fe0f46
3030
https://github.com/ament/ament_lint.git 418a69c7e0f922adc889ac1bc2a7dcf721bf7060

src/rmw_microros/rmw_microros.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <rmw_microros/time_sync.h>
2727
#include <rmw_microros/ping.h>
2828

29-
#ifdef RMW_UXRCE_TRANSPORT_UDP
29+
#if defined(RMW_UXRCE_TRANSPORT_UDP) || defined(RMW_UXRCE_TRANSPORT_TCP)
3030
#include <rmw_microros/discovery.h>
3131
#endif // RMW_UXRCE_TRANSPORT_UDP
3232

@@ -51,7 +51,7 @@ typedef struct rmw_uxrce_transport_params_t
5151
{
5252
#if defined(RMW_UXRCE_TRANSPORT_SERIAL)
5353
char serial_device[MAX_SERIAL_DEVICE];
54-
#elif defined(RMW_UXRCE_TRANSPORT_UDP)
54+
#elif defined(RMW_UXRCE_TRANSPORT_UDP) || defined(RMW_UXRCE_TRANSPORT_TCP)
5555
char agent_address[MAX_IP_LEN];
5656
char agent_port[MAX_PORT_LEN];
5757
#elif defined(RMW_UXRCE_TRANSPORT_CUSTOM)

src/rmw_microxrcedds_c/config.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <uxr/client/config.h>
55

66
/* #undef RMW_UXRCE_TRANSPORT_UDP */
7+
/* #undef RMW_UXRCE_TRANSPORT_TCP */
78
/* #undef RMW_UXRCE_TRANSPORT_SERIAL */
89
#define RMW_UXRCE_TRANSPORT_CUSTOM
910
/* #undef RMW_UXRCE_TRANSPORT_IPV4 */
@@ -14,8 +15,12 @@
1415

1516
#ifdef RMW_UXRCE_TRANSPORT_UDP
1617
#define RMW_UXRCE_MAX_TRANSPORT_MTU UXR_CONFIG_UDP_TRANSPORT_MTU
17-
#define RMW_UXRCE_DEFAULT_UDP_IP ""
18-
#define RMW_UXRCE_DEFAULT_UDP_PORT ""
18+
#define RMW_UXRCE_DEFAULT_IP ""
19+
#define RMW_UXRCE_DEFAULT_PORT ""
20+
#elif defined(RMW_UXRCE_TRANSPORT_TCP)
21+
#define RMW_UXRCE_MAX_TRANSPORT_MTU UXR_CONFIG_TCP_TRANSPORT_MTU
22+
#define RMW_UXRCE_DEFAULT_IP ""
23+
#define RMW_UXRCE_DEFAULT_PORT ""
1924
#elif defined(RMW_UXRCE_TRANSPORT_SERIAL)
2025
#define RMW_UXRCE_MAX_TRANSPORT_MTU UXR_CONFIG_SERIAL_TRANSPORT_MTU
2126
#define RMW_UXRCE_DEFAULT_SERIAL_DEVICE ""

0 commit comments

Comments
 (0)