From 36f7c2212f1ea378a0629ca8fe43f8bb06356301 Mon Sep 17 00:00:00 2001
From: PX4BuildBot <bot@px4.io>
Date: Sat, 6 Feb 2021 00:32:56 +0000
Subject: [PATCH] Update PX4 Firmware metadata Sat Feb  6 00:32:56 UTC 2021

---
 src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml   | 14 ++++++++++++++
 src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml | 16 ++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml b/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
index 4cb0d43..087b566 100644
--- a/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
+++ b/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
@@ -890,6 +890,20 @@
       <output name="MAIN7">motor 3</output>
       <output name="MAIN8">motor 4</output>
     </airframe>
+    <airframe name="Generic Quadplane VTOL (PWM14)" id="13015" maintainer="">
+      <class>VTOL</class>
+      <maintainer />
+      <type>Standard VTOL</type>
+      <output name="MAIN1">motor 1</output>
+      <output name="MAIN2">motor 2</output>
+      <output name="MAIN3">motor 3</output>
+      <output name="MAIN4">motor 4</output>
+      <output name="MAIN5">Aileron 1</output>
+      <output name="MAIN6">Aileron 2</output>
+      <output name="MAIN7">Elevator</output>
+      <output name="MAIN8">Rudder</output>
+      <output name="MAIN9">Pusher motor</output>
+    </airframe>
   </airframe_group>
   <airframe_group name="VTOL Duo Tailsitter" image="VTOLDuoRotorTailSitter">
     <airframe name="Caipiroshka Duo Tailsitter" id="13001" maintainer="Roman Bapst &lt;roman@px4.io&gt;">
diff --git a/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml b/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
index 03b146d..6f13df2 100644
--- a/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
+++ b/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
@@ -1134,6 +1134,15 @@ Set -1 to disable the check</short_desc>
       <short_desc>Require valid mission to arm</short_desc>
       <long_desc>The default allows to arm the vehicle without a valid mission.</long_desc>
     </parameter>
+    <parameter name="COM_ARM_SDCARD" default="1" type="INT32">
+      <short_desc>Enable FMU SD card detection check</short_desc>
+      <long_desc>This check detects if the FMU SD card is missing. Depending on the value of the parameter, the check can be disabled, warn only or deny arming.</long_desc>
+      <values>
+        <value code="0">Disabled</value>
+        <value code="1">Warning only</value>
+        <value code="2">Enforce SD card presence</value>
+      </values>
+    </parameter>
     <parameter name="COM_ARM_SWISBTN" default="0" type="INT32" boolean="true">
       <short_desc>Arm switch is only a button</short_desc>
       <long_desc>The default uses the arm switch as real switch. If parameter set button gets handled like stick arming.</long_desc>
@@ -5425,6 +5434,13 @@ the setpoint will be capped to MPC_XY_VEL_MAX</short_desc>
       <decimal>2</decimal>
       <increment>1</increment>
     </parameter>
+    <parameter name="MPC_XY_ERR_MAX" default="2.0" type="FLOAT">
+      <short_desc>Maximum horizontal error allowed by the trajectory generator</short_desc>
+      <long_desc>The integration speed of the trajectory setpoint is linearly reduced with the horizontal position tracking error. When the error is above this parameter, the integration of the trajectory is stopped to wait for the drone. This value can be adjusted depending on the tracking capabilities of the vehicle.</long_desc>
+      <min>0.1</min>
+      <max>10.0</max>
+      <decimal>1</decimal>
+    </parameter>
     <parameter name="MPC_XY_MAN_EXPO" default="0.6" type="FLOAT">
       <short_desc>Manual position control stick exponential curve sensitivity</short_desc>
       <long_desc>The higher the value the less sensitivity the stick has around zero while still reaching the maximum value with full stick deflection. 0 Purely linear input curve (default) 1 Purely cubic input curve</long_desc>