Skip to content

Commit 68546a2

Browse files
Merge pull request #11167 from iNavFlight/maintenance-9.x
Merge Maintenance 9.x to master
2 parents 82021b5 + edf5029 commit 68546a2

File tree

10 files changed

+415
-9
lines changed

10 files changed

+415
-9
lines changed

docs/LedStrip.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Enable the Led Strip feature via the GUI under setup.
7171
Configure the leds from the Led Strip tab in the INAV GUI.
7272
First setup how the led's are laid out so that you can visualize it later as you configure and so the flight controller knows how many led's there are available.
7373

74-
There is a step by step guide on how to use the GUI to configure the Led Strip feature using the GUI http://blog.oscarliang.net/setup-rgb-led-cleanflight/ which was published early 2015 by Oscar Liang which may or may not be up-to-date by the time you read this.
74+
There is a step by step guide on how to use the GUI to configure the Led Strip feature using the GUI https://oscarliang.com/setup-led-betaflight/ which was published early 2015 by Oscar Liang which may or may not be up-to-date by the time you read this.
7575

7676
CLI:
7777
Enable the `LED_STRIP` feature via the cli:
@@ -605,4 +605,4 @@ This also means that you can make sure that each R,G and B LED in each LED modul
605605

606606
After a short delay the LEDs will show the unarmed color sequence and or low-battery warning sequence.
607607

608-
Also check that the feature `LED_STRIP` was correctly enabled and that it does not conflict with other features, as above.
608+
Also check that the feature `LED_STRIP` was correctly enabled and that it does not conflict with other features, as above.

docs/development/msp/inav_enums_ref.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@
13851385
| `DEVHW_MS4525` | 49 | |
13861386
| `DEVHW_DLVR` | 50 | |
13871387
| `DEVHW_M25P16` | 51 | |
1388-
| `DEVHW_W25N01G` | 52 | |
1388+
| `DEVHW_W25N` | 52 | |
13891389
| `DEVHW_UG2864` | 53 | |
13901390
| `DEVHW_SDCARD` | 54 | |
13911391
| `DEVHW_IRLOCK` | 55 | |
@@ -2843,6 +2843,7 @@
28432843
| `LOGIC_CONDITION_OPERAND_FLIGHT_MIN_GROUND_SPEED` | 46 | |
28442844
| `LOGIC_CONDITION_OPERAND_FLIGHT_HORIZONTAL_WIND_SPEED` | 47 | |
28452845
| `LOGIC_CONDITION_OPERAND_FLIGHT_WIND_DIRECTION` | 48 | |
2846+
| `LOGIC_CONDITION_OPERAND_FLIGHT_RELATIVE_WIND_OFFSET` | 49 | |
28462847

28472848
---
28482849
## <a id="enum-logicoperation_e"></a>`logicOperation_e`
@@ -4740,7 +4741,7 @@
47404741
---
47414742
## <a id="enum-sdcardreceiveblockstatus_e"></a>`sdcardReceiveBlockStatus_e`
47424743

4743-
> Source: ../../../src/main/drivers/sdcard/sdcard_spi.c
4744+
> Source: ../../../src/main/drivers/sdcard/sdcard_sdio.c
47444745
47454746
| Enumerator | Value | Condition |
47464747
|---|---:|---|
@@ -4751,7 +4752,7 @@
47514752
---
47524753
## <a id="enum-sdcardreceiveblockstatus_e"></a>`sdcardReceiveBlockStatus_e`
47534754

4754-
> Source: ../../../src/main/drivers/sdcard/sdcard_sdio.c
4755+
> Source: ../../../src/main/drivers/sdcard/sdcard_spi.c
47554756
47564757
| Enumerator | Value | Condition |
47574758
|---|---:|---|
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ca27e198f4405b721ad8a15719e15e5d
1+
7db80f38dda2265704e7852630a02a83

docs/development/msp/msp_messages.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10829,6 +10829,29 @@
1082910829
"notes": "Requires `USE_GEOZONE`. Expects 10 bytes (Polygon) or 14 bytes (Circular). Returns error if indexes invalid or if trying to set vertex beyond `vertexCount` defined in `MSP2_INAV_SET_GEOZONE`. Calls `geozoneSetVertex()`. For circular zones, sets center (vertex 0) and radius (vertex 1's latitude).",
1083010830
"description": "Sets a specific vertex (or center+radius for circular zones) for a Geozone."
1083110831
},
10832+
"MSP2_INAV_SET_GVAR": {
10833+
"code": 8724,
10834+
"mspv": 2,
10835+
"request": {
10836+
"payload": [
10837+
{
10838+
"name": "gvarIndex",
10839+
"ctype": "uint8_t",
10840+
"desc": "Index of the Global Variable to set",
10841+
"units": "Index"
10842+
},
10843+
{
10844+
"name": "value",
10845+
"ctype": "int32_t",
10846+
"desc": "New value to store (clamped to configured min/max by `gvSet()`)",
10847+
"units": ""
10848+
}
10849+
]
10850+
},
10851+
"reply": null,
10852+
"notes": "Requires `USE_PROGRAMMING_FRAMEWORK`. Expects 5 bytes. Returns error if index is outside `MAX_GLOBAL_VARIABLES`.",
10853+
"description": "Sets the specified Global Variable (GVAR) to the provided value."
10854+
},
1083210855
"MSP2_INAV_FULL_LOCAL_POSE": {
1083310856
"code": 8736,
1083410857
"mspv": 2,

docs/development/msp/msp_ref.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ For list of enums, see [Enum documentation page](https://github.com/iNavFlight/i
1010
For current generation code, see [documentation project](https://github.com/xznhj8129/msp_documentation) (temporary until official implementation)
1111

1212

13-
**JSON file rev: 2**
13+
**JSON file rev: 3
14+
**
1415

1516
**Warning: Verification needed, exercise caution until completely verified for accuracy and cleared, especially for integer signs. Source-based generation/validation is forthcoming. Refer to source for absolute certainty**
1617

@@ -411,6 +412,7 @@ For current generation code, see [documentation project](https://github.com/xznh
411412
[8721 - MSP2_INAV_SET_GEOZONE](#msp2_inav_set_geozone)
412413
[8722 - MSP2_INAV_GEOZONE_VERTEX](#msp2_inav_geozone_vertex)
413414
[8723 - MSP2_INAV_SET_GEOZONE_VERTEX](#msp2_inav_set_geozone_vertex)
415+
[8724 - MSP2_INAV_SET_GVAR](#msp2_inav_set_gvar)
414416
[8736 - MSP2_INAV_FULL_LOCAL_POSE](#msp2_inav_full_local_pose)
415417
[12288 - MSP2_BETAFLIGHT_BIND](#msp2_betaflight_bind)
416418

@@ -4492,6 +4494,19 @@ For current generation code, see [documentation project](https://github.com/xznh
44924494

44934495
**Notes:** Requires `USE_GEOZONE`. Expects 10 bytes (Polygon) or 14 bytes (Circular). Returns error if indexes invalid or if trying to set vertex beyond `vertexCount` defined in `MSP2_INAV_SET_GEOZONE`. Calls `geozoneSetVertex()`. For circular zones, sets center (vertex 0) and radius (vertex 1's latitude).
44944496

4497+
## <a id="msp2_inav_set_gvar"></a>`MSP2_INAV_SET_GVAR (8724 / 0x2214)`
4498+
**Description:** Sets the specified Global Variable (GVAR) to the provided value.
4499+
4500+
**Request Payload:**
4501+
|Field|C Type|Size (Bytes)|Units|Description|
4502+
|---|---|---|---|---|
4503+
| `gvarIndex` | `uint8_t` | 1 | Index | Index of the Global Variable to set |
4504+
| `value` | `int32_t` | 4 | - | New value to store (clamped to configured min/max by `gvSet()`) |
4505+
4506+
**Reply Payload:** **None**
4507+
4508+
**Notes:** Requires `USE_PROGRAMMING_FRAMEWORK`. Expects 5 bytes. Returns error if index is outside `MAX_GLOBAL_VARIABLES`.
4509+
44954510
## <a id="msp2_inav_full_local_pose"></a>`MSP2_INAV_FULL_LOCAL_POSE (8736 / 0x2220)`
44964511
**Description:** Provides estimates of current attitude, local NEU position, and velocity.
44974512

docs/development/msp/rev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2
1+
3

0 commit comments

Comments
 (0)