Merge branch 'master' into patch-1

mavlink · Aug 6, 2024 · c662428 · c662428
2 parents dcf7677 + 6b65fc1
commit c662428
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/docs/en/qgc-dev-guide/tools/index.md b/docs/en/qgc-dev-guide/tools/index.md
@@ -10,7 +10,7 @@ and accessing the System Shell over MAVLink.
 
 Tools include:
 
-- **[Mock Link](../tools/mock_link.md)** (Daily Builds only) - Creates and stops multiple simulated vehicle links.
+- **[Mock Link](../tools/mock_link.md)** (Debug Builds only) - Creates and stops multiple simulated vehicle links.
 - **[Replay Flight Data](../../qgc-user-guide/fly_view/replay_flight_data.md)** - Replay a telemetry log (User Guide).
 - **[MAVLink Inspector](../../qgc-user-guide/analyze_view/mavlink_inspector.html)** - Display received MAVLink messages/values and plot trends.
 - **[MAVLink Console](../../qgc-user-guide/analyze_view/mavlink_console.html)** (PX4 Only) - Connect to the PX4 nsh shell and send commands.
diff --git a/docs/ko/qgc-dev-guide/tools/index.md b/docs/ko/qgc-dev-guide/tools/index.md
@@ -10,7 +10,7 @@ and accessing the System Shell over MAVLink.
 
 Tools include:
 
-- **[Mock Link](../tools/mock_link.md)** (Daily Builds only) - Creates and stops multiple simulated vehicle links.
+- **[Mock Link](../tools/mock_link.md)** (Debug Builds only) - Creates and stops multiple simulated vehicle links.
 - **[Replay Flight Data](../../qgc-user-guide/fly_view/replay_flight_data.md)** - Replay a telemetry log (User Guide).
 - **[MAVLink Inspector](../../qgc-user-guide/analyze_view/mavlink_inspector.html)** - Display received MAVLink messages/values and plot trends.
 - **[MAVLink Console](../../qgc-user-guide/analyze_view/mavlink_console.html)** (PX4 Only) - Connect to the PX4 nsh shell and send commands.
diff --git a/docs/tr/qgc-dev-guide/tools/index.md b/docs/tr/qgc-dev-guide/tools/index.md
@@ -10,7 +10,7 @@ and accessing the System Shell over MAVLink.
 
 Tools include:
 
-- **[Mock Link](../tools/mock_link.md)** (Daily Builds only) - Creates and stops multiple simulated vehicle links.
+- **[Mock Link](../tools/mock_link.md)** (Debug Builds only) - Creates and stops multiple simulated vehicle links.
 - **[Replay Flight Data](../../qgc-user-guide/fly_view/replay_flight_data.md)** - Replay a telemetry log (User Guide).
 - **[MAVLink Inspector](../../qgc-user-guide/analyze_view/mavlink_inspector.html)** - Display received MAVLink messages/values and plot trends.
 - **[MAVLink Console](../../qgc-user-guide/analyze_view/mavlink_console.html)** (PX4 Only) - Connect to the PX4 nsh shell and send commands.
diff --git a/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml b/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
@@ -2519,7 +2519,7 @@
       <decimal>2</decimal>
       <increment>0.1</increment>
     </parameter>
-    <parameter name="FW_T_SPD_STD" default="0.2" type="FLOAT">
+    <parameter name="FW_T_SPD_STD" default="0.07" type="FLOAT">
       <short_desc>Airspeed measurement standard deviation</short_desc>
       <long_desc>For the airspeed filter in TECS.</long_desc>
       <min>0.01</min>
@@ -3688,6 +3688,14 @@
       <decimal>1</decimal>
       <increment>0.5</increment>
     </parameter>
+    <parameter name="NAV_MIN_GND_DIST" default="-1." type="FLOAT">
+      <short_desc>Minimum height above ground during Mission and RTL</short_desc>
+      <long_desc>Minimum height above ground the vehicle is allowed to descend to during Mission and RTL, excluding landing commands. Requires a distance sensor to be set up. Note: only prevents the vehicle from descending further, but does not force it to climb. Set to a negative value to disable.</long_desc>
+      <min>-1</min>
+      <unit>m</unit>
+      <decimal>1</decimal>
+      <increment>1</increment>
+    </parameter>
     <parameter name="NAV_MIN_LTR_ALT" default="-1." type="FLOAT">
       <short_desc>Minimum Loiter altitude</short_desc>
       <long_desc>This is the minimum altitude above Home the system will always obey in Loiter (Hold) mode if switched into this mode without specifying an altitude (e.g. through Loiter switch on RC). Doesn't affect Loiters that are part of Missions or that are entered through a reposition setpoint ("Go to"). Set to a negative value to disable.</long_desc>