Skip to content

Commit 232b264

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 72eff18 + 47e0527 commit 232b264

Some content is hidden

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

72 files changed

+2012
-431
lines changed

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ assignees: ''
1414
* [INAV Official on Telegram](https://t.me/INAVFlight)
1515

1616
**Please double-check that nobody reported the issue before by using search in this bug tracker.**
17+
**For Bug-Reports, please use the following template and provide as much information as possible. Bug-Reports that don't follow the template, might be closed unanswered. If you are not sure if you found a bug, ask for further input in the community channels or open a Github discussion.**
1718

1819
**PLEASE DELETE THE TEXT ABOVE AFTER READING AND UNDERSTANDING IT**
1920

@@ -38,7 +39,7 @@ assignees: ''
3839

3940
## Additional context
4041
<!-- Add any other context about the problem here. -->
41-
<!-- Go to CLI, execute `dump` command copy its output to [PasteBin](https://pastebin.com) and provide a link to a paste here -->
42+
<!-- Go to CLI, execute `diff` command copy its output to [PasteBin](https://pastebin.com) and provide a link to a paste here -->
4243

4344
---
4445
<!-- PLEASE FILL THIS OUT -->

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ else()
5151
endif()
5252
endif()
5353

54+
5455
project(INAV VERSION 9.0.0)
5556

57+
5658
enable_language(ASM)
5759

5860
if(MACOSX AND SITL)

docs/Buzzer.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,15 @@ To restore set from preferences use:
102102

103103
```
104104
beeper -PREFERED
105+
```
106+
107+
To activate an external beeper via aux channel switch, assign aux channel and set both:
108+
109+
```
110+
beeper RX_SET
111+
beeper MULTI_BEEPS
112+
```
113+
If MULTI_BEEPS is not set, the beeper will not sound after GPS lock.
105114

106115
As with other CLI commands, the `save` command is needed to save the new settings.
107116

@@ -117,7 +126,5 @@ Passive buzzers are supported on FCs which are designed to work with passive buz
117126
Examples of a known-working buzzers.
118127

119128
* [Hcm1205x Miniature Buzzer 5v](http://www.rapidonline.com/Audio-Visual/Hcm1205x-Miniature-Buzzer-5v-35-0055)
120-
* [5V Electromagnetic Active Buzzer Continuous Beep](https://inavflight.com/shop/s/bg/943524)
121-
* [Radio Shack Model: 273-074 PC-BOARD 12VDC (3-16v) 70DB PIEZO BUZZER](http://www.radioshack.com/pc-board-12vdc-70db-piezo-buzzer/2730074.html#.VIAtpzHF_Si)
122129
* [MultiComp MCKPX-G1205A-3700 TRANSDUCER, THRU-HOLE, 4V, 30MA](http://uk.farnell.com/multicomp/mckpx-g1205a-3700/transducer-thru-hole-4v-30ma/dp/2135914?CMP=i-bf9f-00001000)
123130
* [3-24V Piezo Electronic Tone Buzzer Alarm 95DB](https://inavflight.com/shop/s/bg/919348)

docs/Cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ While connected to the CLI, all Logical Switches are temporarily disabled (5.1.0
7373
| `beeper` | Show/set beeper (buzzer) [usage](Buzzer.md) |
7474
| `bind_rx` | Initiate binding for SRXL2 or CRSF receivers |
7575
| `blackbox` | Configure blackbox fields |
76-
| `bootlog` | Show boot events |
76+
| `bootlog` | Show init logs from [serial_printf_debugging](./development/serial_printf_debugging.md) |
7777
| `color` | Configure colors |
7878
| `defaults` | Reset to defaults and reboot |
7979
| `dfu` | DFU mode on reboot |

docs/Fixed Wing Landing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This enables up to 4 different approach directions, based on the landing site an
1515
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.
1616
4. The landing is initiated. The aircraft flies the downwind course, "Approach Altitude" is held.
1717
5. Base Leg: the altitude is reduced from 2/3 of "Approach Altitude".
18-
6. Final Appraoch: The engine power is reduced using "Pitch2throttle modifier" to reduce speed and the altitude is gradually reduced towards "Land Altitude" while approaching the Safehome coordinates.
18+
6. Final Approach: The engine power is reduced using "Pitch2throttle modifier" to reduce speed and the altitude is gradually reduced towards "Land Altitude" while approaching the Safehome coordinates.
1919
7. Glide: When "Glide Altitude" is reached, the motor is switched off and the pitch angle of "Glide Pitch" is held.
2020
7. Flare: Only if a LIDAR/Rangefinder sensor is present: the motor remains switched off and the pitch angle of "Flare Pitch" is held
2121
8. Landing: As soon as INAV has detected the landing, it is automatically disarmed, see setting `nav_disarm_on_landing`.

docs/LED pin PWM.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ Normally LED pin is used to drive WS2812 led strip. LED pin is held low, and eve
77

88
As alternative function, it is possible to generate PWM signal with specified duty ratio on the LED pin.
99

10-
Feature can be used to drive external devices. It is also used to simulate [OSD joystick](OSD%20Joystick.md) to control cameras.
10+
Feature can be used to drive external devices such as a VTX power switch. Setting the PWM duty cycle to 100% or 0% can
11+
provide an extra PINIO pin. It is also used to simulate [OSD joystick](OSD%20Joystick.md) to control cameras.
1112

1213
PWM frequency is fixed to 24kHz with duty ratio between 0 and 100%:
1314

1415
![alt text](/docs/assets/images/led_pin_pwm.png "led pin pwm")
1516

17+
Note that the LED feature needs to be enabled when using the PIN in this mode (feature LED_STRIP).
18+
1619
There are four modes of operation:
1720
- low
1821
- high
@@ -88,3 +91,6 @@ To drive power LED with brightness control, Mosfet should be used:
8891

8992
![alt text](/docs/assets/images/ledpinpwmpowerled.png "led pin pwm power_led")
9093

94+
# Programming tab example for using the LED pin as a PINIO, such as for turning a VTX or camera on and off
95+
![screenshot of programming tab using led as pinio](/docs/assets/images/led-as-pinio.png)
96+

docs/OSD.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Not all OSDs are created equally. This table shows the differences between the d
2626
| DJI O3 Goggles V2 + WTFOS | 53 x 20 | X | | X | YES |
2727
| DJI Goggles 2 and newer | 53 x 20 (HD) | X | | X | YES (no custom fonts) |
2828

29+
2930
## OSD Elements
3031
Here are the OSD Elements provided by INAV.
3132

@@ -197,6 +198,7 @@ Here are the OSD Elements provided by INAV.
197198
| 163 | OSD_COURSE_TO_FENCE | 8.0.0 | |
198199
| 164 | OSD_H_DIST_TO_FENCE | 8.0.0 | |
199200
| 165 | OSD_V_DIST_TO_FENCE | 8.0.0 | |
201+
| 166 | OSD_NAV_FW_ALT_CONTROL_RESPONSE | 8.0.0 | |
200202

201203
# Pilot Logos
202204

docs/Programming Framework.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ IPF can be edited using INAV Configurator user interface, or via CLI. To use COn
7575
| 26 | Invert Roll | Inverts ROLL axis input for PID/PIFF controller |
7676
| 27 | Invert Pitch | Inverts PITCH axis input for PID/PIFF controller |
7777
| 28 | Invert Yaw | Inverts YAW axis input for PID/PIFF controller |
78-
| 29 | Override Throttlw | Override throttle value that is fed to the motors by mixer. Operand is scaled in us. `1000` means throttle cut, `1500` means half throttle |
78+
| 29 | Override Throttle | Override throttle value that is fed to the motors by mixer. Operand is scaled in us. `1000` means throttle cut, `1500` means half throttle |
7979
| 30 | Set VTx Band | Sets VTX band. Accepted values are `1-5` |
8080
| 31 | Set VTx Channel | Sets VTX channel. Accepted values are `1-8` |
8181
| 32 | Set OSD Layout | Sets OSD layout. Accepted values are `0-3` |
@@ -94,11 +94,11 @@ IPF can be edited using INAV Configurator user interface, or via CLI. To use COn
9494
| 45 | Flight Axis Angle Override | Sets the target attitude angle for axis. In other words, when active, it enforces Angle mode (Heading Hold for Yaw) on this axis (Angle mode does not have to be active). `Operand A` defines the axis: `0` - Roll, `1` - Pitch, `2` - Yaw. `Operand B` defines the angle in degrees |
9595
| 46 | Flight Axis Rate Override | Sets the target rate (rotation speed) for axis. `Operand A` defines the axis: `0` - Roll, `1` - Pitch, `2` - Yaw. `Operand B` defines the rate in degrees per second |
9696
| 47 | Edge | Momentarily true when triggered by `Operand A`. `Operand A` is the activation operator [`boolean`], `Operand B` _(Optional)_ is the time for the edge to stay active [ms]. After activation, operator will return `true` until the time in Operand B is reached. If a pure momentary edge is wanted. Just leave `Operand B` as the default `Value: 0` setting. |
97-
| 48 | Delay | Delays activation after being triggered. This will return `true` when `Operand A` _is_ true, and the delay time in `Operand B` [ms] has been exceeded. |
97+
| 48 | Delay | Delays activation after being triggered. This will return `true` when `Operand A` _is_ true, and has been true for the last `Operand B` [ms]. |
9898
| 49 | Timer | A simple on - off timer. `true` for the duration of `Operand A` [ms]. Then `false` for the duration of `Operand B` [ms]. |
9999
| 50 | Delta | This returns `true` when the value of `Operand A` has changed by the value of `Operand B` or greater within 100ms. ( \|ΔA\| >= B ) |
100100
| 51 | Approx Equals (A ~ B) | `true` if `Operand B` is within 1% of `Operand A`. |
101-
| 52 | LED Pin PWM | Value `Operand A` from [`0` : `100`] starts PWM generation on LED Pin. See [LED pin PWM](LED%20pin%20PWM.md). Any other value stops PWM generation (stop to allow ws2812 LEDs updates in shared modes). |
101+
| 52 | LED Pin PWM | Value `Operand A` from [`0` : `100`] PWM / PINIO generation on LED Pin. See [LED pin PWM](LED%20pin%20PWM.md). Any other value stops PWM generation (stop to allow ws2812 LEDs updates in shared modes). |
102102
| 53 | Disable GPS Sensor Fix | Disables the GNSS sensor fix. For testing GNSS failure. |
103103
| 54 | Mag calibration | Trigger a magnetometer calibration. |
104104
| 55 | Set Gimbal Sensitivity | Scales `Operand A` from [`-16` : `15`]

docs/Rx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ Note:
200200
* It is necessary to update `MSP_SET_RAW_RC` at 5Hz or faster.
201201
* `MSP_SET_RAW_RC` uses the defined RC channel map
202202
* `MSP_RC` returns `AERT` regardless of channel map
203-
* You can combine "real" RC radio and MSP RX by compiling custom firmware with `USE_MSP_RC_OVERRIDE` defined. Then use `msp_override_channels` to set the channels to be overridden.
203+
* You can combine "real" RC radio and MSP RX by using `msp_override_channels` to set the channels to be overridden.
204204
* The [wiki Remote Control and Management article](https://github.com/iNavFlight/inav/wiki/INAV-Remote-Management,-Control-and-Telemetry) provides more information, including links to 3rd party projects that exercise `MSP_SET_RAW_RC` and `USE_MSP_RC_OVERRIDE`
205205

206206
## SIM (SITL) Joystick

docs/Sensors.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Sensors
2+
3+
## Temperature Correction
4+
Temperature related drift for the Nav Accelerometer Z axis and Barometer can be corrected using settings `acc_temp_correction` and `baro_temp_correction`. The settings are temperature correction factor in cms-2/K and cm/K respectively, limited to -50 to +50, and are based on a linear correction characteristic. It is possible to perform an auto calibration of the required correction value using a setting of 51 with the auto calibration ending after a 5 minute timeout or on first arm. It's also possible to simply enter a value and see how the sensor drifts as the FC warms up, e.g. a BMP280 barometer requires a value around 20 cm/K for the `baro_temp_correction` setting.
5+
6+
### Barometer Calibration
7+
Best calibrated by checking barometer altitude in the Configurator Sensor tab, powered just from USB or the main battery. First check Barometer altitude drift with `baro_temp_correction` set to 0 starting with a cold FC. Then change the setting to 51, power off and allow the FC to cool then power on again and recheck the barometer altitude in the Configurator Sensors tab. The barometer altitude will drift as before until 5 mins after bootup at which point, if the calibration has worked, the barometer altitude should fall close to 0. This will be accompanied by a "success" beep (may need battery power for this rather than just USB). The calibrated setting can be saved by switching to the CLI and hitting "Save Settings" (or use the Save stick command or CMS). Power off and allow the FC to cool down then recheck barometer altitude again, it should show much reduced altitude drift as it warms up.
8+
9+
### Nav Acceleromter Z Axis Calibration
10+
The Nav accelerometer Z axis is calibrated in a similar way to the Barometer except it isn't so easy to check while calibrating given the lack of direct feedback. The acc Z value in the Configurator Sensors tab isn't the corrected value so can't be used. Instead set `debug_mode` to `ALTITUDE` and check the behaviour of `Debug 3` in the Configurator Sensors Tab for Debug output. It will drift during calibration then show a sudden change when calibration is finished. After saving and rebooting check `Debug 3` in the Configurator Sensors tab, it should show much less drift from zero if the calibration was successful. Successful calibration can also be checked by making sure `acc_temp_correction` shows a value other than 0 or 51.
11+
12+
13+
14+
15+
16+
17+

0 commit comments

Comments
 (0)