Support Fast DDS 3.0 and Fast DDS Gen 4.0 (#52)

* Refs #21536: sustainml_cpp: Update .repos and ci .metas Signed-off-by: Mario Dominguez <[email protected]> * Refs #21536: sustainml_cpp: Update project dependencies Signed-off-by: Mario Dominguez <[email protected]> * Refs #21536: sustainml_cpp: Regenerate types with Fast DDS Gen v4 Signed-off-by: Mario Dominguez <[email protected]> * Refs #21536: sustainml_cpp: Update include/ directory to Fast DDS 3.0 Signed-off-by: Mario Dominguez <[email protected]> * Refs #21536: sustainml_cpp: Update src/ directory to Fast DDS 3.0 Signed-off-by: Mario Dominguez <[email protected]> * Refs #21536: sustainml_cpp: Update climodules example Signed-off-by: Mario Dominguez <[email protected]> * Refs #21536: sustainml_cpp: Update bb test/ directory to Fast DDS 3.0 Signed-off-by: Mario Dominguez <[email protected]> * Refs #21536: sustainml_modules: Update communication test/ directory to Fast DDS 3.0 Signed-off-by: Mario Dominguez <[email protected]> * Refs #21536: Linter Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]>
eProsima · Sep 11, 2024 · d52ba11 · d52ba11
1 parent 3e93b40
commit d52ba11
Show file tree

Hide file tree

Showing 67 changed files with 21,740 additions and 30,611 deletions.
diff --git a/.github/workflows/configurations/Linux/colcon.meta b/.github/workflows/configurations/Linux/colcon.meta
@@ -1,7 +1,7 @@
 {
     "names":
     {
-        "fastrtps":
+        "fastdds":
         {
             "cmake-args":
             [

diff --git a/.github/workflows/configurations/Windows/colcon.meta b/.github/workflows/configurations/Windows/colcon.meta
@@ -25,7 +25,7 @@
             ]
         },
 
-        "fastrtps":
+        "fastdds":
         {
             "cmake-args":
             [

diff --git a/sustainml.repos b/sustainml.repos
@@ -10,11 +10,11 @@ repositories:
     fastdds:
         type: git
         url: https://github.com/eProsima/Fast-DDS.git
-        version: 2.14.x
+        version: 3.x
     dev-utils:
         type: git
         url: https://github.com/eProsima/dev-utils.git
-        version: 0.x
+        version: 1.x
     sustainml_lib:
         type: git
         url: https://github.com/eProsima/SustainML-Library.git

diff --git a/sustainml_cpp/examples/CliModules/main.cpp b/sustainml_cpp/examples/CliModules/main.cpp
@@ -37,15 +37,15 @@
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/dds/common/InstanceHandle.hpp>
-#include <fastrtps/types/TypesBase.h>
+
 #include <sustainml_cpp/nodes/AppRequirementsNode.hpp>
 #include <sustainml_cpp/nodes/CarbonFootprintNode.hpp>
 #include <sustainml_cpp/nodes/HardwareConstraintsNode.hpp>
 #include <sustainml_cpp/nodes/HardwareResourcesNode.hpp>
 #include <sustainml_cpp/nodes/MLModelMetadataNode.hpp>
 #include <sustainml_cpp/nodes/MLModelNode.hpp>
 
-#include "typesImplPubSubTypes.h"
+#include "typesImplPubSubTypes.hpp"
 
 bool DEBUG_MODE  = false;
 
@@ -104,11 +104,11 @@ class ReaderListener : public fdds::DataReaderListener
         while (1)
         {
             auto ret = reader->take_next_sample(&co2_f, &info);
-            if (ret == ReturnCode_t::RETCODE_NO_DATA)
+            if (ret == eprosima::fastdds::dds::RETCODE_NO_DATA)
             {
                 break;
             }
-            else if (ret != ReturnCode_t::RETCODE_OK)
+            else if (ret != eprosima::fastdds::dds::RETCODE_OK)
             {
                 std::cerr << "take_next_sample() failed!" << std::endl;
                 break;