diff --git a/env.sh b/env.sh index 75cfd30..f8bcd7c 100644 --- a/env.sh +++ b/env.sh @@ -7,6 +7,8 @@ # # ---------------------------------------------------------------------- +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" + source ~/.bashrc # ROS2 specific environment @@ -20,8 +22,8 @@ fi if [ -d /usr/share/colcon_argcomplete ]; then source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash fi -if [ -f install/local_setup.bash ]; then - source install/local_setup.bash +if [ -f "${SCRIPT_DIR}/install/local_setup.bash" ]; then + source "${SCRIPT_DIR}/install/local_setup.bash" fi export PX4_ROS2_ENV_DEFAULT_BASE_DIR="$HOME/Desktop" diff --git a/readme.md b/readme.md index cd75b74..2772a95 100644 --- a/readme.md +++ b/readme.md @@ -34,7 +34,7 @@ Alternatively, follow this step-by-step guide to create the workspace manually. git clone https://github.com/PX4/PX4-Autopilot.git --recursive # Checkout specific version/branch and update submodules - PX4_VERSION="v1.15.0-beta2" + PX4_VERSION="v1.15.0" (cd ./PX4-Autopilot && git checkout $PX4_VERSION && make submodulesclean) # Install PX4 Autopilot dependencies on current system @@ -47,7 +47,7 @@ Alternatively, follow this step-by-step guide to create the workspace manually. cd ./PX4-Autopilot make clean make distclean - git checkout v1.15.0-beta2 # Switch version/tag/revision here + git checkout v1.15.0 # Switch version/tag/revision here make submodulesclean # Make sure to update the submodules ``` diff --git a/setup.sh b/setup.sh index be539e3..e014f63 100755 --- a/setup.sh +++ b/setup.sh @@ -23,7 +23,7 @@ sudo apt install ros-humble-ros-base -y sudo apt install ros-dev-tools -y # PX4 Autopilot -PX4_VERSION="v1.15.0-beta2" +PX4_VERSION="v1.15.0" if [ ! -d "$PX4_ROS2_ENV_PX4_AUTOPILOT_DIR" ]; then echo -e "\e[1;33m--- PX4 Autopilot not found. Installing...\e[0m" diff --git a/src/ros2.repos b/src/ros2.repos index dea816b..57fb90c 100644 --- a/src/ros2.repos +++ b/src/ros2.repos @@ -16,7 +16,7 @@ repositories: dep/px4/px4_ros2_interface_lib: type: git url: https://github.com/Auterion/px4-ros2-interface-lib - version: 1.2.2 + version: 1.2.7 # dep/behaviortree/behaviortree_cpp: # type: git