Skip to content

Commit aac4cd4

Browse files
committed
Merge remote-tracking branch 'origin/master' into mmosca-msp-gps-ublox-command
2 parents d993c26 + 8d970cc commit aac4cd4

File tree

156 files changed

+4215
-1389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+4215
-1389
lines changed

.vscode/tasks.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
"version": "2.0.0",
55
"tasks": [
66
{
7-
"label": "Build Matek F722-SE",
7+
"label": "Build AOCODARCH7DUAL",
88
"type": "shell",
9-
"command": "make MATEKF722SE",
9+
"command": "make AOCODARCH7DUAL",
1010
"group": "build",
1111
"problemMatcher": [],
1212
"options": {
1313
"cwd": "${workspaceFolder}/build"
1414
}
1515
},
1616
{
17-
"label": "Build Matek F722",
17+
"label": "Build AOCODARCH7DUAL",
1818
"type": "shell",
19-
"command": "make MATEKF722",
19+
"command": "make AOCODARCH7DUAL",
2020
"group": {
2121
"kind": "build",
2222
"isDefault": true

build_docs.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ doc_files=(
2121
'Buzzer.md'
2222
'Sonar.md'
2323
'Profiles.md'
24-
'Modes.md'
2524
'Inflight Adjustments.md'
2625
'Controls.md'
2726
'Gtune.md'
@@ -49,7 +48,7 @@ if which gimli >/dev/null; then
4948
done
5049
rm -f ${filename}.pdf
5150
gimli -f ${filename}.md -stylesheet override.css \
52-
-w '--toc --title "Cleanflight Manual" --footer-right "[page]" --toc-depth 1'
51+
-w '--toc --title "INAV Manual" --footer-right "[page]" --toc-depth 1'
5352
rm ${filename}.md
5453
popd >/dev/null
5554
else

cmake/arm-none-eabi-checks.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function(arm_none_eabi_gcc_install)
4747
host_uname_machine(machine)
4848
if(machine STREQUAL "x86_64" OR machine STREQUAL "amd64")
4949
set(dist ${arm_none_eabi_darwin_amd64})
50-
elseif(machine STREQUAL "aarch64")
50+
elseif(machine STREQUAL "aarch64" OR machine STREQUAL "arm64")
5151
set(dist ${arm_none_eabi_darwin_aarch64})
5252
else()
5353
message("-- no precompiled ${arm_none_eabi_triplet} toolchain for machine ${machine}")

cmake/sitl.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ set(SITL_LINK_OPTIONS
3434
-Wl,-L${STM32_LINKER_DIR}
3535
)
3636

37-
if(${WIN32} OR ${CYGWIN})
37+
if(${CYGWIN})
3838
set(SITL_LINK_OPTIONS ${SITL_LINK_OPTIONS} "-static-libgcc")
3939
endif()
4040

@@ -131,7 +131,7 @@ function (target_sitl name)
131131
target_link_options(${exe_target} PRIVATE -T${script_path})
132132
endif()
133133

134-
if(${WIN32} OR ${CYGWIN})
134+
if(${CYGWIN})
135135
set(exe_filename ${CMAKE_BINARY_DIR}/${binary_name}.exe)
136136
else()
137137
set(exe_filename ${CMAKE_BINARY_DIR}/${binary_name})

docs/API/MSP_extensions.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Unassigned slots have rangeStartStep == rangeEndStep. Each element contains the
2323

2424
| Data | Type | Notes |
2525
|------|------|-------|
26-
| permanentId | uint8 | See Modes.md for a definition of the permanent ids |
26+
| permanentId | uint8 | See [Modes in the wiki](https://github.com/iNavFlight/inav/wiki/Modes) for a definition of the permanent ids |
2727
| auxChannelIndex | uint8 | The Aux switch number (indexed from 0) |
2828
| rangeStartStep | uint8 | The start value for this element in 'blocks' of 25 where 0 == 900 and 48 == 2100 |
2929
| 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.
4545
| Data | Type | Notes |
4646
|------|------|-------|
4747
| sequence id | uint8 | A monotonically increasing ID, from 0 to the number of slots -1 |
48-
| permanentId | uint8 | See Modes.md for a definition of the permanent ids |
48+
| permanentId | uint8 | See [Modes in the wiki](https://github.com/iNavFlight/inav/wiki/Modes) for a definition of the permanent ids |
4949
| auxChannelIndex | uint8 | The Aux channel number (indexed from 0) |
5050
| rangeStartStep | uint8 | The start value for this element in 'blocks' of 25 where 0 == 900 and 48 == 2100 |
5151
| rangeEndStep | uint8 | The end value for this element in 'blocks' of 25 where 0 == 900 and 48 == 2100 |
@@ -157,5 +157,5 @@ INAV.
157157

158158
See also
159159
--------
160-
Modes.md describes the user visible implementation for the INAV
160+
[The wiki](https://github.com/iNavFlight/inav/wiki/Modes) describes the user visible implementation for the INAV
161161
modes extension.

docs/ESC and servo outputs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ INAV support the following ESC protocols:
1313

1414
ESC protocol can be selected in Configurator. No special configuration is required.
1515

16-
Check ESC documentation of the list of protocols that it is supporting.
16+
Check the ESC documentation for the list of protocols that are supported.
1717

1818
## Servo outputs
1919

docs/Fixed Wing Landing.md

+22-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
INAV supports advanced automatic landings for fixed wing aircraft from version 7.1.
66
The procedure is based on landings for man-carrying aircraft, so that safe landings at a specific location are possible.
77
Supported are landings at safehome after "Return to Home" or at a defined LAND waypoint for missions.
8+
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.
9+
This enables up to 4 different approach directions, based on the landing site and surrounding area.
810

911
## General procedure:
1012

@@ -34,7 +36,7 @@ The following graphics illustrate the process:
3436

3537
### The following parameters are set for each landing site (Safefome/LAND waypoint):
3638

37-
All settings can also be conveniently made in the Configurator via Missionplanner.
39+
All settings can also be conveniently made in the Configurator via Mission Control.
3840

3941
CLI command `fwapproach`:
4042
`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.
5456
> [!CAUTION]
5557
> 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.
5658
57-
### Global paramters
59+
### Global parameters
5860

5961
All settings are available via “Advanced Tuning” in the Configurator.
6062

@@ -80,14 +82,31 @@ In degrees. Min: 0, Max: 45, Default: 0
8082
* `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).
8183
In cm/s. Min: 0; Max: 3000, Default: 140
8284

85+
### General paramters and tuning tips
86+
87+
* `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.
88+
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.
89+
90+
* `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.
91+
The Craft should not get slower and not speed ub significantly during a navigation climb, if P2T is tuned properly.
92+
93+
* `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.
94+
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.
95+
96+
* 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.
97+
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:
98+
99+
![Test Waypoint Track](https://github.com/iNavFlight/inav/assets/33039058/a929cd0c-80b1-42d6-815d-89a90e9daa1b)
100+
101+
83102
## Waypoint missions
84103

85104
Only one landing waypoint per mission can be active and saved and the landing waypoint must be the last waypoint of the mission.
86105
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".
87106

88107
## Logic Conditions
89108

90-
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.
109+
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.
91110

92111
| Returned value | State |
93112
| --- | --- |

docs/Getting Started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Now, there are two ways to [configure CF](Configuration.md); via the Configurat
7070
* Verify the range of each channel goes from ~1000 to ~2000. See also [controls](Controls.md). and `rx_min_usec` and `rx_max_usec`.
7171
* You can also set EXPO here instead of your Tx.
7272
* Click Save!
73-
* 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.
73+
* Modes tab: Setup the desired modes. See the [Modes in the wiki](https://github.com/iNavFlight/inav/wiki/Modes) for what each mode does.
7474

7575
* 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.
7676

0 commit comments

Comments
 (0)