From 8dfd8dc031b1aaf10a088e541ef932f54c9678a5 Mon Sep 17 00:00:00 2001 From: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com> Date: Thu, 16 Feb 2023 09:52:30 +0100 Subject: [PATCH 1/7] Add CMAKE configuration for C standard version (#340) * Add C standard configuration Signed-off-by: acuadros95 * Update C define Signed-off-by: acuadros95 * Remove CMAKE conditional Signed-off-by: acuadros95 --------- Signed-off-by: acuadros95 --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9336a8a..5cbb9c04 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,6 +76,8 @@ set(UCLIENT_HARD_LIVELINESS_CHECK_TIMEOUT 10000 CACHE STRING "Set the hard livel # Off-standard features and tweaks option(UCLIENT_TWEAK_XRCE_WRITE_LIMIT "This feature uses a tweak to allow XRCE WRITE DATA submessages grater than 64 kB." ON) +set(UCLIENT_C_STANDARD 99 CACHE STRING "Version of the C language used to build the library") + ############################################################################### # Dependencies ############################################################################### @@ -319,7 +321,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} C_STANDARD - 99 + ${UCLIENT_C_STANDARD} C_STANDARD_REQUIRED YES POSITION_INDEPENDENT_CODE From 85d83a925072f4fb377a41828af741bf3de54b67 Mon Sep 17 00:00:00 2001 From: Rhys Mainwaring Date: Thu, 2 Mar 2023 11:34:32 +0000 Subject: [PATCH 2/7] Fix build for macOS (#346) * Add Twitter and Readthedocs shields (#307) (#308) * Add Twitter and Readthedocs shields Signed-off-by: Pablo Garrido * Update Signed-off-by: Pablo Garrido * Fix Signed-off-by: Pablo Garrido (cherry picked from commit 8b78d229f9cfc98fc86fc25db6ce608dbab78ec5) Co-authored-by: Pablo Garrido * Fix build for macOS - Add check for CMAKE_SYSTEM_NAME "Darwin". Signed-off-by: Rhys Mainwaring --------- Signed-off-by: Rhys Mainwaring Co-authored-by: Pablo Garrido Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cbb9c04..5a8f9ef5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,6 +146,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android") set(UCLIENT_PLATFORM_LINUX ON) elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") set(UCLIENT_PLATFORM_WINDOWS ON) +elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(UCLIENT_PLATFORM_MACOS ON) elseif(CMAKE_SYSTEM_NAME STREQUAL "Generic") if(PLATFORM_NAME STREQUAL "nuttx") set(UCLIENT_PLATFORM_NUTTX ON) @@ -160,7 +162,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Generic") endif() endif() -if(UCLIENT_PLATFORM_LINUX OR UCLIENT_PLATFORM_NUTTX OR UCLIENT_PLATFORM_ZEPHYR) +if(UCLIENT_PLATFORM_LINUX OR UCLIENT_PLATFORM_MACOS OR UCLIENT_PLATFORM_NUTTX OR UCLIENT_PLATFORM_ZEPHYR) set(UCLIENT_PLATFORM_POSIX ON) endif() From bc6e9c361a87f71272cb2033a899a09f0c49f638 Mon Sep 17 00:00:00 2001 From: Rhys Mainwaring Date: Fri, 3 Mar 2023 10:51:05 +0000 Subject: [PATCH 3/7] Fix newline-eof compiler warning (#347) Add EOF newline to session.c. Signed-off-by: Rhys Mainwaring --- src/c/core/session/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/c/core/session/session.c b/src/c/core/session/session.c index d0a37ef0..45900b1a 100644 --- a/src/c/core/session/session.c +++ b/src/c/core/session/session.c @@ -1269,4 +1269,4 @@ bool run_session_until_sync( } while (remaining_time > 0 && !session->synchronized); return session->synchronized; -} \ No newline at end of file +} From fe83fd082e82ab1aeed75829e04c10207df74576 Mon Sep 17 00:00:00 2001 From: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com> Date: Mon, 6 Mar 2023 12:22:55 +0100 Subject: [PATCH 4/7] Fix doxygen warning (#352) * Remove outdated navindex tag Signed-off-by: acuadros95 * Revert unwanted removal Signed-off-by: acuadros95 --------- Signed-off-by: acuadros95 --- utils/doxygen/pages/DoxygenLayout.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/doxygen/pages/DoxygenLayout.xml b/utils/doxygen/pages/DoxygenLayout.xml index 247ac176..0400b448 100644 --- a/utils/doxygen/pages/DoxygenLayout.xml +++ b/utils/doxygen/pages/DoxygenLayout.xml @@ -18,8 +18,7 @@ - - + From c28bf96f6e93ad1e01b8f0d74ea255e6bd8b07d2 Mon Sep 17 00:00:00 2001 From: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com> Date: Tue, 7 Mar 2023 14:20:18 +0100 Subject: [PATCH 5/7] Add missing doxygen parameter (#353) Signed-off-by: acuadros95 --- include/uxr/client/core/session/session.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/uxr/client/core/session/session.h b/include/uxr/client/core/session/session.h index e93fee69..d319fcc4 100644 --- a/include/uxr/client/core/session/session.h +++ b/include/uxr/client/core/session/session.h @@ -122,7 +122,7 @@ typedef void (* uxrOnRequestFunc) ( * @param reply_id Identifier of the reply. * @param ub Serialized request data. * @param length Length of the serialized data. - * @param args User pointer data. + * @param args User pointer data. */ typedef void (* uxrOnReplyFunc) ( struct uxrSession* session, @@ -136,6 +136,7 @@ typedef void (* uxrOnReplyFunc) ( /** * @brief Function signature used for flush_callback callbacks. * @param session Session structure related to the buffer to be flushed. + * @param args Flush callback args pointer. */ typedef bool (* uxrOnBuffersFull) ( struct uxrSession* session, From c230441fc97a8703e081699a227779ba44c7fb28 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 29 Mar 2023 10:43:20 +0200 Subject: [PATCH 6/7] Fix domain id argument in create_participant API (#348) --- include/uxr/client/core/session/create_entities_ref.h | 2 +- src/c/core/session/create_entities_ref.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/uxr/client/core/session/create_entities_ref.h b/include/uxr/client/core/session/create_entities_ref.h index 7b4afd35..4049e5d6 100644 --- a/include/uxr/client/core/session/create_entities_ref.h +++ b/include/uxr/client/core/session/create_entities_ref.h @@ -51,7 +51,7 @@ UXRDLLAPI uint16_t uxr_buffer_create_participant_ref( uxrSession* session, uxrStreamId stream_id, uxrObjectId object_id, - int16_t domain_id, + uint16_t domain_id, const char* ref, uint8_t mode); diff --git a/src/c/core/session/create_entities_ref.c b/src/c/core/session/create_entities_ref.c index f64cfeaf..ec131c93 100644 --- a/src/c/core/session/create_entities_ref.c +++ b/src/c/core/session/create_entities_ref.c @@ -20,7 +20,7 @@ uint16_t uxr_buffer_create_participant_ref( uxrSession* session, uxrStreamId stream_id, uxrObjectId object_id, - int16_t domain_id, + uint16_t domain_id, const char* ref, uint8_t mode) { @@ -28,7 +28,7 @@ uint16_t uxr_buffer_create_participant_ref( CREATE_Payload payload; payload.object_representation.kind = DDS_XRCE_OBJK_PARTICIPANT; - payload.object_representation._.participant.domain_id = domain_id; + payload.object_representation._.participant.domain_id = (int16_t)domain_id; return create_entity_ref(session, stream_id, object_id, ref, mode, &payload); } From 5cd43eb0ba97c7ec21949492344b8bf05e04572c Mon Sep 17 00:00:00 2001 From: acuadros95 Date: Wed, 29 Mar 2023 10:45:36 +0200 Subject: [PATCH 7/7] Bump version Signed-off-by: acuadros95 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a8f9ef5..3518e41f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ list(APPEND _deps "microcdr\;${_microcdr_version}") ############################################################################### set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) if(NOT UCLIENT_SUPERBUILD) - project(microxrcedds_client VERSION "2.3.0" LANGUAGES C) + project(microxrcedds_client VERSION "2.4.0" LANGUAGES C) else() project(uclient_superbuild NONE) include(${PROJECT_SOURCE_DIR}/cmake/SuperBuild.cmake)