Skip to content

Commit 57e9eec

Browse files
committed
Merge remote-tracking branch 'origin/master' into shota_master
2 parents f4c6c9e + 2056a42 commit 57e9eec

54 files changed

Lines changed: 565 additions & 1313 deletions

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- name: Install dependencies
1717
run: sudo apt-get update && sudo apt-get -y install ninja-build
1818
- name: Setup environment
@@ -47,7 +47,7 @@ jobs:
4747
needs: [build]
4848
runs-on: ubuntu-18.04
4949
steps:
50-
- uses: actions/checkout@v2
50+
- uses: actions/checkout@v3
5151
- name: Install dependencies
5252
run: sudo apt-get update && sudo apt-get -y install ninja-build
5353
- name: Run Tests

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-18.04
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- name: Install dependencies
1919
run: sudo apt-get update && sudo apt-get -y install python3-yaml
2020
- name: Check that Settings.md is up to date

docs/Cli.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ While connected to the CLI, all Logical Switches are temporarily disabled (5.1.0
8989
| `gpspassthrough` | Passthrough gps to serial |
9090
| `gvar` | Configure global variables |
9191
| `help` | Displays CLI help and command parameters / options |
92-
| `imu2` | Secondary IMU |
9392
| `led` | Configure leds |
9493
| `logic` | Configure logic conditions |
9594
| `map` | Configure rc channel order |
@@ -155,7 +154,7 @@ A shorter form is also supported to enable and disable a single function using `
155154
| DJI_HD_OSD | 21 | 2097152 |
156155
| SERVO_SERIAL | 22 | 4194304 |
157156
| TELEMETRY_SMARTPORT_MASTER | 23 | 8388608 |
158-
| IMU2 | 24 | 16777216 |
157+
| UNUSED | 24 | 16777216 |
159158
| MSP_DISPLAYPORT | 25 | 33554432 |
160159

161160
Thus, to enable MSP and LTM on a port, one would use the function **value** of 17 (1 << 0)+(1<<4), aka 1+16, aka 17.

docs/Settings.md

Lines changed: 0 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,156 +1622,6 @@ Power draw at zero throttle used for remaining flight time/distance estimation i
16221622

16231623
---
16241624

1625-
### imu2_align_pitch
1626-
1627-
Pitch alignment for Secondary IMU. 1/10 of a degree
1628-
1629-
| Default | Min | Max |
1630-
| --- | --- | --- |
1631-
| 0 | -1800 | 3600 |
1632-
1633-
---
1634-
1635-
### imu2_align_roll
1636-
1637-
Roll alignment for Secondary IMU. 1/10 of a degree
1638-
1639-
| Default | Min | Max |
1640-
| --- | --- | --- |
1641-
| 0 | -1800 | 3600 |
1642-
1643-
---
1644-
1645-
### imu2_align_yaw
1646-
1647-
Yaw alignment for Secondary IMU. 1/10 of a degree
1648-
1649-
| Default | Min | Max |
1650-
| --- | --- | --- |
1651-
| 0 | -1800 | 3600 |
1652-
1653-
---
1654-
1655-
### imu2_gain_acc_x
1656-
1657-
Secondary IMU ACC calibration data
1658-
1659-
| Default | Min | Max |
1660-
| --- | --- | --- |
1661-
| 0 | -32768 | 32767 |
1662-
1663-
---
1664-
1665-
### imu2_gain_acc_y
1666-
1667-
Secondary IMU ACC calibration data
1668-
1669-
| Default | Min | Max |
1670-
| --- | --- | --- |
1671-
| 0 | -32768 | 32767 |
1672-
1673-
---
1674-
1675-
### imu2_gain_acc_z
1676-
1677-
Secondary IMU ACC calibration data
1678-
1679-
| Default | Min | Max |
1680-
| --- | --- | --- |
1681-
| 0 | -32768 | 32767 |
1682-
1683-
---
1684-
1685-
### imu2_gain_mag_x
1686-
1687-
Secondary IMU MAG calibration data
1688-
1689-
| Default | Min | Max |
1690-
| --- | --- | --- |
1691-
| 0 | -32768 | 32767 |
1692-
1693-
---
1694-
1695-
### imu2_gain_mag_y
1696-
1697-
Secondary IMU MAG calibration data
1698-
1699-
| Default | Min | Max |
1700-
| --- | --- | --- |
1701-
| 0 | -32768 | 32767 |
1702-
1703-
---
1704-
1705-
### imu2_gain_mag_z
1706-
1707-
Secondary IMU MAG calibration data
1708-
1709-
| Default | Min | Max |
1710-
| --- | --- | --- |
1711-
| 0 | -32768 | 32767 |
1712-
1713-
---
1714-
1715-
### imu2_hardware
1716-
1717-
Selection of a Secondary IMU hardware type. NONE disables this functionality
1718-
1719-
| Default | Min | Max |
1720-
| --- | --- | --- |
1721-
| NONE | | |
1722-
1723-
---
1724-
1725-
### imu2_radius_acc
1726-
1727-
Secondary IMU MAG calibration data
1728-
1729-
| Default | Min | Max |
1730-
| --- | --- | --- |
1731-
| 0 | -32768 | 32767 |
1732-
1733-
---
1734-
1735-
### imu2_radius_mag
1736-
1737-
Secondary IMU MAG calibration data
1738-
1739-
| Default | Min | Max |
1740-
| --- | --- | --- |
1741-
| 0 | -32768 | 32767 |
1742-
1743-
---
1744-
1745-
### imu2_use_for_osd_ahi
1746-
1747-
If set to ON, Secondary IMU data will be used for Analog OSD Artificial Horizon
1748-
1749-
| Default | Min | Max |
1750-
| --- | --- | --- |
1751-
| OFF | OFF | ON |
1752-
1753-
---
1754-
1755-
### imu2_use_for_osd_heading
1756-
1757-
If set to ON, Secondary IMU data will be used for Analog OSD heading
1758-
1759-
| Default | Min | Max |
1760-
| --- | --- | --- |
1761-
| OFF | OFF | ON |
1762-
1763-
---
1764-
1765-
### imu2_use_for_stabilized
1766-
1767-
If set to ON, Secondary IMU data will be used for Angle, Horizon and all other modes that control attitude (PosHold, WP, RTH)
1768-
1769-
| Default | Min | Max |
1770-
| --- | --- | --- |
1771-
| OFF | OFF | ON |
1772-
1773-
---
1774-
17751625
### imu_acc_ignore_rate
17761626

17771627
Total gyro rotation rate threshold [deg/s] before scaling to consider accelerometer trustworthy

docs/boards/SPEEDYBEEF405V3.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SpeedyBee F405 V3
2+
3+
> Notice: At the moment, DSHOT is not supported on SpeedyBe F405 V3. Use Multishot instead

docs/development/IDE - Visual Studio Code with Windows 10.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ Edit file `./.vscode/c_cpp_properties.json` to setup enabled `defines`
5454
"USE_RPM_FILTER",
5555
"USE_GLOBAL_FUNCTIONS",
5656
"USE_DYNAMIC_FILTERS",
57-
"USE_IMU_BNO055",
58-
"USE_SECONDARY_IMU",
5957
"USE_DSHOT",
6058
"FLASH_SIZE 480",
6159
"USE_I2C_IO_EXPANDER",

docs/development/Windows 11 - VS Code - WSL2 - Hardware Debugging.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,6 @@ sudo udevadm control --reload-rules
249249
"USE_RPM_FILTER",
250250
"USE_GLOBAL_FUNCTIONS",
251251
"USE_DYNAMIC_FILTERS",
252-
"USE_IMU_BNO055",
253-
"USE_SECONDARY_IMU",
254252
"USE_DSHOT",
255253
"FLASH_SIZE 480",
256254
"USE_I2C_IO_EXPANDER",

src/main/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ main_sources(COMMON_SRC
9292
drivers/accgyro/accgyro_mpu6500.h
9393
drivers/accgyro/accgyro_mpu9250.c
9494
drivers/accgyro/accgyro_mpu9250.h
95-
drivers/accgyro/accgyro_bno055_serial.c
96-
drivers/accgyro/accgyro_bno055_serial.h
9795

9896
drivers/adc.c
9997
drivers/adc.h
@@ -333,8 +331,6 @@ main_sources(COMMON_SRC
333331
flight/secondary_dynamic_gyro_notch.h
334332
flight/dynamic_lpf.c
335333
flight/dynamic_lpf.h
336-
flight/secondary_imu.c
337-
flight/secondary_imu.h
338334

339335
io/beeper.c
340336
io/beeper.h

src/main/build/debug.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ typedef enum {
6666
DEBUG_PCF8574,
6767
DEBUG_DYNAMIC_GYRO_LPF,
6868
DEBUG_AUTOLEVEL,
69-
DEBUG_IMU2,
7069
DEBUG_ALTITUDE,
7170
DEBUG_AUTOTRIM,
7271
DEBUG_AUTOTUNE,

src/main/config/parameter_group_ids.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
#define PG_SAFE_HOME_CONFIG 1026
117117
#define PG_DJI_OSD_CONFIG 1027
118118
#define PG_PROGRAMMING_PID 1028
119-
#define PG_SECONDARY_IMU 1029
119+
#define PG_UNUSED_1 1029
120120
#define PG_POWER_LIMITS_CONFIG 1030
121121
#define PG_OSD_COMMON_CONFIG 1031
122122
#define PG_INAV_END 1031

0 commit comments

Comments
 (0)