Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ jobs:

- name: Download dependencies
run: |
apt update && apt install -y python3-pip git python3-rosdep python3-colcon-common-extensions curl ros-$ROS_DISTRO-performance-test-fixture
apt update && apt install -y python3-pip git python3-rosdep python3-colcon-common-extensions curl ros-$ROS_DISTRO-performance-test-fixture gcovr
git clone -b ros2 https://github.com/eProsima/Micro-CDR src/Micro-CDR
git clone -b ros2 https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds
git clone -b rolling https://github.com/ros2/rmw src/rmw
touch src/rosidl_typesupport_microxrcedds/test/COLCON_IGNORE

# Install coverage tools
pip3 install gcovr
. /opt/ros/$ROS_DISTRO/setup.sh
rosdep init && rosdep update
rosdep install --from-paths src -r
Expand All @@ -46,14 +45,14 @@ jobs:
colcon test --event-handlers console_direct+ --packages-select=rmw_microxrcedds --return-code-on-test-failure
./build/rmw_microxrcedds/test/test-sizes 2> memanalisys_out

- name: Static memory
continue-on-error: true
if: github.event_name == 'pull_request'
uses: machine-learning-apps/pr-comment@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
path: memanalisys_out
# - name: Static memory
# continue-on-error: true
# if: github.event_name == 'pull_request'
# uses: machine-learning-apps/pr-comment@master
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# path: memanalisys_out

- name: Coverage
run: |
Expand Down
2 changes: 1 addition & 1 deletion rmw_microxrcedds_c/include/rmw_microros/rmw_microros.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ extern "C"
#elif defined(RMW_UXRCE_TRANSPORT_IPV6)
#define MAX_IP_LEN 39
#endif // ifdef RMW_UXRCE_TRANSPORT_IPV4
#define MAX_PORT_LEN 5
#define MAX_PORT_LEN 6 // uint16_t max size + NULL-end string
#define MAX_SERIAL_DEVICE 50

typedef struct rmw_uxrce_transport_params_t
Expand Down
3 changes: 2 additions & 1 deletion rmw_microxrcedds_c/src/rmw_graph.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ rmw_ret_t rmw_graph_init(
graph_info->datareader_id = uxr_object_id(context->id_datareader++, UXR_DATAREADER_ID);
const char * graph_topic_name = "ros_to_microros_graph";
graph_info->graph_type_support =
rosidl_typesupport_microxrcedds_c__get_message_type_support_handle__micro_ros_msgs__msg__Graph(); //NOLINT
// NOLINTNEXTLINE
rosidl_typesupport_microxrcedds_c__get_message_type_support_handle__micro_ros_msgs__msg__Graph();

// Create graph topic request
graph_info->topic_id = uxr_object_id(context->id_topic++, UXR_TOPIC_ID);
Expand Down
2 changes: 1 addition & 1 deletion rmw_microxrcedds_c/src/rmw_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ rmw_init_options_init(
return RMW_RET_INVALID_ARGUMENT;
}

if (strlen(RMW_UXRCE_DEFAULT_PORT) <= MAX_PORT_LEN) {
if (strlen(RMW_UXRCE_DEFAULT_PORT) < MAX_PORT_LEN) {
snprintf(
init_options->impl->transport_params.agent_port,
MAX_PORT_LEN, "%s", RMW_UXRCE_DEFAULT_PORT);
Expand Down
2 changes: 1 addition & 1 deletion rmw_microxrcedds_c/src/rmw_microros/init_options.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ rmw_ret_t rmw_uros_options_set_udp_address(
return RMW_RET_INVALID_ARGUMENT;
}

if (port != NULL && strlen(port) <= MAX_PORT_LEN) {
if (port != NULL && strlen(port) < MAX_PORT_LEN) {
snprintf(rmw_options->impl->transport_params.agent_port, MAX_PORT_LEN, "%s", port);
} else {
RMW_UROS_TRACE_MESSAGE("default port configuration error")
Expand Down