Merge remote-tracking branch 'upstream/master' into abo_fw_alt_vel_co…

…ntrol
breadoven · Apr 21, 2024 · 5126043 · 5126043
2 parents 19f02f7 + 1ef428e
commit 5126043
Show file tree

Hide file tree

Showing 152 changed files with 4,157 additions and 1,366 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -4,19 +4,19 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Build Matek F722-SE",
+            "label": "Build AOCODARCH7DUAL",
             "type": "shell",
-            "command": "make MATEKF722SE",
+            "command": "make AOCODARCH7DUAL",
             "group": "build",
             "problemMatcher": [],
             "options": {
                 "cwd": "${workspaceFolder}/build"
             }
         },
         {
-            "label": "Build Matek F722",
+            "label": "Build AOCODARCH7DUAL",
             "type": "shell",
-            "command": "make MATEKF722",
+            "command": "make AOCODARCH7DUAL",
             "group": {
                 "kind": "build",
                 "isDefault": true

diff --git a/build_docs.sh b/build_docs.sh
@@ -21,7 +21,6 @@ doc_files=(
 	'Buzzer.md'
 	'Sonar.md'
 	'Profiles.md'
-	'Modes.md'
 	'Inflight Adjustments.md'
 	'Controls.md'
 	'Gtune.md'
@@ -49,7 +48,7 @@ if which gimli >/dev/null; then
 	done
 	rm -f ${filename}.pdf
 	gimli -f ${filename}.md -stylesheet override.css \
-	  -w '--toc --title "Cleanflight Manual" --footer-right "[page]" --toc-depth 1'
+	  -w '--toc --title "INAV Manual" --footer-right "[page]" --toc-depth 1'
 	rm ${filename}.md
 	popd >/dev/null
 else

diff --git a/cmake/arm-none-eabi-checks.cmake b/cmake/arm-none-eabi-checks.cmake
@@ -47,7 +47,7 @@ function(arm_none_eabi_gcc_install)
         host_uname_machine(machine)
         if(machine STREQUAL "x86_64" OR machine STREQUAL "amd64")
             set(dist ${arm_none_eabi_darwin_amd64})
-        elseif(machine STREQUAL "aarch64")
+        elseif(machine STREQUAL "aarch64" OR machine STREQUAL "arm64")
             set(dist ${arm_none_eabi_darwin_aarch64})
         else()
             message("-- no precompiled ${arm_none_eabi_triplet} toolchain for machine ${machine}")

diff --git a/docs/API/MSP_extensions.md b/docs/API/MSP_extensions.md
@@ -23,7 +23,7 @@ Unassigned slots have rangeStartStep == rangeEndStep. Each element contains the
 
 | Data | Type | Notes |
 |------|------|-------|
-| permanentId | uint8 | See Modes.md for a definition of the permanent ids |
+| permanentId | uint8 | See [Modes in the wiki](https://github.com/iNavFlight/inav/wiki/Modes) for a definition of the permanent ids |
 | auxChannelIndex | uint8 | The Aux switch number (indexed from 0) |
 | rangeStartStep | uint8 | The start value for this element in 'blocks' of 25  where 0 == 900 and 48 == 2100 |
 | rangeEndStep | uint8 | The end value for this element in 'blocks' of 25 where 0 == 900 and 48 == 2100 |
@@ -45,7 +45,7 @@ sending this message for all auxiliary slots.
 | Data | Type | Notes |
 |------|------|-------|
 | sequence id | uint8 | A monotonically increasing ID, from 0 to the number of slots -1 |
-| permanentId | uint8 | See Modes.md for a definition of the permanent ids |
+| permanentId | uint8 | See [Modes in the wiki](https://github.com/iNavFlight/inav/wiki/Modes) for a definition of the permanent ids |
 | auxChannelIndex | uint8 | The Aux channel number (indexed from 0) |
 | rangeStartStep | uint8 | The start value for this element in 'blocks' of 25  where 0 == 900 and 48 == 2100 |
 | rangeEndStep | uint8 | The end value for this element in 'blocks' of 25 where 0 == 900 and 48 == 2100 |
@@ -157,5 +157,5 @@ INAV.
 
 See also
 --------
-Modes.md describes the user visible implementation for the INAV
+[The wiki](https://github.com/iNavFlight/inav/wiki/Modes) describes the user visible implementation for the INAV
 modes extension.
diff --git a/docs/Fixed Wing Landing.md b/docs/Fixed Wing Landing.md
@@ -5,6 +5,8 @@
 INAV supports advanced automatic landings for fixed wing aircraft from version 7.1.
 The procedure is based on landings for man-carrying aircraft, so that safe landings at a specific location are possible.
 Supported are landings at safehome after "Return to Home" or at a defined LAND waypoint for missions. 
+Every landing locations can be defined with a target point and 2 different approach headings (colinear to the landing strips) with exclusive direction or opposite directions allowed. 
+This enables up to 4 different approach directions, based on the landing site and surrounding area. 
 
 ## General procedure:
 
@@ -34,7 +36,7 @@ The following graphics illustrate the process:
 
 ### The following parameters are set for each landing site (Safefome/LAND waypoint):
 
-All settings can also be conveniently made in the Configurator via Missionplanner.
+All settings can also be conveniently made in the Configurator via Mission Control.
 
 CLI command `fwapproach`:
 `fwapproach <index> <Approach altitude> <Land altitude> <Approach direction> <approach heading 1> <approach heading 2> <sea level>`
@@ -54,7 +56,7 @@ This means that practically 4 landing directions can be saved.
 > [!CAUTION]
 > The Configuator automatically determines the ground altitude based on databases on the Internet, which may be inaccurate. Please always compare with the measured GPS altitude at the landing site to avoid crashes.
 
-### Global paramters
+### Global parameters
 
 All settings are available via “Advanced Tuning” in the Configurator.
 
@@ -80,14 +82,31 @@ In degrees. Min: 0, Max: 45, Default: 0
 * `nav_fw_land_max_tailwind`: Max. tailwind if no landing direction with downwind is available. Wind strengths below this value are ignored (error tolerance in the wind measurement). Landing then takes place in the main direction. If, for example, 90 degrees is configured, landing takes place in this direction, NOT in 270 degrees (see above).
 In cm/s. Min: 0; Max: 3000, Default: 140
 
+### General paramters and tuning tips
+
+* `nav_fw_wp_tracking_accuracy`: Its highly recommended that this parameter is used and tuned well. Only with WP-Tracking enabled, the Aircraft will try to precisely align with the runway during approach. 
+If WP-Tracking is not used, the Plane will head straight to the landiung location without flying in line with the intended landing strip. Wind can intensively alter the final landing heading.
+
+* `nav_fw_pitch2thr`: The navigation throttle modifier has to be tuned well to allow stable navigation during climbs and descents to prevent a stall. Make sure your plane maintains Ground or Airspeed, when climbing in any navigation mode. 
+The Craft should not get slower and not speed ub significantly during a navigation climb, if P2T is tuned properly.
+
+* `nav_wp_radius`: This parameter might be too high if you have set up your craft with INAV 6 or INAV 7. With a too high value, the turning points for the Crosswind-Leg and Final Approach are hit too early and make it difficult for the plane to align to the runway or cut short the approach. 
+Make sure this parameter is not set greater than 1000 (cm). The better your craft and navigation system is tuned, the lower this value can be. We recommend to start with 1000 for flying wings and 800 for a Plane with Tail.
+
+* Test your Navigation-Tuning: A better Navigation-Tune will reward you with smoother and more reliable landings. To test your nav systems limit, we recommend to create a waypoint missions with many 90° turn angles with shorter and shorter tracks. 
+With this Method, you can find out how well your plane can follow a navigation path and how long it takes to align to a waypoint track. A well tuned plane should be able to pull of a WP Mission that looks like this, where the distance between WP6 and WP7 si recommended to be the minimum approach length: 
+
+![Test Waypoint Track](https://github.com/iNavFlight/inav/assets/33039058/a929cd0c-80b1-42d6-815d-89a90e9daa1b)
+
+
 ## Waypoint missions
 
 Only one landing waypoint per mission can be active and saved and the landing waypoint must be the last waypoint of the mission. 
 If the altitude of the waypoint and the "Approach Altitude" are different, the altitude of the waypoint is approached first and then the altitude is corrected to "Approach Altitude".
 
 ## Logic Conditions
 
-The current landing state can be retrieved via ID 41 in "Flight" (FW Land State). This allows additional actions to be executed according to the landing phases, e.g. deplyoment of the landing flaps.
+The current landing state can be retrieved via ID 41 in "Flight" (FW Land State). This allows additional actions to be executed according to the landing phases, e.g. deployment of the landing flaps.
 
 | Returned value | State |
 | --- | --- |

diff --git a/docs/Getting Started.md b/docs/Getting Started.md
@@ -70,7 +70,7 @@ Now, there are two ways to [configure CF](Configuration.md); via  the Configurat
     * Verify the range of each channel goes from ~1000 to ~2000.  See also [controls](Controls.md). and `rx_min_usec` and `rx_max_usec`.
     * You can also set EXPO here instead of your Tx.
     * Click Save!
-* Modes tab: Setup the desired modes. See the [modes](Modes.md) chapter for what each mode does, but for the beginning you mainly need HORIZON, if any.
+* Modes tab: Setup the desired modes. See the [Modes in the wiki](https://github.com/iNavFlight/inav/wiki/Modes) for what each mode does.
 
 * Before finishing this section, you should calibrate the ESCs, install the FC to the frame, and connect the RSSI cable, buzzer and battery if you have chosen to use those.