Update merged branch. (micro-ROS#41)

* Update merged branch. * Change typesupport branch to dashing. * Change Micro-CDR and Micro XRCE-DDS Client to use develop branch. * Update repos to Dashing (micro-ROS#44) * Update client.repos. * Update agent.repos and agent.metas. * Update Agent compilation instructions. Co-authored-by: Julián Bermúdez Ortega <[email protected]>
fofolevrai · Jan 29, 2020 · 55e03dd · 55e03dd
1 parent 027c6df
commit 55e03dd
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 26 deletions.
diff --git a/micro_ros_setup/README.md b/micro_ros_setup/README.md
@@ -96,7 +96,7 @@ Using this package is possible to install a ready to use **micro-ROS Agent**:
 
 ```
 ros2 run micro_ros_setup create_agent_ws.sh
-colcon build
+colcon build --meta src
 source install/local_setup.sh
 ros2 run micro_ros_agent micro_ros_agent [parameters]
 ```

diff --git a/micro_ros_setup/config/agent-colcon.meta b/micro_ros_setup/config/agent-colcon.meta
@@ -1,4 +1,14 @@
-{ "names": {
-  "*": { "cmake-args": [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ], },
-  }
+{
+    "names":{
+        "*":{
+            "cmake-args":[ 
+                "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+            ] 
+        },
+        "microxrcedds_agent":{
+            "cmake-args":[
+                "-DUAGENT_ISOLATED_INSTALL=OFF"
+            ] 
+        }
+    }
 }
diff --git a/micro_ros_setup/config/agent_uros_packages.repos b/micro_ros_setup/config/agent_uros_packages.repos
@@ -4,11 +4,11 @@ repositories:
   uros/uROS_agent:
     type: git
     url: https://github.com/microROS/micro-ROS-Agent.git
-    version: feature/dashing_migration
+    version: dashing
   eProsima/Micro-XRCE-DDS-Agent:
     type: git
     url: https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
-    version: v1.1.6
+    version: 75febfeb7c89d7767ea98d38aa7cfcfda52dd9a7
   drive_base:
     type: git
     url: https://github.com/micro-ROS/drive_base.git

diff --git a/micro_ros_setup/config/freertos/crazyflie21/client_uros_packages.repos b/micro_ros_setup/config/freertos/crazyflie21/client_uros_packages.repos
@@ -1,12 +1,12 @@
 repositories:
   eProsima/Micro-CDR:
     type: git
-    url: https://github.com/eProsima/micro-CDR.git
-    version: v1.1.2
+    url: https://github.com/eProsima/Micro-CDR.git
+    version: b7ff127e7432d6a0b7e333ef27bdf7081ed67fb3
   eProsima/Micro-XRCE-DDS-Client:
     type: git
     url: https://github.com/eProsima/Micro-XRCE-DDS-Client.git
-    version: develop
+    version: 5d16a887ce5f949980aa488b588e54377d798cd2
 
 # MicroROS
 
@@ -17,15 +17,15 @@ repositories:
   uros/rcutils:
     type: git
     url: https://github.com/micro-ROS/rcutils
-    version: feature/avoid_filesystem_and_allocation
+    version: dashing
   uros/rmw_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rmw-microxrcedds.git
-    version: feature/dashing_migration
+    version: dashing
   uros/rosidl_typesupport_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
-    version: feature/dashing_migration
+    version: dashing
   uros/rosidl_typesupport:
     type: git
     url: https://github.com/micro-ROS/rosidl_typesupport.git

diff --git a/micro_ros_setup/config/host/generic/client-host-colcon.meta b/micro_ros_setup/config/host/generic/client-host-colcon.meta
@@ -1,5 +1,5 @@
 { "names": {
   "rcutils": { "cmake-args": [ "-DENABLE_TESTING=ON" ], },
-  "microxrcedds_client": { "cmake-args": [ "-DUCLIENT_ISOLATED_INSTALL=OFF" ] }
+  "microxrcedds_client": { "cmake-args": [ "-DUCLIENT_ISOLATED_INSTALL=OFF", "-DUCLIENT_SUPERBUILD=OFF" ] }
   }
 }
diff --git a/micro_ros_setup/config/host/generic/client_host_packages.repos b/micro_ros_setup/config/host/generic/client_host_packages.repos
@@ -1,28 +1,28 @@
 repositories:
   eProsima/Micro-CDR:
     type: git
-    url: https://github.com/eProsima/micro-CDR.git
-    version: v1.1.2
+    url: https://github.com/eProsima/Micro-CDR.git
+    version: b7ff127e7432d6a0b7e333ef27bdf7081ed67fb3
   eProsima/Micro-XRCE-DDS-Client:
     type: git
     url: https://github.com/eProsima/Micro-XRCE-DDS-Client.git
-    version: develop
+    version: 5d16a887ce5f949980aa488b588e54377d798cd2
 
 # MicroROS
 
   uros/rclc:
     type: git
     url: https://github.com/micro-ROS/rclc.git
-    version: feature/dashing_migration 
+    version: dashing
   uros/rmw_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rmw-microxrcedds.git
-    version: feature/dashing_migration
+    version: dashing
   uros/rosidl_typesupport_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
-    version: feature/dashing_migration
+    version: dashing
   uros/micro-ROS-demos:
     type: git
     url: https://github.com/micro-ROS/micro-ROS-demos.git
-    version: feature/dashing_migration 
+    version: dashing
diff --git a/micro_ros_setup/config/nuttx/generic/client_uros_packages.repos b/micro_ros_setup/config/nuttx/generic/client_uros_packages.repos
@@ -1,27 +1,27 @@
 repositories:
   eProsima/Micro-CDR:
     type: git
-    url: https://github.com/eProsima/micro-CDR.git
-    version: v1.1.2
+    url: https://github.com/eProsima/Micro-CDR.git
+    version: b7ff127e7432d6a0b7e333ef27bdf7081ed67fb3
   eProsima/Micro-XRCE-DDS-Client:
     type: git
     url: https://github.com/eProsima/Micro-XRCE-DDS-Client.git
-    version: develop
+    version: 5d16a887ce5f949980aa488b588e54377d798cd2
 
 # MicroROS
 
   uros/rclc:
     type: git
     url: https://github.com/micro-ROS/rclc.git
-    version: feature/dashing_migration
+    version: dashing
   uros/rmw_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rmw-microxrcedds.git
-    version: feature/dashing_migration
+    version: dashing
   uros/rosidl_typesupport_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
-    version: feature/dashing_migration
+    version: dashing
   uros/rcutils:
     type: git
     url: https://github.com/micro-ROS/rcutils.git