From 66d86b2285505f5858fe5c1ed12b60427728f369 Mon Sep 17 00:00:00 2001 From: Ilya Guterman Date: Mon, 4 Oct 2021 10:40:12 +0300 Subject: [PATCH] generate kakutef7 nonblock variation --- .../library_generation/colcon_nonblock.meta | 56 +++++++++++++++++++ .../library_generation/library_generation.sh | 9 ++- 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100755 extras/library_generation/colcon_nonblock.meta diff --git a/extras/library_generation/colcon_nonblock.meta b/extras/library_generation/colcon_nonblock.meta new file mode 100755 index 00000000..d1462b13 --- /dev/null +++ b/extras/library_generation/colcon_nonblock.meta @@ -0,0 +1,56 @@ +{ + "names": { + "tracetools": { + "cmake-args": [ + "-DTRACETOOLS_DISABLED=ON", + "-DTRACETOOLS_STATUS_CHECKING_TOOL=OFF" + ] + }, + "rosidl_typesupport": { + "cmake-args": [ + "-DROSIDL_TYPESUPPORT_SINGLE_TYPESUPPORT=ON" + ] + }, + "rcl": { + "cmake-args": [ + "-DBUILD_TESTING=OFF", + "-DRCL_COMMAND_LINE_ENABLED=OFF", + "-DRCL_LOGGING_ENABLED=OFF" + ] + }, + "rcutils": { + "cmake-args": [ + "-DENABLE_TESTING=OFF", + "-DRCUTILS_NO_FILESYSTEM=ON", + "-DRCUTILS_NO_THREAD_SUPPORT=ON", + "-DRCUTILS_NO_64_ATOMIC=ON", + "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON" + ] + }, + "microxrcedds_client": { + "cmake-args": [ + "-DUCLIENT_PIC=OFF", + "-DUCLIENT_PROFILE_UDP=OFF", + "-DUCLIENT_PROFILE_TCP=OFF", + "-DUCLIENT_PROFILE_DISCOVERY=OFF", + "-DUCLIENT_PROFILE_SERIAL=OFF", + "-UCLIENT_PROFILE_STREAM_FRAMING=ON", + "-DUCLIENT_PROFILE_CUSTOM_TRANSPORT=ON", + "-DUCLIENT_MAX_SESSION_CONNECTION_ATTEMPTS=1", + "-DUCLIENT_MIN_SESSION_CONNECTION_INTERVAL=0" + ] + }, + "rmw_microxrcedds": { + "cmake-args": [ + "-DRMW_UXRCE_MAX_NODES=1", + "-DRMW_UXRCE_MAX_PUBLISHERS=10", + "-DRMW_UXRCE_MAX_SUBSCRIPTIONS=6", + "-DRMW_UXRCE_MAX_SERVICES=1", + "-DRMW_UXRCE_MAX_CLIENTS=1", + "-DRMW_UXRCE_MAX_HISTORY=4", + "-DRMW_UXRCE_TRANSPORT=custom", + "-DRMW_UXRCE_ENTITY_CREATION_DESTROY_TIMEOUT=0" + ] + } + } +} diff --git a/extras/library_generation/library_generation.sh b/extras/library_generation/library_generation.sh index bfcd7a5a..20c102dd 100755 --- a/extras/library_generation/library_generation.sh +++ b/extras/library_generation/library_generation.sh @@ -19,6 +19,7 @@ if [ $OPTIND -eq 1 ]; then # PLATFORMS+=("portenta-m4") PLATFORMS+=("portenta-m7") PLATFORMS+=("kakutef7-m7") + PLATFORMS+=("kakutef7-m7-nonblock") fi shift $((OPTIND-1)) @@ -172,11 +173,15 @@ if [[ " ${PLATFORMS[@]} " =~ " portenta-m7 " ]]; then fi ######## Build for Kakute F7 M7 core ######## -if [[ " ${PLATFORMS[@]} " =~ " kakutef7-m7 " ]]; then +if [[ " ${PLATFORMS[@]} " =~ kakutef7-m7.* ]]; then rm -rf firmware/build export TOOLCHAIN_PREFIX=/uros_ws/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi- - ros2 run micro_ros_setup build_firmware.sh /project/extras/library_generation/kakutef7-m7_toolchain.cmake /project/extras/library_generation/colcon.meta + if [[ " ${PLATFORMS[@]} " =~ " kakutef7-m7-nonblock " ]]; then + ros2 run micro_ros_setup build_firmware.sh /project/extras/library_generation/kakutef7-m7_toolchain.cmake /project/extras/library_generation/colcon.meta + elif [[ " ${PLATFORMS[@]} " =~ " kakutef7-m7 " ]]; then + ros2 run micro_ros_setup build_firmware.sh /project/extras/library_generation/kakutef7-m7_toolchain.cmake /project/extras/library_generation/colcon_nonblock.meta + fi find firmware/build/include/ -name "*.c" -delete cp -R firmware/build/include/* /project/src/