From 841f8f45b17d7ba00c6f3aa4b3ef471437fe34b9 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Sun, 25 Oct 2020 22:59:50 +0300 Subject: [PATCH 01/12] Update to Ubuntu Focal --- .travis.yml | 2 +- base_vm.json | 6 ++--- http/preseed.cfg | 2 +- scripts/installSoftware.sh | 53 ++++++++++++++++++++++++++++---------- 4 files changed, 45 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index c08bd42..0177289 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_install: bionic contrib >> /etc/apt/sources.list" && sudo apt-get update && sudo apt-get install build-essential gcc make linux-headers-$(uname -r) virtualbox-6.0 && sudo usermod -aG vboxusers $(whoami) -- mkdir output-virtualbox-iso && pushd output-virtualbox-iso && wget --progress=dot:giga https://github.com/sfalexrog/clever_vm/releases/download/v0.1_base_vm/clover-devel.ova +- mkdir output-virtualbox-iso && pushd output-virtualbox-iso && wget --progress=dot:giga https://clovervm.ams3.digitaloceanspaces.com/base-focal.ova -O clover-devel.ova && popd - sudo apt install -y xvfb script: diff --git a/base_vm.json b/base_vm.json index ef30989..8e07e79 100644 --- a/base_vm.json +++ b/base_vm.json @@ -17,10 +17,10 @@ ["storageattach", "{{.Name}}", "--storagectl", "SATA Controller", "--port", "0", "--nonrotational", "on", "--discard", "on"] ], - "headless": "true", + "headless": "false", - "iso_url": "http://archive.ubuntu.com/ubuntu/dists/bionic/main/installer-amd64/current/images/netboot/mini.iso", - "iso_checksum": "bed8a55ae2a657f8349fe3271097cff3a5b8c3d1048cf258568f1601976fa30d", + "iso_url": "http://archive.ubuntu.com/ubuntu/dists/focal/main/installer-amd64/current/legacy-images/netboot/mini.iso", + "iso_checksum": "0e79e00bf844929d40825b1f0e8634415cda195ba23bae0b041911fde4dfe018", "iso_checksum_type": "sha256", "ssh_password": "{{user `password`}}", diff --git a/http/preseed.cfg b/http/preseed.cfg index f24fc66..2fbc88f 100644 --- a/http/preseed.cfg +++ b/http/preseed.cfg @@ -7,7 +7,7 @@ d-i debconf debconf/frontend select Noninteractive d-i debian-installer/locale string en_US.utf8 ### Hardware enablement kernel -d-i base-installer/kernel/override-image string linux-generic-hwe-18.04 +d-i base-installer/kernel/override-image string linux-generic-hwe-20.04 ### Keyboard selection d-i console-setup/ask_detect boolean false diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh index ca91168..4d6c36e 100644 --- a/scripts/installSoftware.sh +++ b/scripts/installSoftware.sh @@ -23,25 +23,27 @@ echo "--- Installing ROS desktop packages" sudo -E sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list' sudo -E sh -c 'apt-key adv --keyserver "hkp://keyserver.ubuntu.com:80" --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654' -sudo -E sh -c 'apt update; apt install -y python-rosdep python-rosinstall-generator python-wstool build-essential ros-melodic-desktop' +sudo -E sh -c 'apt update; apt install -y python3-rosdep python3-rosinstall-generator python3-wstool build-essential ros-noetic-desktop' sudo -E sh -c 'rosdep init' rosdep update +# FIXME: PX4 needs pip to be installed +# FIXME: python2 dependencies? echo "--- Downloading PX4 and installing its dependencies" -git clone -b v1.10.1-clover https://github.com/CopterExpress/Firmware ${HOME}/Firmware -sudo -E -S sh -c '${HOME}/Firmware/Tools/setup/ubuntu.sh' -sudo -E -S sh -c 'echo "2" | update-alternatives --config java' -sudo -E -S sed -i -e '/^assistive_technologies=/s/^/#/' /etc/java-*-openjdk/accessibility.properties +git clone -b v1.11.1-clover https://github.com/CopterExpress/Firmware ${HOME}/Firmware +# PX4 v1.11.1 script will happily run sudo by itself +${HOME}/Firmware/Tools/setup/ubuntu.sh +# Ubuntu 20.04 no longer sets assistive_technologies, thankfully echo "--- Prebuilding PX4 SITL configuration" make -C ${HOME}/Firmware px4_sitl echo "--- Patching gazebo plugins for SITL" cd ${HOME}/Firmware/Tools/sitl_gazebo -patch -p1 < /tmp/patches/sitl_gazebo.patch +#patch -p1 < /tmp/patches/sitl_gazebo.patch echo 'export SVGA_VGPU10=0' >> ${HOME}/Firmware/Tools/setup_gazebo.bash -echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc +echo "source /opt/ros/noetic/setup.bash" >> ~/.bashrc echo "--- Installing Visual Studio Code" @@ -58,22 +60,47 @@ code --install-extension ms-vscode.cpptools code --install-extension streetsidesoftware.code-spell-checker code --install-extension eamodio.gitlens echo "--- Installing pylint" -/usr/bin/python2.7 -m pip install -U "pylint<2.0.0" --user +#/usr/bin/python2.7 -m pip install -U "pylint<2.0.0" --user /usr/bin/python3.6 -m pip install -U pylint --user echo "--- Cloning and installing Clover packages" +sudo sh -c 'curl http://deb.coex.tech/aptly_repo_signing.key 2> /dev/null | apt-key add -' +sudo sh -c 'echo "deb http://deb.coex.tech/ros xenial main" > /etc/apt/sources.list.d/coex.tech.list' +sudo sh -c 'echo "yaml file:///etc/ros/rosdep/coex.yaml" > /etc/ros/rosdep/sources.list.d/99-coex.list' +sudo sh -c 'cat < /etc/ros/rosdep/coex.yaml +led_msgs: + ubuntu: + focal: [ros-noetic-led-msgs] +async_web_server_cpp: + ubuntu: + focal: [ros-noetic-async-web-server-cpp] +ros_pytest: + ubuntu: + focal: [ros-noetic-ros-pytest] +tf2_web_republisher: + ubuntu: + focal: [ros-noetic-tf2-web-republisher] +web_video_server: + ubuntu: + focal: [ros-noetic-web-video-server] +ws281x: + ubuntu: + focal: [ros-noetic-ws281x] +EOF' +sudo apt update +rosdep update mkdir -p ${HOME}/catkin_ws/src git clone https://github.com/CopterExpress/clover ${HOME}/catkin_ws/src/clover git clone https://github.com/CopterExpress/ros_led ${HOME}/catkin_ws/src/ros_led +# These packages are missing from Noetic release, but are required for sitl_gazebo +git clone https://github.com/ethz-asl/mav_comm # Make PX4 and Gazebo plugins visible in the workspace ln -s ${HOME}/Firmware ${HOME}/catkin_ws/src/Firmware ln -s ${HOME}/Firmware/Tools/sitl_gazebo ${HOME}/catkin_ws/src/sitl_gazebo rosdep install --from-paths ${HOME}/catkin_ws/src --ignore-src --rosdistro melodic -y -curl https://raw.githubusercontent.com/mavlink/mavros/master/mavros/scripts/install_geographiclib_datasets.sh -o ${HOME}/install_geographiclib_datasets.sh -chmod a+x ${HOME}/install_geographiclib_datasets.sh -sudo -E sh -c '${HOME}/install_geographiclib_datasets.sh' -sudo /usr/bin/python2.7 -m pip install -r ${HOME}/catkin_ws/src/clover/clover/requirements.txt -source /opt/ros/melodic/setup.bash +sudo /opt/ros/noetic/lib/mavros/install_geographiclib_datasets.sh +sudo /usr/bin/python3 -m pip install -r ${HOME}/catkin_ws/src/clover/clover/requirements.txt +source /opt/ros/noetic/setup.bash cd ${HOME}/catkin_ws && catkin_make echo "source ${HOME}/catkin_ws/devel/setup.bash" >> ~/.bashrc From b3dd27356ecae8af6931a5c2aa93bc61b72476c1 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Sun, 25 Oct 2020 23:03:37 +0300 Subject: [PATCH 02/12] assets: Update sitl_gazebo patch --- assets/patches/sitl_gazebo.patch | 55 +++++++++----------------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/assets/patches/sitl_gazebo.patch b/assets/patches/sitl_gazebo.patch index 4f71c65..d5a0a62 100644 --- a/assets/patches/sitl_gazebo.patch +++ b/assets/patches/sitl_gazebo.patch @@ -1,40 +1,15 @@ -diff --git a/include/gazebo_opticalflow_plugin.h b/include/gazebo_opticalflow_plugin.h -index 4fbeab2..18a192b 100644 ---- a/include/gazebo_opticalflow_plugin.h -+++ b/include/gazebo_opticalflow_plugin.h -@@ -40,7 +40,7 @@ - #include "flow_px4.hpp" - - #define DEFAULT_RATE 20 --#define HAS_GYRO TRUE -+#define HAS_GYRO true - - using namespace cv; - using namespace std; -diff --git a/src/gazebo_geotagged_images_plugin.cpp b/src/gazebo_geotagged_images_plugin.cpp -index 050558f..7029199 100644 ---- a/src/gazebo_geotagged_images_plugin.cpp -+++ b/src/gazebo_geotagged_images_plugin.cpp -@@ -581,7 +581,8 @@ void GeotaggedImagesPlugin::_send_capture_status(struct sockaddr* srcaddr) - 0, // video status (Idle) - interval, // image interval - 0, // recording_time_s -- available_mib); // available_capacity -+ available_mib, // available_capacity -+ _imageCounter); - _send_mavlink_message(&msg, srcaddr); - } - -diff --git a/src/gazebo_mavlink_interface.cpp b/src/gazebo_mavlink_interface.cpp -index 5d29017..d4dd6a7 100644 ---- a/src/gazebo_mavlink_interface.cpp -+++ b/src/gazebo_mavlink_interface.cpp -@@ -1039,7 +1039,7 @@ void GazeboMavlinkInterface::VisionCallback(OdomPtr& odom_message) { - - odom.time_usec = odom_message->time_usec(); - -- odom.frame_id = MAV_FRAME_VISION_NED; -+ odom.frame_id = 16 /*MAV_FRAME_VISION_NED*/; - odom.child_frame_id = MAV_FRAME_BODY_FRD; - - odom.x = position.X(); +diff --git a/package.xml b/package.xml +index ae0fb34..12f17b8 100644 +--- a/package.xml ++++ b/package.xml +@@ -50,8 +50,8 @@ + roscpp + sensor_msgs + std_msgs +- python-rospkg +- python-jinja2 ++ python3-rospkg ++ python3-jinja2 + eigen + gazebo_ros + geometry_msgs From 407a1a30cf8c17b24f6d07df2a85e1ae7cd8d746 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Sun, 25 Oct 2020 23:58:34 +0300 Subject: [PATCH 03/12] scripts: Use Python3, noetic wherever possible --- scripts/installSoftware.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh index 4d6c36e..dc7e8ff 100644 --- a/scripts/installSoftware.sh +++ b/scripts/installSoftware.sh @@ -60,8 +60,7 @@ code --install-extension ms-vscode.cpptools code --install-extension streetsidesoftware.code-spell-checker code --install-extension eamodio.gitlens echo "--- Installing pylint" -#/usr/bin/python2.7 -m pip install -U "pylint<2.0.0" --user -/usr/bin/python3.6 -m pip install -U pylint --user +/usr/bin/python3 -m pip install -U pylint --user echo "--- Cloning and installing Clover packages" sudo sh -c 'curl http://deb.coex.tech/aptly_repo_signing.key 2> /dev/null | apt-key add -' @@ -97,7 +96,7 @@ git clone https://github.com/ethz-asl/mav_comm # Make PX4 and Gazebo plugins visible in the workspace ln -s ${HOME}/Firmware ${HOME}/catkin_ws/src/Firmware ln -s ${HOME}/Firmware/Tools/sitl_gazebo ${HOME}/catkin_ws/src/sitl_gazebo -rosdep install --from-paths ${HOME}/catkin_ws/src --ignore-src --rosdistro melodic -y +rosdep install --from-paths ${HOME}/catkin_ws/src --ignore-src --rosdistro noetic -y sudo /opt/ros/noetic/lib/mavros/install_geographiclib_datasets.sh sudo /usr/bin/python3 -m pip install -r ${HOME}/catkin_ws/src/clover/clover/requirements.txt source /opt/ros/noetic/setup.bash @@ -147,7 +146,7 @@ sudo cp ${HOME}/catkin_ws/src/clover/builder/assets/monkey.service /etc/systemd/ sudo systemctl enable monkey echo "--- Installing additional packages" -sudo -E sh -c 'apt update; apt install -y sshfs gvfs-fuse gvfs-backends python3-opencv byobu ipython ipython3 byobu nmap lsof tmux vim ros-melodic-rqt-multiplot' +sudo -E sh -c 'apt update; apt install -y sshfs gvfs-fuse gvfs-backends python3-opencv byobu ipython3 byobu nmap lsof tmux vim ros-noetic-rqt-multiplot' echo "--- Personalizing VM" sudo -E sh -c 'mv /etc/xdg/autostart/light-locker.desktop /etc/xdg/autostart/light-locker.desktop.old' From ed2e76774800b885328160341503877e24fc9b97 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Mon, 26 Oct 2020 08:32:51 +0300 Subject: [PATCH 04/12] scripts: Use absolute path for mav_comm clone --- scripts/installSoftware.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh index dc7e8ff..3b6e776 100644 --- a/scripts/installSoftware.sh +++ b/scripts/installSoftware.sh @@ -92,7 +92,7 @@ mkdir -p ${HOME}/catkin_ws/src git clone https://github.com/CopterExpress/clover ${HOME}/catkin_ws/src/clover git clone https://github.com/CopterExpress/ros_led ${HOME}/catkin_ws/src/ros_led # These packages are missing from Noetic release, but are required for sitl_gazebo -git clone https://github.com/ethz-asl/mav_comm +git clone https://github.com/ethz-asl/mav_comm ${HOME}/catkin_ws/src/mav_comm # Make PX4 and Gazebo plugins visible in the workspace ln -s ${HOME}/Firmware ${HOME}/catkin_ws/src/Firmware ln -s ${HOME}/Firmware/Tools/sitl_gazebo ${HOME}/catkin_ws/src/sitl_gazebo From dafebce44528412fdd84f7749f38ce320df35a5f Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Mon, 26 Oct 2020 09:40:44 +0300 Subject: [PATCH 05/12] scripts: Re-enable patching sitl_gazebo --- scripts/installSoftware.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh index 3b6e776..31c1d5a 100644 --- a/scripts/installSoftware.sh +++ b/scripts/installSoftware.sh @@ -40,7 +40,7 @@ echo "--- Prebuilding PX4 SITL configuration" make -C ${HOME}/Firmware px4_sitl echo "--- Patching gazebo plugins for SITL" cd ${HOME}/Firmware/Tools/sitl_gazebo -#patch -p1 < /tmp/patches/sitl_gazebo.patch +patch -p1 < /tmp/patches/sitl_gazebo.patch echo 'export SVGA_VGPU10=0' >> ${HOME}/Firmware/Tools/setup_gazebo.bash echo "source /opt/ros/noetic/setup.bash" >> ~/.bashrc From 07c328484d0387f4fbea86070a0f4de36fdf3c49 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Mon, 26 Oct 2020 11:06:03 +0300 Subject: [PATCH 06/12] scripts: Use proper branch for clover --- scripts/installSoftware.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh index 31c1d5a..a8b0464 100644 --- a/scripts/installSoftware.sh +++ b/scripts/installSoftware.sh @@ -89,7 +89,7 @@ EOF' sudo apt update rosdep update mkdir -p ${HOME}/catkin_ws/src -git clone https://github.com/CopterExpress/clover ${HOME}/catkin_ws/src/clover +git clone -b raspios_64bit https://github.com/CopterExpress/clover ${HOME}/catkin_ws/src/clover git clone https://github.com/CopterExpress/ros_led ${HOME}/catkin_ws/src/ros_led # These packages are missing from Noetic release, but are required for sitl_gazebo git clone https://github.com/ethz-asl/mav_comm ${HOME}/catkin_ws/src/mav_comm From 56e0f805db789f8e61d747a787a2b5e4b46cc975 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Mon, 26 Oct 2020 19:25:31 +0300 Subject: [PATCH 07/12] scripts: Temporarily disable rqt_multiplot installation It is not yet released for Noetic. May have to build it from sources for x86_64. --- scripts/installSoftware.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh index a8b0464..32a3c52 100644 --- a/scripts/installSoftware.sh +++ b/scripts/installSoftware.sh @@ -146,7 +146,7 @@ sudo cp ${HOME}/catkin_ws/src/clover/builder/assets/monkey.service /etc/systemd/ sudo systemctl enable monkey echo "--- Installing additional packages" -sudo -E sh -c 'apt update; apt install -y sshfs gvfs-fuse gvfs-backends python3-opencv byobu ipython3 byobu nmap lsof tmux vim ros-noetic-rqt-multiplot' +sudo -E sh -c 'apt update; apt install -y sshfs gvfs-fuse gvfs-backends python3-opencv byobu ipython3 byobu nmap lsof tmux vim' echo "--- Personalizing VM" sudo -E sh -c 'mv /etc/xdg/autostart/light-locker.desktop /etc/xdg/autostart/light-locker.desktop.old' From 244c678e463a9f18e63a0037468fc3f979aa8694 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Mon, 26 Oct 2020 21:36:54 +0300 Subject: [PATCH 08/12] scripts, ros_ide_vm: Disable screen autolock --- assets/configs/xfce4-power-manager.xml | 20 ++++++++++++++++++++ ros_ide_vm.json | 5 +++++ scripts/installSoftware.sh | 1 - 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 assets/configs/xfce4-power-manager.xml diff --git a/assets/configs/xfce4-power-manager.xml b/assets/configs/xfce4-power-manager.xml new file mode 100644 index 0000000..a336369 --- /dev/null +++ b/assets/configs/xfce4-power-manager.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/ros_ide_vm.json b/ros_ide_vm.json index 3abf695..ef38150 100644 --- a/ros_ide_vm.json +++ b/ros_ide_vm.json @@ -63,6 +63,11 @@ "source": "{{user `assetsDir`}}/patches", "destination": "/tmp" }, + { + "type": "file", + "source": "{{user `assetsDir`}}/configs/xfce4-power-manager.xml", + "destination": "/home/{{user `user`}}/.config/xfce4/xfconf/xfce-perchannel/xml/xfce4-power-manager.xml" + }, { "type": "shell", "script": "scripts/installSoftware.sh", diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh index 32a3c52..fab3ec6 100644 --- a/scripts/installSoftware.sh +++ b/scripts/installSoftware.sh @@ -149,7 +149,6 @@ echo "--- Installing additional packages" sudo -E sh -c 'apt update; apt install -y sshfs gvfs-fuse gvfs-backends python3-opencv byobu ipython3 byobu nmap lsof tmux vim' echo "--- Personalizing VM" -sudo -E sh -c 'mv /etc/xdg/autostart/light-locker.desktop /etc/xdg/autostart/light-locker.desktop.old' sudo -E sh -c 'cp /usr/share/xfce4/backdrops/xubuntu-wallpaper.png /usr/share/xfce4/backdrops/xubuntu-wallpaper-old.png; cp ${HOME}/Pictures/Logo_COEX_2019_white_on_black.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png' sudo -E sh -c 'hostnamectl set-hostname clover-dev; sed -i "s/ubuntu/clover-dev clover-dev.local/g" /etc/hosts' echo "export ROS_HOSTNAME=\`hostname\`.local" >> ${HOME}/.bashrc From 74a83d7159469de148dce6ba9e836fc58d001b62 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Mon, 26 Oct 2020 21:39:54 +0300 Subject: [PATCH 09/12] ros_ide_vm: Remove vscode configuration It's all Python3 now --- assets/vscode/settings.json | 3 --- ros_ide_vm.json | 5 ----- 2 files changed, 8 deletions(-) delete mode 100644 assets/vscode/settings.json diff --git a/assets/vscode/settings.json b/assets/vscode/settings.json deleted file mode 100644 index 6618585..0000000 --- a/assets/vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.pythonPath": "/usr/bin/python2.7" -} diff --git a/ros_ide_vm.json b/ros_ide_vm.json index ef38150..f169cd5 100644 --- a/ros_ide_vm.json +++ b/ros_ide_vm.json @@ -72,10 +72,5 @@ "type": "shell", "script": "scripts/installSoftware.sh", "execute_command": "PASSWORD='{{user `password`}}' bash '{{.Path}}'" - }, - { - "type": "file", - "source": "{{user `assetsDir`}}/vscode/", - "destination": "/home/{{user `user`}}/.config/Code/User/" }] } From de95bbb2bb03f2bd8a5d5598115ac7fdc6ba9496 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Mon, 26 Oct 2020 21:41:07 +0300 Subject: [PATCH 10/12] scripts: Build against the 22 branch --- build.sh | 2 +- scripts/installSoftware.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 1f2365c..3c51272 100755 --- a/build.sh +++ b/build.sh @@ -28,7 +28,7 @@ ${PACKER} build ros_ide_vm.json echo "--- Marking the VM" GIT_REV=$(git rev-parse --short HEAD) -VM_NAME="clover-devel_v0.20+${GIT_REV}.ova" +VM_NAME="clover-devel_v0.22+${GIT_REV}.ova" mv ./output-virtualbox-ovf/clover-devel.ova ./output-virtualbox-ovf/${VM_NAME} echo "--- All done!" diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh index fab3ec6..f9e3d61 100644 --- a/scripts/installSoftware.sh +++ b/scripts/installSoftware.sh @@ -89,7 +89,7 @@ EOF' sudo apt update rosdep update mkdir -p ${HOME}/catkin_ws/src -git clone -b raspios_64bit https://github.com/CopterExpress/clover ${HOME}/catkin_ws/src/clover +git clone -b 22 https://github.com/CopterExpress/clover ${HOME}/catkin_ws/src/clover git clone https://github.com/CopterExpress/ros_led ${HOME}/catkin_ws/src/ros_led # These packages are missing from Noetic release, but are required for sitl_gazebo git clone https://github.com/ethz-asl/mav_comm ${HOME}/catkin_ws/src/mav_comm From 5b599431a11e98e6085c6883ac4ea4d666d0d6b7 Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Mon, 26 Oct 2020 21:58:33 +0300 Subject: [PATCH 11/12] scripts: Re-add rqt_multiplot installation --- scripts/installSoftware.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh index f9e3d61..ad62ce6 100644 --- a/scripts/installSoftware.sh +++ b/scripts/installSoftware.sh @@ -146,7 +146,7 @@ sudo cp ${HOME}/catkin_ws/src/clover/builder/assets/monkey.service /etc/systemd/ sudo systemctl enable monkey echo "--- Installing additional packages" -sudo -E sh -c 'apt update; apt install -y sshfs gvfs-fuse gvfs-backends python3-opencv byobu ipython3 byobu nmap lsof tmux vim' +sudo -E sh -c 'apt update; apt install -y sshfs gvfs-fuse gvfs-backends python3-opencv byobu ipython3 byobu nmap lsof tmux vim ros-noetic-rqt-multiplot' echo "--- Personalizing VM" sudo -E sh -c 'cp /usr/share/xfce4/backdrops/xubuntu-wallpaper.png /usr/share/xfce4/backdrops/xubuntu-wallpaper-old.png; cp ${HOME}/Pictures/Logo_COEX_2019_white_on_black.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png' From d0670f123588a5144f41c5626f49c952f061780a Mon Sep 17 00:00:00 2001 From: Alexey Rogachevskiy Date: Tue, 27 Oct 2020 00:06:59 +0300 Subject: [PATCH 12/12] ros_ide_vm: Don't try to disable scrensaver Apparently there's more to it than just this one file. Need to investigate further. --- ros_ide_vm.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ros_ide_vm.json b/ros_ide_vm.json index f169cd5..bd96187 100644 --- a/ros_ide_vm.json +++ b/ros_ide_vm.json @@ -63,11 +63,6 @@ "source": "{{user `assetsDir`}}/patches", "destination": "/tmp" }, - { - "type": "file", - "source": "{{user `assetsDir`}}/configs/xfce4-power-manager.xml", - "destination": "/home/{{user `user`}}/.config/xfce4/xfconf/xfce-perchannel/xml/xfce4-power-manager.xml" - }, { "type": "shell", "script": "scripts/installSoftware.sh",