Merge tag '7.1.2' into 7.1.2_unofficial_targets

.gitignore

@@ -22,6 +22,7 @@ cov-int*
 /downloads/
 /debug/
 /release/
+/*_SITL/
 
 # script-generated files
 docs/Manual.pdf

.vscode/c_cpp_properties.json

@@ -0,0 +1,66 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceRoot}/src/main/**",
+                "${workspaceRoot}/lib/main/**",
+                "/usr/include/**"
+            ],
+            "browse": {
+                "limitSymbolsToIncludedHeaders": false,
+                "path": [
+                    "${workspaceRoot}/src/main/**",
+                    "${workspaceRoot}/lib/main/**"
+                ]
+            },
+            "intelliSenseMode": "linux-gcc-arm",
+            "cStandard": "c11",
+            "cppStandard": "c++17",
+            "defines": [
+                "MCU_FLASH_SIZE 512",
+                "USE_NAV",
+                "NAV_FIXED_WING_LANDING",
+                "USE_OSD",
+                "USE_GYRO_NOTCH_1",
+                "USE_GYRO_NOTCH_2",
+                "USE_DTERM_NOTCH",
+                "USE_ACC_NOTCH",
+                "USE_GYRO_BIQUAD_RC_FIR2",
+                "USE_D_BOOST",
+                "USE_SERIALSHOT",
+                "USE_ANTIGRAVITY",
+                "USE_ASYNC_GYRO_PROCESSING",
+                "USE_RPM_FILTER",
+                "USE_GLOBAL_FUNCTIONS",
+                "USE_DYNAMIC_FILTERS",
+                "USE_IMU_BNO055",
+                "USE_SECONDARY_IMU",
+                "USE_DSHOT",
+                "FLASH_SIZE 480",
+                "USE_I2C_IO_EXPANDER",
+                "USE_PCF8574",
+                "USE_ESC_SENSOR",
+                "USE_PROGRAMMING_FRAMEWORK",
+                "USE_SERIALRX_GHST",
+                "USE_TELEMETRY_GHST",
+                "USE_CMS",
+                "USE_DJI_HD_OSD",
+                "USE_GYRO_KALMAN",
+                "USE_RANGEFINDER",
+                "USE_RATE_DYNAMICS",
+                "USE_SMITH_PREDICTOR",
+                "USE_ALPHA_BETA_GAMMA_FILTER",
+                "USE_MAG_VCM5883",
+                "USE_TELEMETRY_JETIEXBUS",
+                "USE_NAV",
+                "USE_SDCARD_SDIO",
+                "USE_SDCARD",
+                "USE_Q_TUNE",
+                "USE_GYRO_FFT_FILTER"
+            ],
+            "configurationProvider": "ms-vscode.cmake-tools"
+        }
+    ],
+    "version": 4
+}

.vscode/settings.json

@@ -2,11 +2,15 @@
     "files.associations": {
         "chrono": "c",
         "cmath": "c",
-        "ranges": "c"
+        "ranges": "c",
+        "platform.h": "c",
+        "timer.h": "c",
+        "bus.h": "c"
     },
     "editor.tabSize": 4,
     "editor.insertSpaces": true,
     "editor.detectIndentation": false,
     "editor.expandTabs": true,
     "C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: Google, IndentWidth: 4,  BreakBeforeBraces: Mozilla }"
+
 }

.vscode/tasks.json

@@ -0,0 +1,41 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build Matek F722-SE",
+            "type": "shell",
+            "command": "make MATEKF722SE",
+            "group": "build",
+            "problemMatcher": [],
+            "options": {
+                "cwd": "${workspaceFolder}/build"
+            }
+        },
+        {
+            "label": "Build Matek F722",
+            "type": "shell",
+            "command": "make MATEKF722",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [],
+            "options": {
+                "cwd": "${workspaceFolder}/build"
+            }
+        }
+        ,
+        {
+            "label": "CMAKE Update",
+            "type": "shell",
+            "command": "cmake ..",
+            "group": "build",
+            "problemMatcher": [],
+            "options": {
+                "cwd": "${workspaceFolder}/build"
+            }
+        }
+    ]
+}

AUTHORS

@@ -56,6 +56,7 @@ Krzysztof Rosinski
 Kyle Manna
 Larry Davis
 Marc Egli
+Marcelo Bezerra
 Mark Williams
 Martin Budden
 Matthew Evans

CMakeLists.txt

@@ -51,7 +51,7 @@ else()
     endif()
 endif()
 
-project(INAV VERSION 7.0.0)
+project(INAV VERSION 7.1.2)
 
 enable_language(ASM)
 

Dockerfile

@@ -4,7 +4,9 @@ ARG USER_ID
 ARG GROUP_ID
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update && apt-get install -y git cmake make ruby gcc python3 python3-pip gcc-arm-none-eabi
+RUN apt-get update && apt-get install -y git cmake make ruby gcc python3 python3-pip gcc-arm-none-eabi ninja-build
+
+RUN if [ "$GDB" = "yes" ]; then apt-get install -y gdb; fi
 
 RUN pip install pyyaml
 
@@ -13,6 +15,7 @@ RUN addgroup --gid $GROUP_ID inav; exit 0;
 RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID inav; exit 0;
 
 USER inav
+
 RUN git config --global --add safe.directory /src
 
 VOLUME /src

cmake/docker.sh

@@ -6,7 +6,7 @@ CURR_REV="$(git rev-parse HEAD)"
 
 initialize_cmake() {
     echo -e "*** CMake was not initialized yet, doing it now.\n"
-    cmake ..
+    cmake -GNinja ..
     echo "$CURR_REV" > "$LAST_CMAKE_AT_REV_FILE"
 }
 
@@ -26,4 +26,4 @@ else
 fi
 
 # Let Make handle the arguments coming from the build script
-make "$@"
+ninja "$@"

cmake/docker_build_sitl.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+rm -r build_SITL
+mkdir -p build_SITL
+#cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -GNinja -B build_SITL ..
+cmake -DSITL=ON -DDEBUG=ON -DWARNINGS_AS_ERRORS=ON -GNinja -B build_SITL ..
+cd build_SITL
+ninja

cmake/docker_run_sitl.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+cd build_SITL
+
+#Lauch SITL - configurator only mode
+./inav_7.0.0_SITL
+
+#Launch SITL - connect to X-Plane. IP address should be host IP address, not 127.0.0.1. Can be found in X-Plane "Network" tab.
+#./inav_7.0.0_SITL --sim=xp --simip=192.168.2.105 --simport=49000

cmake/sitl.cmake

@@ -34,7 +34,7 @@ set(SITL_LINK_OPTIONS
     -Wl,-L${STM32_LINKER_DIR}
 )
 
-if(${WIN32} OR ${CYGWIN})
+if(${CYGWIN})
     set(SITL_LINK_OPTIONS ${SITL_LINK_OPTIONS} "-static-libgcc")
 endif()
 
@@ -53,6 +53,11 @@ set(SITL_COMPILE_OPTIONS
     -funsigned-char
 )
 
+if(DEBUG)
+    message(STATUS "Debug mode enabled. Adding -g to SITL_COMPILE_OPTIONS.")
+    list(APPEND SITL_COMPILE_OPTIONS -g)
+endif()
+
 if(NOT MACOSX)
     set(SITL_COMPILE_OPTIONS ${SITL_COMPILE_OPTIONS}
         -Wno-return-local-addr
@@ -126,7 +131,7 @@ function (target_sitl name)
         target_link_options(${exe_target} PRIVATE -T${script_path})
     endif()
 
-    if(${WIN32} OR ${CYGWIN})
+    if(${CYGWIN})
         set(exe_filename ${CMAKE_BINARY_DIR}/${binary_name}.exe)
     else()
         set(exe_filename ${CMAKE_BINARY_DIR}/${binary_name})

docs/Controls.md

@@ -44,9 +44,9 @@ The stick positions are combined to activate different functions:
 | Bypass Nav Arm disable        | LOW      | HIGH    | CENTER | CENTER |
 | Save setting                  | LOW      | LOW     | LOW    | HIGH   |
 | Enter OSD Menu (CMS)          | CENTER   | LOW     | HIGH   | CENTER |
-| Enter Camera OSD(RuncamDevice)| RIGHT    | CENTER  | CENTER | CENTER |
-| Exit Camera OSD (RuncamDevice)| LEFT     | CENTER  | CENTER | CENTER |
-| Confirm - Camera OSD          | RIGHT    | CENTER  | CENTER | CENTER |
+| Enter Camera OSD(RuncamDevice)| CENTER   | HIGH    | CENTER | CENTER |
+| Exit Camera OSD (RuncamDevice)| CENTER   | LOW     | CENTER | CENTER |
+| Confirm - Camera OSD          | CENTER   | HIGH    | CENTER | CENTER |
 | Navigation - Camera OSD       | CENTER   | CENTER  | *      | *      |
 
 For graphical stick position in all transmitter modes, check out [this page](https://www.mrd-rc.com/tutorials-tools-and-testing/inav-flight/inav-stick-commands-for-all-transmitter-modes/).

docs/Fixed Wing Landing.md

@@ -0,0 +1,102 @@
+# Fixed Wing Landing
+
+## Introducion
+
+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:
+
+1. After reaching Safehome/LAND Waypoint the altitude is corrected to "Approach Altitude".
+2. The aircraft circles for at least 30 seconds to determine the wind direction and strength.
+3. The landing direction and the approach waypoints are calculated on the basis of the measured wind parameters. If no headwind landing is possible or the wind strength is greater than "Max. tailwind" (see Global Parameters), return to point 2.
+4. The landing is initiated. The aircraft flies the downwind course, "Approach Altitude" is held.
+5. Base Leg: the altitude is reduced from 2/3 of "Approach Altitude".
+6. Final Appraoch: The engine power is reduced using "Pitch2throttle modifier" to reduce speed and the altitude is reduced to "Land Altitude".
+7. Glide: When "Glide Altitude" is reached, the motor is switched off and the pitch angle of "Glide Pitch" is held.
+7. Flare: Only if a LIDAR/Rangefinder sensor is present: the motor remains switched off and the pitch angle of "Flare Pitch" is held
+8. Landing: As soon as INAV has detected the landing, it is automatically disarmed, see setting `nav_disarm_on_landing`.
+
+To activate the automatic landing, the parameter `nav_rth_allow_landing` must be set to `ALWAYS` or `FAILSAFE`. 
+
+> [!WARNING]
+> If landing is activated and no parameters are set for the landing site (Safehome and/or landing waypoint), the old landing procedure (circling until close to the ground, then hovering out) is performed. 
+> This is probably not what you want. 
+ 
+The following graphics illustrate the process:
+
+![Approach Drawing Up](/docs/assets/images/Approach-Drawing-Up.png  "Approach Drawing Up")
+
+![Approach Drawing Side](/docs/assets/images/Approach-Drawing-Side.png  "Approach Drawing Side")
+
+## Landing site parameters
+
+### The following parameters are set for each landing site (Safefome/LAND waypoint):
+
+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>`
+
+`fwapproach` has 17 slots in which landing parameters can be stored. In slot 0-7 the landing parameters for Safehome are stored, in 8 - 16 the parameters for waypoint missions. Only one landing point per mission can be saved. 
+
+* index: 0 - 17, 0 - 7 Safehome, 8 - 16 Mission
+* Approach direction: 0 - Left, 1 - Right. Always seen from the primary landing direction (positive value), i.e. whether the aircraft flies left or right turns on approach.
+* Approach Altitude: Initial altitude of the approach, the altitude at which the wind direction is determined and the downwind approach, in cm
+* Land Altitude: Altitude of the landing site, in cm
+* Approach heading 1 and 2: Two landing directions can be set, values: 0 - +/-360. 0 = landing direction is deactivated. 
+A positive value means that you can approach in both directions, a negative value means that this direction is exclusive.
+Example: 90 degrees: It is possible to land in 90 degrees as well as in 270 degrees. -90 means that you can only land in a 90 degree direction.
+This means that practically 4 landing directions can be saved.
+* Sea Level: 0 - Deactivated, 1 - Activated. If activated, approach and land altitude refer to normal zero (sea level), otherwise relative altitude to the altitude during first GPS fix.
+
+> [!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 parameters
+
+All settings are available via “Advanced Tuning” in the Configurator.
+
+* `nav_fw_land_approach_length`: Length of the final approach, measured from the land site (Safehome/Waypoint) to the last turning point.
+In cm. Max: 100000, Min: 100, Default: 35000
+
+* `nav_fw_land_final_approach_pitch2throttle_mod`: Modifier for pitch to throttle ratio at final approach. This parameter can be used to reduce speed during the final approach. 
+Example: If the parameter is set to 200% and Pitch To Throttle Ratio is set to 15, Pitch To Throttle Ratio is set to 30 on the final approach. This causes a reduction in engine power on approach when the nose is pointing downwards.
+In Percent. Min: 100, Max: 400, Default: 100
+
+* `nav_fw_land_glide_alt`: Initial altitude of the glide phase. The altitude refers to "Landing Altitude", see above under "Landing site parameters"
+In cm. Min: 100, Max: 5000, Default: 200
+
+* `nav_fw_land_flare_alt`: Initial altitude of the flare phase. The altitude refers to "Landing Altitude", see above under "Landing site parameters"
+In cm. Min: 0, Max: 5000, Default: 200
+
+* `nav_fw_land_glide_pitch`: Pitch value for glide phase. 
+In degrees. Min: 0, Max: 45, Default: 0
+
+* `nav_fw_land_flare_pitch`: Pitch value for flare phase. 
+  In degrees. Min: 0, Max: 45, Default: 8
+
+* `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
+
+## 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. deployment of the landing flaps.
+
+| Returned value | State |
+| --- | --- |
+| 0 | Idle/Inactive |
+| 1 | Loiter |
+| 2 | Downwind |
+| 3 | Base Leg |
+| 4 | Final Approach |
+| 5 | Glide |
+| 6 | Flare |