fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-23 08:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

update mavlink submodule to latest

Browse Source 
- update MAV_TYPE VTOL usage for current mavlink
This commit is contained in:
Daniel Agar
2022-04-07 20:35:41 +02:00
committed by Lorenz Meier
parent a5bd65b923
commit 98623f69a3
7 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink
+1 -1
Submodule src/modules/mavlink/mavlink updated: b568a60fca...0133e5db7f
src/modules/mavlink/mavlink_params.c
+4 -3
View File
@@ -90,10 +90,11 @@ PARAM_DEFINE_INT32(MAV_SIK_RADIO_ID, 0);
* @value 13 Hexarotor
* @value 14 Octorotor
* @value 15 Tricopter
* @value 19 VTOL Tailsitter Duo
* @value 20 VTOL Tailsitter Quad
* @value 19 VTOL Two-rotor Tailsitter
* @value 20 VTOL Quad-rotor Tailsitter
* @value 21 VTOL Tiltrotor
* @value 22 VTOL Standard (quadplane)
* @value 22 VTOL Standard (separate fixed rotors for hover and cruise flight)
* @value 23 VTOL Tailsitter
* @group MAVLink
*/
PARAM_DEFINE_INT32(MAV_TYPE, 0);
src/modules/mavlink/mavlink_receiver.cpp
+4 -4
View File
@@ -1513,11 +1513,11 @@ void MavlinkReceiver::fill_thrust(float *thrust_body_array, uint8_t vehicle_type
thrust_body_array[0] = thrust;
break;
case MAV_TYPE_VTOL_DUOROTOR:
case MAV_TYPE_VTOL_QUADROTOR:
case MAV_TYPE_VTOL_TAILSITTER_DUOROTOR:
case MAV_TYPE_VTOL_TAILSITTER_QUADROTOR:
case MAV_TYPE_VTOL_TILTROTOR:
case MAV_TYPE_VTOL_RESERVED2:
case MAV_TYPE_VTOL_RESERVED3:
case MAV_TYPE_VTOL_FIXEDROTOR:
case MAV_TYPE_VTOL_TAILSITTER:
case MAV_TYPE_VTOL_RESERVED4:
case MAV_TYPE_VTOL_RESERVED5:
switch (vehicle_type) {
src/modules/mavlink/streams/HIL_ACTUATOR_CONTROLS.hpp
+6 -6
View File
@@ -93,9 +93,9 @@ private:
if (system_type == MAV_TYPE_QUADROTOR ||
system_type == MAV_TYPE_HEXAROTOR ||
system_type == MAV_TYPE_OCTOROTOR ||
system_type == MAV_TYPE_VTOL_DUOROTOR ||
system_type == MAV_TYPE_VTOL_QUADROTOR ||
system_type == MAV_TYPE_VTOL_RESERVED2) {
system_type == MAV_TYPE_VTOL_TAILSITTER_DUOROTOR ||
system_type == MAV_TYPE_VTOL_TAILSITTER_QUADROTOR ||
system_type == MAV_TYPE_VTOL_FIXEDROTOR) {
/* multirotors: set number of rotor outputs depending on type */
@@ -110,15 +110,15 @@ private:
n = 6;
break;
case MAV_TYPE_VTOL_DUOROTOR:
case MAV_TYPE_VTOL_TAILSITTER_DUOROTOR:
n = 2;
break;
case MAV_TYPE_VTOL_QUADROTOR:
case MAV_TYPE_VTOL_TAILSITTER_QUADROTOR:
n = 4;
break;
case MAV_TYPE_VTOL_RESERVED2:
case MAV_TYPE_VTOL_FIXEDROTOR:
n = 8;
break;