From c64d773801e799dc973d50aca6d7dbbd371d9495 Mon Sep 17 00:00:00 2001 From: b1n-ch1kn Date: Wed, 3 Jul 2024 15:52:46 +1000 Subject: [PATCH] shortcut scripts updated --- .../install_scripts/install_eufs_sim.sh | 17 ++++++++++++++--- .../install_scripts/install_ros_humble.sh | 9 ++++++++- installation/setup_standard.sh | 7 ------- src/operations/mission_controller/package.xml | 2 +- tools/qutms_cli_tools/make_shortcuts.sh | 7 +++++++ 5 files changed, 30 insertions(+), 12 deletions(-) create mode 100755 tools/qutms_cli_tools/make_shortcuts.sh diff --git a/installation/install_scripts/install_eufs_sim.sh b/installation/install_scripts/install_eufs_sim.sh index b6c5e230a..8b680494e 100644 --- a/installation/install_scripts/install_eufs_sim.sh +++ b/installation/install_scripts/install_eufs_sim.sh @@ -6,10 +6,21 @@ echo "" sleep 3 cd ~/QUTMS git clone https://github.com/QUT-Motorsport/eufs_sim.git -git clone https://gitlab.com/eufs/eufs_msgs.git -git clone https://github.com/QUT-Motorsport/eufs_rviz_plugins.git -# git clone https://github.com/QUT-Motorsport/qutms_msgs.git echo "export EUFS_MASTER=~/QUTMS" >> ~/.bashrc echo "export QUTMS_WS=~/QUTMS" >> ~/.bashrc export EUFS_MASTER=~/QUTMS export QUTMS_WS=~/QUTMS + +## Clone SBG driver +echo "" +echo "---Cloning SBG Driver---" +echo "" +git clone https://github.com/SBG-Systems/sbg_ros2_driver.git + +sudo rosdep init +rosdep update +rosdep install -y \ + --rosdistro=${ROS_DISTRO} \ + --ignore-src \ + --from-paths ~/QUTMS \ + --skip-keys "zed_ros2" diff --git a/installation/install_scripts/install_ros_humble.sh b/installation/install_scripts/install_ros_humble.sh index 3da984aa9..9b252545d 100644 --- a/installation/install_scripts/install_ros_humble.sh +++ b/installation/install_scripts/install_ros_humble.sh @@ -6,7 +6,14 @@ echo "" sleep 3 cd ~ sudo apt update -sudo apt install -y ros-humble-desktop ros-dev-tools +sudo apt install -y ros-humble-desktop-full ros-dev-tools sudo rosdep init rosdep update +rosdep install -y \ + --rosdistro=${ROS_DISTRO} \ + --ignore-src \ + --from-paths QUTMS_Driverless/src \ + --skip-keys "sbg_driver zed_ros2" + # skip the 3rd party device drivers that get installed on-car (we dont have the devices) + echo "source /opt/ros/humble/setup.bash" >> ~/.bashrc diff --git a/installation/setup_standard.sh b/installation/setup_standard.sh index 2236d99ce..9951de301 100755 --- a/installation/setup_standard.sh +++ b/installation/setup_standard.sh @@ -65,13 +65,6 @@ source ~/QUTMS/QUTMS_Driverless/installation/install_scripts/install_pre-commit. ## Check if user wants to install WSL version of GitKraken source ~/QUTMS/QUTMS_Driverless/installation/install_scripts/install_gitkraken.sh -## Clone SBG driver -echo "" -echo "---Cloning SBG Driver---" -echo "" -cd ~/QUTMS -git clone https://github.com/SBG-Systems/sbg_ros2_driver.git - echo "" echo "---Building packages---" echo "" diff --git a/src/operations/mission_controller/package.xml b/src/operations/mission_controller/package.xml index 312fee393..dee622724 100644 --- a/src/operations/mission_controller/package.xml +++ b/src/operations/mission_controller/package.xml @@ -7,7 +7,7 @@ Alastair Bradford MIT - rclpy_lifecycle + driverless_msgs diff --git a/tools/qutms_cli_tools/make_shortcuts.sh b/tools/qutms_cli_tools/make_shortcuts.sh new file mode 100755 index 000000000..b2284d1f4 --- /dev/null +++ b/tools/qutms_cli_tools/make_shortcuts.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +ln -s ~/QUTMS/QUTMS_Driverless/tools/qutms_cli_tools/qutms_cli_tools/build.sh ~/QUTMS/build.sh +ln -s ~/QUTMS/QUTMS_Driverless/tools/qutms_cli_tools/qutms_cli_tools/format.sh ~/QUTMS/format.sh +ln -s ~/QUTMS/QUTMS_Driverless/tools/qutms_cli_tools/qutms_cli_tools/launch.sh ~/QUTMS/launch.sh +ln -s ~/QUTMS/QUTMS_Driverless/tools/qutms_cli_tools/qutms_cli_tools/pull.sh ~/QUTMS/pull.sh +ln -s ~/QUTMS/QUTMS_Driverless/tools/qutms_cli_tools/qutms_cli_tools/record.sh ~/QUTMS/record.sh