From a842aaeb0858b5f43261f30d3c0b1f600b46fda6 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 6 Aug 2020 10:44:44 +0200 Subject: [PATCH 1/4] Set test branches To be reverted when merged --- config/freertos/crazyflie21/board.repos | 2 +- config/freertos/crazyflie21/client_uros_packages.repos | 2 +- config/freertos/esp32/board.repos | 2 +- config/freertos/esp32/client_uros_packages.repos | 2 +- config/freertos/nucleo_f446ze/board.repos | 2 +- config/freertos/nucleo_f446ze/client_uros_packages.repos | 2 +- config/freertos/olimex-stm32-e407/board.repos | 2 +- config/freertos/olimex-stm32-e407/client_uros_packages.repos | 2 +- config/nuttx/generic/client_uros_packages.repos | 2 +- config/zephyr/generic/board.repos | 2 +- config/zephyr/generic/client_uros_packages.repos | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/freertos/crazyflie21/board.repos b/config/freertos/crazyflie21/board.repos index 73e50308..372d2f47 100644 --- a/config/freertos/crazyflie21/board.repos +++ b/config/freertos/crazyflie21/board.repos @@ -7,5 +7,5 @@ repositories: freertos_apps: type: git url: https://github.com/micro-ROS/freertos_apps - version: foxy + version: feature/test_atomics diff --git a/config/freertos/crazyflie21/client_uros_packages.repos b/config/freertos/crazyflie21/client_uros_packages.repos index bf27a621..35c2049c 100644 --- a/config/freertos/crazyflie21/client_uros_packages.repos +++ b/config/freertos/crazyflie21/client_uros_packages.repos @@ -21,7 +21,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils - version: foxy + version: feature/fix_atomics_64bits uros/rmw_microxrcedds: type: git url: https://github.com/micro-ROS/rmw-microxrcedds.git diff --git a/config/freertos/esp32/board.repos b/config/freertos/esp32/board.repos index 5e4c4a03..ecd72e79 100644 --- a/config/freertos/esp32/board.repos +++ b/config/freertos/esp32/board.repos @@ -2,7 +2,7 @@ repositories: freertos_apps: type: git url: https://github.com/micro-ROS/freertos_apps - version: foxy + version: feature/test_atomics diff --git a/config/freertos/esp32/client_uros_packages.repos b/config/freertos/esp32/client_uros_packages.repos index d9a20d58..59b1034a 100644 --- a/config/freertos/esp32/client_uros_packages.repos +++ b/config/freertos/esp32/client_uros_packages.repos @@ -21,7 +21,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils - version: foxy + version: feature/fix_atomics_64bits uros/rmw_microxrcedds: type: git url: https://github.com/micro-ROS/rmw-microxrcedds.git diff --git a/config/freertos/nucleo_f446ze/board.repos b/config/freertos/nucleo_f446ze/board.repos index 236c369d..b13971c6 100644 --- a/config/freertos/nucleo_f446ze/board.repos +++ b/config/freertos/nucleo_f446ze/board.repos @@ -2,4 +2,4 @@ repositories: freertos_apps: type: git url: https://github.com/micro-ros/freertos_apps - version: foxy + version: feature/test_atomics diff --git a/config/freertos/nucleo_f446ze/client_uros_packages.repos b/config/freertos/nucleo_f446ze/client_uros_packages.repos index d9a20d58..59b1034a 100644 --- a/config/freertos/nucleo_f446ze/client_uros_packages.repos +++ b/config/freertos/nucleo_f446ze/client_uros_packages.repos @@ -21,7 +21,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils - version: foxy + version: feature/fix_atomics_64bits uros/rmw_microxrcedds: type: git url: https://github.com/micro-ROS/rmw-microxrcedds.git diff --git a/config/freertos/olimex-stm32-e407/board.repos b/config/freertos/olimex-stm32-e407/board.repos index 5e4c4a03..ecd72e79 100644 --- a/config/freertos/olimex-stm32-e407/board.repos +++ b/config/freertos/olimex-stm32-e407/board.repos @@ -2,7 +2,7 @@ repositories: freertos_apps: type: git url: https://github.com/micro-ROS/freertos_apps - version: foxy + version: feature/test_atomics diff --git a/config/freertos/olimex-stm32-e407/client_uros_packages.repos b/config/freertos/olimex-stm32-e407/client_uros_packages.repos index d9a20d58..59b1034a 100644 --- a/config/freertos/olimex-stm32-e407/client_uros_packages.repos +++ b/config/freertos/olimex-stm32-e407/client_uros_packages.repos @@ -21,7 +21,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils - version: foxy + version: feature/fix_atomics_64bits uros/rmw_microxrcedds: type: git url: https://github.com/micro-ROS/rmw-microxrcedds.git diff --git a/config/nuttx/generic/client_uros_packages.repos b/config/nuttx/generic/client_uros_packages.repos index 3e94bf98..da362269 100644 --- a/config/nuttx/generic/client_uros_packages.repos +++ b/config/nuttx/generic/client_uros_packages.repos @@ -25,7 +25,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils.git - version: foxy + version: feature/fix_atomics_64bits drive_base: type: git url: https://github.com/micro-ROS/drive_base.git diff --git a/config/zephyr/generic/board.repos b/config/zephyr/generic/board.repos index 2bbd678d..36fb1a13 100644 --- a/config/zephyr/generic/board.repos +++ b/config/zephyr/generic/board.repos @@ -2,4 +2,4 @@ repositories: zephyr_apps: type: git url: https://github.com/micro-ROS/zephyr_apps - version: foxy + version: feature/fix_atomic_64bits diff --git a/config/zephyr/generic/client_uros_packages.repos b/config/zephyr/generic/client_uros_packages.repos index 9759836d..c526bacb 100644 --- a/config/zephyr/generic/client_uros_packages.repos +++ b/config/zephyr/generic/client_uros_packages.repos @@ -25,7 +25,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils - version: foxy + version: feature/fix_atomics_64bits uros/rmw_microxrcedds: type: git url: https://github.com/micro-ROS/rmw-microxrcedds.git From c7df4a37c4d6cc1769a60d8c745a3d260d7d61d5 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 6 Aug 2020 10:47:07 +0200 Subject: [PATCH 2/4] Added meta flag --- config/freertos/crazyflie21/client-colcon.meta | 3 ++- config/freertos/nucleo_f446ze/client-colcon.meta | 3 ++- config/freertos/olimex-stm32-e407/client-colcon.meta | 3 ++- config/zephyr/generic/client-colcon.meta | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/freertos/crazyflie21/client-colcon.meta b/config/freertos/crazyflie21/client-colcon.meta index 7cc2e0ed..178cf2a3 100644 --- a/config/freertos/crazyflie21/client-colcon.meta +++ b/config/freertos/crazyflie21/client-colcon.meta @@ -5,7 +5,8 @@ "-DENABLE_TESTING=OFF", "-DRCUTILS_NO_FILESYSTEM=ON", "-DRCUTILS_NO_LOGGING=ON", - "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON" + "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON", + "-DRCUTILS_NO_64_ATOMIC=ON" ] }, "microxrcedds_client":{ diff --git a/config/freertos/nucleo_f446ze/client-colcon.meta b/config/freertos/nucleo_f446ze/client-colcon.meta index f38fb07c..10715a73 100644 --- a/config/freertos/nucleo_f446ze/client-colcon.meta +++ b/config/freertos/nucleo_f446ze/client-colcon.meta @@ -10,7 +10,8 @@ "cmake-args": [ "-DENABLE_TESTING=OFF", "-DRCUTILS_NO_FILESYSTEM=ON", - "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON" + "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON", + "-DRCUTILS_NO_64_ATOMIC=ON" ] }, "microxrcedds_client": { diff --git a/config/freertos/olimex-stm32-e407/client-colcon.meta b/config/freertos/olimex-stm32-e407/client-colcon.meta index f38fb07c..5408fc23 100644 --- a/config/freertos/olimex-stm32-e407/client-colcon.meta +++ b/config/freertos/olimex-stm32-e407/client-colcon.meta @@ -10,7 +10,8 @@ "cmake-args": [ "-DENABLE_TESTING=OFF", "-DRCUTILS_NO_FILESYSTEM=ON", - "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON" + "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON", + "-DRCUTILS_NO_64_ATOMIC=ON" ] }, "microxrcedds_client": { diff --git a/config/zephyr/generic/client-colcon.meta b/config/zephyr/generic/client-colcon.meta index 63a9b4cd..85944570 100644 --- a/config/zephyr/generic/client-colcon.meta +++ b/config/zephyr/generic/client-colcon.meta @@ -23,7 +23,8 @@ "-DENABLE_TESTING=OFF", "-DRCUTILS_NO_FILESYSTEM=ON", "-DRCUTILS_NO_THREAD_SUPPORT=ON", - "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON" + "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON", + "-DRCUTILS_NO_64_ATOMIC=ON" ] }, "microxrcedds_client": { From 825f1b179c299f9e5fd604c46757e26c41f6e050 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 17 Sep 2020 09:36:39 +0200 Subject: [PATCH 3/4] Add esp32 --- config/freertos/esp32/client-colcon.meta | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/freertos/esp32/client-colcon.meta b/config/freertos/esp32/client-colcon.meta index a9cde9ec..bf9a5915 100644 --- a/config/freertos/esp32/client-colcon.meta +++ b/config/freertos/esp32/client-colcon.meta @@ -10,7 +10,8 @@ "cmake-args": [ "-DENABLE_TESTING=OFF", "-DRCUTILS_NO_FILESYSTEM=ON", - "-DRCUTILS_NO_THREAD_SUPPORT=ON" + "-DRCUTILS_NO_THREAD_SUPPORT=ON", + "-DRCUTILS_NO_64_ATOMIC=ON" ] }, "microxrcedds_client": { From 5f8c5f56068ed5f1bf3c0feb1f7ac23904b77d0f Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 6 Aug 2020 10:44:44 +0200 Subject: [PATCH 4/4] Revert "Set test branches" This reverts commit 877e874541c609f6d382be8b20d53babda73b396. --- config/freertos/crazyflie21/board.repos | 2 +- config/freertos/crazyflie21/client_uros_packages.repos | 2 +- config/freertos/esp32/board.repos | 2 +- config/freertos/esp32/client_uros_packages.repos | 2 +- config/freertos/nucleo_f446ze/board.repos | 2 +- config/freertos/nucleo_f446ze/client_uros_packages.repos | 2 +- config/freertos/olimex-stm32-e407/board.repos | 2 +- config/freertos/olimex-stm32-e407/client_uros_packages.repos | 2 +- config/nuttx/generic/client_uros_packages.repos | 2 +- config/zephyr/generic/board.repos | 2 +- config/zephyr/generic/client_uros_packages.repos | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/freertos/crazyflie21/board.repos b/config/freertos/crazyflie21/board.repos index 372d2f47..73e50308 100644 --- a/config/freertos/crazyflie21/board.repos +++ b/config/freertos/crazyflie21/board.repos @@ -7,5 +7,5 @@ repositories: freertos_apps: type: git url: https://github.com/micro-ROS/freertos_apps - version: feature/test_atomics + version: foxy diff --git a/config/freertos/crazyflie21/client_uros_packages.repos b/config/freertos/crazyflie21/client_uros_packages.repos index 35c2049c..bf27a621 100644 --- a/config/freertos/crazyflie21/client_uros_packages.repos +++ b/config/freertos/crazyflie21/client_uros_packages.repos @@ -21,7 +21,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils - version: feature/fix_atomics_64bits + version: foxy uros/rmw_microxrcedds: type: git url: https://github.com/micro-ROS/rmw-microxrcedds.git diff --git a/config/freertos/esp32/board.repos b/config/freertos/esp32/board.repos index ecd72e79..5e4c4a03 100644 --- a/config/freertos/esp32/board.repos +++ b/config/freertos/esp32/board.repos @@ -2,7 +2,7 @@ repositories: freertos_apps: type: git url: https://github.com/micro-ROS/freertos_apps - version: feature/test_atomics + version: foxy diff --git a/config/freertos/esp32/client_uros_packages.repos b/config/freertos/esp32/client_uros_packages.repos index 59b1034a..d9a20d58 100644 --- a/config/freertos/esp32/client_uros_packages.repos +++ b/config/freertos/esp32/client_uros_packages.repos @@ -21,7 +21,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils - version: feature/fix_atomics_64bits + version: foxy uros/rmw_microxrcedds: type: git url: https://github.com/micro-ROS/rmw-microxrcedds.git diff --git a/config/freertos/nucleo_f446ze/board.repos b/config/freertos/nucleo_f446ze/board.repos index b13971c6..236c369d 100644 --- a/config/freertos/nucleo_f446ze/board.repos +++ b/config/freertos/nucleo_f446ze/board.repos @@ -2,4 +2,4 @@ repositories: freertos_apps: type: git url: https://github.com/micro-ros/freertos_apps - version: feature/test_atomics + version: foxy diff --git a/config/freertos/nucleo_f446ze/client_uros_packages.repos b/config/freertos/nucleo_f446ze/client_uros_packages.repos index 59b1034a..d9a20d58 100644 --- a/config/freertos/nucleo_f446ze/client_uros_packages.repos +++ b/config/freertos/nucleo_f446ze/client_uros_packages.repos @@ -21,7 +21,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils - version: feature/fix_atomics_64bits + version: foxy uros/rmw_microxrcedds: type: git url: https://github.com/micro-ROS/rmw-microxrcedds.git diff --git a/config/freertos/olimex-stm32-e407/board.repos b/config/freertos/olimex-stm32-e407/board.repos index ecd72e79..5e4c4a03 100644 --- a/config/freertos/olimex-stm32-e407/board.repos +++ b/config/freertos/olimex-stm32-e407/board.repos @@ -2,7 +2,7 @@ repositories: freertos_apps: type: git url: https://github.com/micro-ROS/freertos_apps - version: feature/test_atomics + version: foxy diff --git a/config/freertos/olimex-stm32-e407/client_uros_packages.repos b/config/freertos/olimex-stm32-e407/client_uros_packages.repos index 59b1034a..d9a20d58 100644 --- a/config/freertos/olimex-stm32-e407/client_uros_packages.repos +++ b/config/freertos/olimex-stm32-e407/client_uros_packages.repos @@ -21,7 +21,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils - version: feature/fix_atomics_64bits + version: foxy uros/rmw_microxrcedds: type: git url: https://github.com/micro-ROS/rmw-microxrcedds.git diff --git a/config/nuttx/generic/client_uros_packages.repos b/config/nuttx/generic/client_uros_packages.repos index da362269..3e94bf98 100644 --- a/config/nuttx/generic/client_uros_packages.repos +++ b/config/nuttx/generic/client_uros_packages.repos @@ -25,7 +25,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils.git - version: feature/fix_atomics_64bits + version: foxy drive_base: type: git url: https://github.com/micro-ROS/drive_base.git diff --git a/config/zephyr/generic/board.repos b/config/zephyr/generic/board.repos index 36fb1a13..2bbd678d 100644 --- a/config/zephyr/generic/board.repos +++ b/config/zephyr/generic/board.repos @@ -2,4 +2,4 @@ repositories: zephyr_apps: type: git url: https://github.com/micro-ROS/zephyr_apps - version: feature/fix_atomic_64bits + version: foxy diff --git a/config/zephyr/generic/client_uros_packages.repos b/config/zephyr/generic/client_uros_packages.repos index c526bacb..9759836d 100644 --- a/config/zephyr/generic/client_uros_packages.repos +++ b/config/zephyr/generic/client_uros_packages.repos @@ -25,7 +25,7 @@ repositories: uros/rcutils: type: git url: https://github.com/micro-ROS/rcutils - version: feature/fix_atomics_64bits + version: foxy uros/rmw_microxrcedds: type: git url: https://github.com/micro-ROS/rmw-microxrcedds.git