Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix meta file selection and change rtps branch (backport #31) #32

Merged
merged 2 commits into from
Oct 18, 2021
Merged

Fix meta file selection and change rtps branch (backport #31) #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c30cb4
Fix meta file selection and change rtps branch (#31)
Acuadros95 Oct 18, 2021
748cf0b
Set branchs to main
Acuadros95 Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions microros_static_library_ide/library_generation/colcon-embeddedrtps.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@
"-DTRACETOOLS_STATUS_CHECKING_TOOL=OFF"
]
},
"rcl":{
"cmake-args":[
"rosidl_typesupport": {
"cmake-args": [
"-DROSIDL_TYPESUPPORT_SINGLE_TYPESUPPORT=ON"
]
},
"rcl": {
"cmake-args": [
"-DBUILD_TESTING=OFF",
"-DRCL_COMMAND_LINE_ENABLED=OFF",
"-DRCL_LOGGING_ENABLED=OFF"
]
Expand All @@ -27,7 +33,9 @@
"-DERTPS_MAX_SUBSCRIPTIONS=2",
"-DERTPS_MAX_SERVICES=1",
"-DERTPS_MAX_CLIENTS=1",
"-DERTPS_MAX_HISTORY=10"
"-DERTPS_PROXIES_PER_WRITER=5",
"-DERTPS_PROXIES_PER_READER=5",
"-DERTPS_MAX_UDP_CONNECTIONS=15"
]
}
}
Expand Down
10 changes: 5 additions & 5 deletions microros_static_library_ide/library_generation/library_generation.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ pushd firmware/mcu_ws > /dev/null
rm -rf eProsima/Micro-XRCE-DDS-Client
rm -rf uros/rmw_microxrcedds

git clone -b galactic https://github.com/micro-ROS/rmw_embeddedrtps uros/rmw_embeddedrtps
git clone -b working_cubeide https://github.com/pablogs9/embeddedRTPS uros/embeddedRTPS
git clone -b main https://github.com/micro-ROS/rmw_embeddedrtps uros/rmw_embeddedrtps
git clone -b main https://github.com/pablogs9/embeddedRTPS uros/embeddedRTPS
fi

popd > /dev/null
Expand All @@ -63,9 +63,9 @@ popd > /dev/null
export TOOLCHAIN_PREFIX=/usr/bin/arm-none-eabi-

if [ -z ${MICROROS_USE_EMBEDDEDRTPS+x} ]; then
ros2 run micro_ros_setup build_firmware.sh $BASE_PATH/library_generation/toolchain.cmake $BASE_PATH/library_generation/colcon.meta
else
ros2 run micro_ros_setup build_firmware.sh $BASE_PATH/library_generation/toolchain.cmake $BASE_PATH/library_generation/colcon-embeddedrtps.meta
else
ros2 run micro_ros_setup build_firmware.sh $BASE_PATH/library_generation/toolchain.cmake $BASE_PATH/library_generation/colcon.meta
fi

find firmware/build/include/ -name "*.c" -delete
Expand All @@ -85,4 +85,4 @@ for f in $(find $(pwd) -name .git -type d); do pushd $f > /dev/null; echo $(git
######## Fix permissions ########
sudo chmod -R 777 $BASE_PATH/libmicroros/
sudo chmod -R 777 $BASE_PATH/libmicroros/include/
sudo chmod -R 777 $BASE_PATH/libmicroros/libmicroros.a
sudo chmod -R 777 $BASE_PATH/libmicroros/libmicroros.a