Fix making symlink to Clover model

* Use original PX4 v1.12

* Disable patching sitl_gazebo

* Fix

* Add Clover airframe to PX4

* Fix

.github/workflows/main.yml

@@ -20,6 +20,7 @@ jobs:
       - name: Build
         run: ./build.sh
       - name: Upload
+        if: ${{ github.event_name == 'release' }}
         # Not using ready S3 actions, because they either don't run on macOS machines or don't support changing the endpoint
         run: |
           AWS_ACCESS_KEY_ID=${{secrets.S3_KEY}} AWS_SECRET_ACCESS_KEY=${{secrets.S3_SECRET_KEY}} aws s3 sync . s3://clovervm/ --acl public-read --endpoint-url https://ams3.digitaloceanspaces.com --no-progress

assets/desktop/jMAVSim.desktop

@@ -3,7 +3,7 @@ Version=1.0
 Type=Application
 Name=jMAVSim
 Comment=A lightweight PX4 simulator
-Exec=/bin/bash -c 'cd ~/Firmware; make px4_sitl jmavsim'
+Exec=/bin/bash -c 'cd ~/PX4-Autopilot; make px4_sitl jmavsim'
 Icon=openjdk-8
 Path=
 Terminal=true

assets/patches/sitl_gazebo.patch

@@ -1,16 +1,3 @@
-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/cmake/FindMAVLink.cmake b/cmake/FindMAVLink.cmake
 index 8de3079..3fdae02 100644
 --- a/cmake/FindMAVLink.cmake
@@ -19,7 +6,7 @@ index 8de3079..3fdae02 100644
      ${CMAKE_SOURCE_DIR}/mavlink/
      ../../mavlink/
      ../mavlink/
-+    $ENV{HOME}/Firmware/mavlink/include
++    $ENV{HOME}/PX4-Autopilot/mavlink/include
      ${CATKIN_DEVEL_PREFIX}/
      )
  

scripts/install_software.sh

@@ -31,26 +31,20 @@ rosdep update
 # FIXME: PX4 needs pip to be installed
 # FIXME: python2 dependencies?
 echo "--- Downloading PX4 and installing its dependencies"
-
+git clone --recursive --depth 1 --branch v1.12.0 https://github.com/PX4/PX4-Autopilot.git ${HOME}/PX4-Autopilot
-# v1.11.1, TODO: update to v1.12, remove Gazebo downgrade
+# PX4 v1.11.1 script will happily run sudo by itself
-#git clone --recursive -b v1.11.1-clover https://github.com/CopterExpress/Firmware ${HOME}/Firmware
+${HOME}/PX4-Autopilot/Tools/setup/ubuntu.sh
-## PX4 v1.11.1 script will happily run sudo by itself
+# Ubuntu 20.04 no longer sets assistive_technologies, thankfully
-#${HOME}/Firmware/Tools/setup/ubuntu.sh
-## Ubuntu 20.04 no longer sets assistive_technologies, thankfully
-
-# v1.10.1:
-git clone -b v1.10.1-clover https://github.com/CopterExpress/Firmware ${HOME}/Firmware
-sudo -E sh -c 'apt-get update; apt-get install -y python3-pip'
-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
 
 echo "--- Prebuilding PX4 SITL configuration"
-make -C ${HOME}/Firmware px4_sitl
+make -C ${HOME}/PX4-Autopilot px4_sitl
 echo "--- Patching gazebo plugins for SITL"
-cd ${HOME}/Firmware/Tools/sitl_gazebo
+# cd ${HOME}/PX4-Autopilot/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 'export SVGA_VGPU10=0' >> ${HOME}/PX4-Autopilot/Tools/setup_gazebo.bash
+
+echo "source /usr/share/gazebo/setup.sh" >> ~/.bashrc
+echo "export SVGA_VGPU10=0" >> ~/.bashrc
 
 echo "source /opt/ros/noetic/setup.bash" >> ~/.bashrc
 
@@ -103,8 +97,8 @@ 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
 # Make PX4 and Gazebo plugins visible in the workspace
-ln -s ${HOME}/Firmware ${HOME}/catkin_ws/src/Firmware
+ln -s ${HOME}/PX4-Autopilot ${HOME}/catkin_ws/src/PX4-Autopilot
-ln -s ${HOME}/Firmware/Tools/sitl_gazebo ${HOME}/catkin_ws/src/sitl_gazebo
+ln -s ${HOME}/PX4-Autopilot/Tools/sitl_gazebo ${HOME}/catkin_ws/src/sitl_gazebo
 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
@@ -112,7 +106,10 @@ source /opt/ros/noetic/setup.bash
 cd ${HOME}/catkin_ws && catkin_make
 echo "source ${HOME}/catkin_ws/devel/setup.bash" >> ~/.bashrc
 
-sudo -E sh -c 'apt-get update; apt-get install -y gazebo9' # downgrade Gazebo to 9 to make PX4 v1.10.1 work
+source $HOME/catkin_ws/devel/setup.bash
+
+echo "--- Adding Clover vehicle startup script to PX4"
+ln -s "$(catkin_find clover_simulation airframes)"/* $HOME/PX4-Autopilot/ROMFS/px4fmu_common/init.d-posix/airframes/
 
 echo "--- Installing npm"
 cd ${HOME}
@@ -175,7 +172,7 @@ python2 --version
 python3 --version
 # ipython --version
 ipython3 --version
-gazebo --version || true # FIXME: Gazebo exist with 255 on --version somehow
+gazebo --version || true # FIXME: Gazebo exits with 255 on --version somehow
 node -v
 npm -v
 byobu --version
@@ -185,9 +182,10 @@ pip --version
 pip3 --version
 monkey --version
 systemctl --version
+# TODO: add Python tests
 
-source $HOME/catkin_ws/devel/setup.bash
 roscore -h
+rosversion px4
 rosversion clover
 rosversion aruco_pose
 rosversion mavros