From 330139905a506b5aae476a41b6d42b0d28fbb500 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 15 Apr 2020 10:32:07 +0200 Subject: [PATCH 1/3] Update CF firm commit and fix fast build --- micro_ros_setup/config/freertos/crazyflie21/board.repos | 2 +- micro_ros_setup/config/freertos/crazyflie21/build.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/micro_ros_setup/config/freertos/crazyflie21/board.repos b/micro_ros_setup/config/freertos/crazyflie21/board.repos index 66b1c7eb..95419f40 100644 --- a/micro_ros_setup/config/freertos/crazyflie21/board.repos +++ b/micro_ros_setup/config/freertos/crazyflie21/board.repos @@ -2,7 +2,7 @@ repositories: crazyflie_firmware: type: git url: https://github.com/bitcraze/crazyflie-firmware - version: 5142cacdde8b2a21ae0bef0ae4d0a26088335bee + version: a2a26abd53a5f328374877bfbcb7b25ed38d8111 freertos_apps: type: git diff --git a/micro_ros_setup/config/freertos/crazyflie21/build.sh b/micro_ros_setup/config/freertos/crazyflie21/build.sh index dba09afa..09a6704a 100755 --- a/micro_ros_setup/config/freertos/crazyflie21/build.sh +++ b/micro_ros_setup/config/freertos/crazyflie21/build.sh @@ -21,17 +21,17 @@ pushd $EXTENSIONS_DIR >/dev/null exit 1 fi - if [ "$UROS_FAST_BUILD" = "off" ] || [ ! -d "build" ]; then + if [ "$UROS_FAST_BUILD" = "off" ]; then # Clean micro-ROS build rm -rf $FW_TARGETDIR/mcu_ws/build $FW_TARGETDIR/mcu_ws/install $FW_TARGETDIR/mcu_ws/log - # Clean build - make clean - # Build micro-ROS stack make libmicroros fi + # Clean build + make clean + # build firmware make PLATFORM=cf2 CLOAD=0 UROS_APP_FOLDER=$UROS_APP_FOLDER popd >/dev/null From d475cac605bbc9e0395c7b3a161a8fedd7a4a08f Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 15 Apr 2020 10:37:48 +0200 Subject: [PATCH 2/3] Update script --- micro_ros_setup/config/freertos/crazyflie21/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/micro_ros_setup/config/freertos/crazyflie21/build.sh b/micro_ros_setup/config/freertos/crazyflie21/build.sh index 09a6704a..0948758b 100755 --- a/micro_ros_setup/config/freertos/crazyflie21/build.sh +++ b/micro_ros_setup/config/freertos/crazyflie21/build.sh @@ -21,17 +21,17 @@ pushd $EXTENSIONS_DIR >/dev/null exit 1 fi - if [ "$UROS_FAST_BUILD" = "off" ]; then + if [ "$UROS_FAST_BUILD" = "off" ] || [ ! -d "$FW_TARGETDIR/mcu_ws/build" ]; then # Clean micro-ROS build rm -rf $FW_TARGETDIR/mcu_ws/build $FW_TARGETDIR/mcu_ws/install $FW_TARGETDIR/mcu_ws/log + # Clean build + make clean + # Build micro-ROS stack make libmicroros fi - # Clean build - make clean - # build firmware make PLATFORM=cf2 CLOAD=0 UROS_APP_FOLDER=$UROS_APP_FOLDER popd >/dev/null From b6416f970f0870c2e4a6e83e947e6739f20afd7e Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 23 Apr 2020 16:10:40 +0200 Subject: [PATCH 3/3] Update metas of CF for rcutils avoid logging --- micro_ros_setup/config/freertos/crazyflie21/client-colcon.meta | 1 + 1 file changed, 1 insertion(+) diff --git a/micro_ros_setup/config/freertos/crazyflie21/client-colcon.meta b/micro_ros_setup/config/freertos/crazyflie21/client-colcon.meta index cb7215bb..82315009 100644 --- a/micro_ros_setup/config/freertos/crazyflie21/client-colcon.meta +++ b/micro_ros_setup/config/freertos/crazyflie21/client-colcon.meta @@ -4,6 +4,7 @@ "cmake-args":[ "-DENABLE_TESTING=OFF", "-DRCUTILS_NO_FILESYSTEM=ON", + "-DRCUTILS_NO_LOGGING=ON", "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON" ] },