Skip to content

Commit

Permalink
Update versions and add relative script dir to env.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
robin-mueller committed Sep 5, 2024
1 parent 644bfc8 commit 503c7b3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
6 changes: 4 additions & 2 deletions env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#
# ----------------------------------------------------------------------

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

source ~/.bashrc

# ROS2 specific environment
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/ros2.repos
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 503c7b3

Please sign in to comment.