Merge pull request #2 from PX4/pr-upstream-merge

27/11/2021 upstream merge

.github/workflows/build_test.yml

@@ -15,8 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         container:
-        - 'px4io/px4-dev-simulation-focal:2020-11-18' # Gazebo 11
-        - 'px4io/px4-dev-simulation-bionic:2020-11-18' # Gazebo 9
+        - 'px4io/px4-dev-simulation-focal:2021-09-08' # Gazebo 11
+        - 'px4io/px4-dev-simulation-bionic:2021-09-08' # Gazebo 9
     container: ${{ matrix.container }}
     steps:
     - uses: actions/checkout@v1

.github/workflows/firmware_build_test.yml

@@ -36,8 +36,9 @@ jobs:
         git submodule update --init --recursive
       working-directory: Firmware
     - name: Configure Firmware to include current px4-simulation-ignition version
-      working-directory: Firmware/Tools/sitl_ign_gazebo
+      working-directory: Firmware/Tools/simulation-ignition
       run: |
+        git remote set-url origin https://github.com/Auterion/px4-simulation-ignition.git
         git fetch origin pull/${{github.event.pull_request.number}}/head:${{github.head_ref}} || echo "Couldn't find the feature branch of the pull request, using default branch"
         git checkout ${{github.head_ref}}
     - name: Prepare ccache timestamp

include/gazebo_mavlink_interface.h

@@ -72,7 +72,7 @@
 
 #include <common.h>
 
-#include <common/mavlink.h>
+#include <development/mavlink.h>
 #include "msgbuffer.h"
 #include "mavlink_interface.h"
 

include/mavlink_interface.h

@@ -49,7 +49,7 @@
 
 #include <Eigen/Eigen>
 
-#include <common/mavlink.h>
+#include <development/mavlink.h>
 #include "msgbuffer.h"
 
 static const uint32_t kDefaultMavlinkUdpPort = 14560;

include/msgbuffer.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <cassert>
-#include <common/mavlink.h>
+#include <development/mavlink.h>
 
 /**
  * @brief Message buffer for internal use in libmavconn