From 232ee2d8d5d44d1971d00e57ccc7859e4ff5e367 Mon Sep 17 00:00:00 2001 From: default Date: Wed, 7 Jan 2026 19:46:54 +0000 Subject: [PATCH] Install Scripts Update --- scripts/run_ardupilot_controller.sh | 10 ++++++++++ setup/install_ardupilot.sh | 12 ++++++++++++ 2 files changed, 22 insertions(+) diff --git a/scripts/run_ardupilot_controller.sh b/scripts/run_ardupilot_controller.sh index 1f63b74..7c9c32f 100755 --- a/scripts/run_ardupilot_controller.sh +++ b/scripts/run_ardupilot_controller.sh @@ -14,6 +14,16 @@ set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_DIR="$(dirname "$SCRIPT_DIR")" +# Source ArduPilot environment +if [ -f "$HOME/.ardupilot_env" ]; then + source "$HOME/.ardupilot_env" +fi + +# Activate ArduPilot venv (has empy and other dependencies) +if [ -f "$HOME/venv-ardupilot/bin/activate" ]; then + source "$HOME/venv-ardupilot/bin/activate" +fi + echo "==============================================" echo " ArduPilot Controller" echo "==============================================" diff --git a/setup/install_ardupilot.sh b/setup/install_ardupilot.sh index 476bba5..01063dd 100755 --- a/setup/install_ardupilot.sh +++ b/setup/install_ardupilot.sh @@ -67,6 +67,14 @@ cd "$ARDUPILOT_HOME" Tools/environment_install/install-prereqs-ubuntu.sh -y . ~/.profile || true +# Source ArduPilot environment (includes venv with empy) +if [ -f "$HOME/.ardupilot_env" ]; then + source "$HOME/.ardupilot_env" +fi +if [ -f "$HOME/venv-ardupilot/bin/activate" ]; then + source "$HOME/venv-ardupilot/bin/activate" +fi + # Build ArduCopter SITL (without DDS to avoid complexity) ./waf configure --board sitl ./waf copter @@ -120,6 +128,10 @@ if ! grep -q "$BASHRC_MARKER" ~/.bashrc; then cat >> ~/.bashrc << EOF $BASHRC_MARKER +# Source ArduPilot environment (venv + tools) +if [ -f ~/.ardupilot_env ]; then + source ~/.ardupilot_env +fi export ARDUPILOT_HOME=$ARDUPILOT_HOME export PATH=\$PATH:$ARDUPILOT_HOME/Tools/autotest export PATH=\$PATH:\$HOME/.local/bin