Skip to content

Commit 64b79b5

Browse files
micro-ROS foxy Library auto-update 11-03-2021 06:21 (#172)
Co-authored-by: pablogs9 <[email protected]>
1 parent fa5f82d commit 64b79b5

File tree

3 files changed

+43
-32
lines changed

3 files changed

+43
-32
lines changed

built_packages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ https://github.com/eProsima/Micro-CDR.git 2f1a688a9f7ca8379e64a8941bf5ce27bd7b1f
55
https://github.com/micro-ROS/micro_ros_msgs.git 9a3968d4694f516ded8bdbfe23e2a487477bb8b4
66
https://github.com/micro-ROS/rcl 8eddc13db38bdecdd3089b8c96d13f0df3f5b35d
77
https://github.com/micro-ROS/rcutils 6f0e5d7d3da4ab1c1744dfa8452fdd5e01e912d9
8-
https://github.com/micro-ROS/rmw-microxrcedds.git 8a4b7f60daa9312a6dc970bfa71150de19fe1035
8+
https://github.com/micro-ROS/rmw-microxrcedds.git 54f80b263befad9421b94c999e4fcfad7ae14ac0
99
https://github.com/micro-ROS/rosidl_typesupport.git 9c0b5fde7d7e148685bb9e1692dcc8600cdeb96a
1010
https://github.com/ros2/rclc 4a181dcc80e74a5a7fb3f52f4806e18607522523
1111
https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git f917106cd82ad17853e48ea2641b50563cd473dd

src/rmw_microxrcedds_c/rmw_c_macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#define RMW_CHECK_TYPE_IDENTIFIERS_MATCH(ElementName, ElementTypeID, ExpectedTypeID, OnFailure) \
1919
{ \
20-
if (strcmp(ElementTypeID, ExpectedTypeID) != 0) { \
20+
if (strcmp(ElementTypeID, ExpectedTypeID) != 0){ \
2121
RMW_SET_ERROR_MSG("Implementation identifiers does not match"); \
2222
OnFailure; \
2323
} \

src/rmw_uros/options.h

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,32 @@
2929
#if defined(__cplusplus)
3030
extern "C"
3131
{
32-
#endif
32+
#endif // if defined(__cplusplus)
3333

3434
#ifdef RMW_UXRCE_TRANSPORT_IPV4
3535
#define MAX_IP_LEN 16
3636
#elif defined(RMW_UXRCE_TRANSPORT_IPV6)
3737
#define MAX_IP_LEN 39
38-
#endif
38+
#endif // ifdef RMW_UXRCE_TRANSPORT_IPV4
3939
#define MAX_PORT_LEN 5
4040
#define MAX_SERIAL_DEVICE 50
4141

4242
typedef struct rmw_uxrce_transport_params_t
4343
{
4444
#if defined(RMW_UXRCE_TRANSPORT_SERIAL)
45-
char serial_device[MAX_SERIAL_DEVICE];
45+
char serial_device[MAX_SERIAL_DEVICE];
4646
#elif defined(RMW_UXRCE_TRANSPORT_UDP)
47-
char agent_address[MAX_IP_LEN];
48-
char agent_port[MAX_PORT_LEN];
47+
char agent_address[MAX_IP_LEN];
48+
char agent_port[MAX_PORT_LEN];
4949
#elif defined(RMW_UXRCE_TRANSPORT_CUSTOM)
50-
bool framing;
50+
bool framing;
5151
void* args;
52-
open_custom_func open_cb;
52+
open_custom_func open_cb;
5353
close_custom_func close_cb;
5454
write_custom_func write_cb;
55-
read_custom_func read_cb;
56-
#endif
57-
uint32_t client_key;
55+
read_custom_func read_cb;
56+
#endif // if defined(RMW_UXRCE_TRANSPORT_SERIAL)
57+
uint32_t client_key;
5858
} rmw_uxrce_transport_params_t;
5959

6060
/**
@@ -68,8 +68,9 @@ typedef struct rmw_uxrce_transport_params_t
6868
* \return RMW_RET_INVALID_ARGUMENT If rmw_init_options is not valid or unexpected arguments.
6969
*/
7070
rmw_ret_t rmw_uros_init_options(
71-
int argc, const char* const argv[],
72-
rmw_init_options_t* rmw_options);
71+
int argc,
72+
const char* const argv[],
73+
rmw_init_options_t* rmw_options);
7374

7475
/**
7576
* \brief Fills rmw implementation-specific options with the given parameters.
@@ -79,7 +80,9 @@ rmw_ret_t rmw_uros_init_options(
7980
* \return RMW_RET_OK If arguments were valid and set in rmw_init_options.
8081
* \return RMW_RET_INVALID_ARGUMENT If rmw_init_options is not valid or unexpected arguments.
8182
*/
82-
rmw_ret_t rmw_uros_options_set_serial_device(const char* dev, rmw_init_options_t* rmw_options);
83+
rmw_ret_t rmw_uros_options_set_serial_device(
84+
const char* dev,
85+
rmw_init_options_t* rmw_options);
8386

8487
/**
8588
* \brief Fills rmw implementation-specific options with the given parameters.
@@ -91,8 +94,9 @@ rmw_ret_t rmw_uros_options_set_serial_device(const char* dev, rmw_init_options_t
9194
* \return RMW_RET_INVALID_ARGUMENT If rmw_init_options is not valid or unexpected arguments.
9295
*/
9396
rmw_ret_t rmw_uros_options_set_udp_address(
94-
const char* ip, const char* port,
95-
rmw_init_options_t* rmw_options);
97+
const char* ip,
98+
const char* port,
99+
rmw_init_options_t* rmw_options);
96100

97101
/**
98102
* \brief Fills rmw implementation-specific options with the autodicovered address of an micro-ROS Agent.
@@ -102,7 +106,8 @@ rmw_ret_t rmw_uros_options_set_udp_address(
102106
* \return RMW_RET_TIMEOUT If micro-ROS agent autodiscovery is timeout.
103107
* \return RMW_RET_INVALID_ARGUMENT If rmw_init_options is not valid or unexpected arguments.
104108
*/
105-
rmw_ret_t rmw_uros_discover_agent(rmw_init_options_t* rmw_options);
109+
rmw_ret_t rmw_uros_discover_agent(
110+
rmw_init_options_t* rmw_options);
106111

107112
/**
108113
* \brief Fills rmw implementation-specific options with the given parameters.
@@ -112,7 +117,9 @@ rmw_ret_t rmw_uros_discover_agent(rmw_init_options_t* rmw_options);
112117
* \return RMW_RET_OK If arguments were valid and set in rmw_init_options.
113118
* \return RMW_RET_INVALID_ARGUMENT If rmw_init_options is not valid or unexpected arguments.
114119
*/
115-
rmw_ret_t rmw_uros_options_set_client_key(uint32_t client_key, rmw_init_options_t* rmw_options);
120+
rmw_ret_t rmw_uros_options_set_client_key(
121+
uint32_t client_key,
122+
rmw_init_options_t* rmw_options);
116123

117124
/**
118125
* \brief Check if micro-ROS Agent is up and running.
@@ -123,7 +130,9 @@ rmw_ret_t rmw_uros_options_set_client_key(uint32_t client_key, rmw_init_options_
123130
* \return RMW_RET_OK If micro-ROS Agent is available.
124131
* \return RMW_RET_ERROR If micro-ROS Agent is not available.
125132
*/
126-
rmw_ret_t rmw_uros_ping_agent(const int timeout_ms, const uint8_t attempts);
133+
rmw_ret_t rmw_uros_ping_agent(
134+
const int timeout_ms,
135+
const uint8_t attempts);
127136

128137
/**
129138
* \brief Sets the callback functions for continous serialization for a publisher
@@ -133,13 +142,15 @@ rmw_ret_t rmw_uros_ping_agent(const int timeout_ms, const uint8_t attempts);
133142
* \param[in] serialization_cb callback that should serialize the user part of the message
134143
*/
135144

136-
typedef void (* rmw_uros_continous_serialization_size)(uint32_t* topic_length);
137-
typedef void (* rmw_uros_continous_serialization)(ucdrBuffer* ucdr);
145+
typedef void (* rmw_uros_continous_serialization_size)(
146+
uint32_t* topic_length);
147+
typedef void (* rmw_uros_continous_serialization)(
148+
ucdrBuffer* ucdr);
138149

139150
void rmw_uros_set_continous_serialization_callbacks(
140-
rmw_publisher_t* publisher,
141-
rmw_uros_continous_serialization_size size_cb,
142-
rmw_uros_continous_serialization serialization_cb);
151+
rmw_publisher_t* publisher,
152+
rmw_uros_continous_serialization_size size_cb,
153+
rmw_uros_continous_serialization serialization_cb);
143154

144155
#ifdef RMW_UXRCE_TRANSPORT_CUSTOM
145156
extern rmw_uxrce_transport_params_t rmw_uxrce_transport_default_params;
@@ -157,17 +168,17 @@ extern rmw_uxrce_transport_params_t rmw_uxrce_transport_default_params;
157168
* \return RMW_RET_ERROR If invalid.
158169
*/
159170
rmw_ret_t rmw_uros_set_custom_transport(
160-
bool framing,
161-
void* args,
162-
open_custom_func open_cb,
163-
close_custom_func close_cb,
164-
write_custom_func write_cb,
165-
read_custom_func read_cb);
171+
bool framing,
172+
void* args,
173+
open_custom_func open_cb,
174+
close_custom_func close_cb,
175+
write_custom_func write_cb,
176+
read_custom_func read_cb);
166177

167178
#endif //RMW_UXRCE_TRANSPORT_CUSTOM
168179

169180
#if defined(__cplusplus)
170181
}
171-
#endif
182+
#endif // if defined(__cplusplus)
172183

173184
#endif // RMW_UROS__OPTIONS_H_

0 commit comments

Comments
 (0)