Skip to content

Commit 6bf7a91

Browse files
digitalentitydigitalentity
authored
Merge pull request #783 from iNavFlight/development
Release version 1.4
2 parents 2b26c0a + 2f78d63 commit 6bf7a91

File tree

347 files changed

+5739
-3155
lines changed

Some content is hidden

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

347 files changed

+5739
-3155
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ obj/
1212
patches/
1313
startup_stm32f10x_md_gcc.s
1414
.vagrant/
15+
cov-int*
1516

1617
# script-generated files
1718
docs/Manual.pdf

‎Makefile

+10-3
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,9 @@ else
355355
.DEFAULT_GOAL := hex
356356
endif
357357

358+
INCLUDE_DIRS := $(INCLUDE_DIRS) \
359+
$(ROOT)/lib/main/MAVLink
360+
358361
INCLUDE_DIRS := $(INCLUDE_DIRS) \
359362
$(TARGET_DIR)
360363

@@ -411,10 +414,12 @@ COMMON_SRC = \
411414
flight/servos.c \
412415
flight/pid.c \
413416
io/beeper.c \
414-
fc/msp_fc.c \
417+
fc/fc_init.c \
418+
fc/fc_tasks.c \
419+
fc/fc_hardfaults.c \
420+
fc/fc_msp.c \
415421
fc/rc_controls.c \
416422
fc/rc_curves.c \
417-
fc/fc_tasks.c \
418423
io/serial.c \
419424
io/serial_4way.c \
420425
io/serial_4way_avrootloader.c \
@@ -459,6 +464,7 @@ HIGHEND_SRC = \
459464
flight/navigation_rewrite.c \
460465
flight/navigation_rewrite_multicopter.c \
461466
flight/navigation_rewrite_fixedwing.c \
467+
flight/navigation_rewrite_fw_launch.c \
462468
flight/navigation_rewrite_pos_estimator.c \
463469
flight/navigation_rewrite_geo.c \
464470
flight/gps_conversion.c \
@@ -468,9 +474,10 @@ HIGHEND_SRC = \
468474
io/gps_naza.c \
469475
io/gps_i2cnav.c \
470476
io/ledstrip.c \
471-
io/display.c \
477+
io/dashboard.c \
472478
sensors/rangefinder.c \
473479
sensors/barometer.c \
480+
sensors/pitotmeter.c \
474481
telemetry/telemetry.c \
475482
telemetry/frsky.c \
476483
telemetry/hott.c \

‎docs/Board - Airbot F4 and Flip32 F4.md

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Board - Airbot F4 / Flip32 F4 / Generic F4 Flight Controller from Banggood and Aliexpress
2+
3+
![Airbot F4](https://quadmeup.com/wp-content/uploads/2016/10/Flip32-F4-Flight-Controller-pinout.jpg)
4+
5+
> This target supports both MPU6000 and MPU6500 versions of this board
6+
7+
## Features
8+
9+
* STM32F405 CPU
10+
* Integrated Accelerometer/Gyro MPU6000 or MPU6500 via SPI bus
11+
* 6 motor outputs
12+
* 3 UART ports (UART1, UART3, UART6)
13+
* External I2C bus, pins shared with UART3, can not be used simultaneously
14+
* Only UART1 is equipped with inverter
15+
* Onboard 128Mbit (16MB) flash
16+
* BLHeli Passthrough
17+
* Integrated voltage stabilizer
18+
* Buzzer connector
19+
20+
## **NOT** supported
21+
22+
* Sonar
23+
* SoftwareSerial
24+
* ServoTilt
25+
* Channel Forwarding
26+
27+
## Radio Receivers
28+
29+
This board does not support Parallel PWM receiver connection. Only SerialRX, PPM and MSP receivers are supported.
30+
31+
SerialRX and PPM receivers should be connected to dedicated _PPM SBUS_ connector above _Motor 1_. MSP receivers should be connected to one of UARTs configured as MSP.
32+
33+
## Motors
34+
35+
| Motor | pin | Shared with |
36+
| ---- | ---- | ---- |
37+
| 1 | PB0 | |
38+
| 2 | PB1 | |
39+
| 3 | PA3 | |
40+
| 4 | PA2 | |
41+
| 5 | PA1 | LED Strip |
42+
| 6 | PA8 | |
43+
44+
## USB
45+
46+
This board uses STM32 VCP and _not_ utilizes UART when USB is connected. STM32 VCP drivers might be required!
47+
48+
Flashing requires DFU mode and STM32 DFU drivers. Use [Zadig](http://zadig.akeo.ie) tool to install WinUSB driver on Windows.
49+
50+
## Buzzer / Beeper
51+
52+
5V piezo buzzer should be connected directly to dedicated pins _BUZ +_ and _BUZ -_. No additional hardware is required.
53+
54+
## RSSI ADC
55+
56+
* Connected to pin PA0
57+
* 3.3V tolerant, do not supply 5V
58+
59+
## Current Meter ADC
60+
61+
* Connected to pin PC1
62+
* 3.3V tolerant, do not supply 5V
63+
64+
## Voltage monitoring
65+
66+
* Connected to pin PC2
67+
* Connected to VBAT pins (both are the same) and integrated Voltage Stabilizer (LM7805M)
68+
69+
### Integrated voltage stabilizer
70+
71+
It is integrated with voltage monitoring and always powered when VBAT is connected to battery.
72+
Because this is **Linear Stabilizer**, it has a tendency to overheat, especially on 4S. Because of that,
73+
avoid powering too many devices directly to 5V pins on the board. RX receiver is (and board itself) is rather all
74+
it can do without overeating (150mA on 4S gives 1.5W of waste heat!). OSD, LED Strip and other devices should powered from separate BEC if voltage monitoring is to be enabled.
75+
76+
### LED Strip
77+
78+
Right now, LED strip is not functioning correctly on this target. It is a known bug. When bug will be fixed, LED Strip should be connected to **MOTOR 5** output, not dedicated "LED" connector.

‎docs/Board - Revolution.md

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
# Board - OpenPilot Revolution also known as CC3D Revo
2+
3+
## Features
4+
5+
* STM32F405 CPU
6+
* Integrated Accelerometer/Gyro MPU6000 via SPI bus
7+
* Integrated Magnetometer HMC5883
8+
* Integrated Barometer MS5611
9+
* Integrated 433MHz OPlink Modem -> Not supported
10+
* 6 motor outputs
11+
* 3 UART ports (UART1, UART3, UART6)
12+
* External I2C bus, pins shared with UART3, can not be used simultaneously
13+
* Only UART1 is equipped with inverter
14+
* Onboard 128Mbit (16MB) flash
15+
* BLHeli Passthrough
16+
17+
## **NOT** supported
18+
19+
* Sonar
20+
* SoftwareSerial
21+
* ServoTilt
22+
* Channel Forwarding
23+
24+
## USB
25+
26+
This board uses STM32 VCP and _not_ utilizes UART when USB is connected. STM32 VCP drivers might be required!
27+
28+
Flashing requires DFU mode and STM32 DFU drivers. Use [Zadig](http://zadig.akeo.ie) tool to install WinUSB driver on Windows.
29+
30+
## Pinout
31+
32+
Following section is ported from [RaceFlight](https://github.com/rs2k/raceflight/blob/master/docs/Board%20-%20Revo.md) with edits
33+
34+
### RC_Input connector
35+
36+
#### RX_PPM and RX_SERIAL
37+
38+
| Pin | Function | Notes |
39+
| --- | --------- | -------------------------------- |
40+
| 1 | Ground | |
41+
| 2 | +5V | |
42+
| 3 | PPM Input | Enable `feature RX_PPM` |
43+
| 4 | UART6 TX | |
44+
| 5 | UART6 RX | |
45+
| 6 | Current | Enable `feature CURRENT_METER`. Connect to the output of a current sensor, 0v-3.3v input |
46+
| 7 | Battery Voltage sensor | Enable `feature VBAT`. Connect to main battery using a voltage divider, 0v-3.3v input |
47+
| 8 | RSSI | Enable `feature RSSI_ADC`. Connect to the output of a PWM-RSSI conditioner, 0v-3.3v input |
48+
49+
#### RX_PARALLEL_PWM
50+
51+
| Pin | Function | Notes |
52+
| --- | ---------| ------|
53+
| 1 | Ground | |
54+
| 2 | +5V | |
55+
| 3 | Unused | |
56+
| 4 | CH1 | |
57+
| 5 | CH2 | |
58+
| 6 | CH3 | |
59+
| 7 | CH4/Battery Voltage sensor | CH4 if battery voltage sensor is disabled |
60+
| 8 | CH5/CH4 | CH4 if battery voltage monitor is enabled|
61+
62+
### RC_Output connector
63+
64+
#### RX_PPM and RX_SERIAL
65+
66+
| Pin | Pin | Function | Notes |
67+
| --- | ---- |---------- | ------|
68+
| 1 | PB0 | MOTOR 1 | |
69+
| 2 | PB1 | MOTOR 2 | |
70+
| 3 | PA3 | MOTOR 3 | |
71+
| 4 | PA2 | MOTOR 4 | |
72+
| 5 | PA1 | MOTOR 5 / LED Strip | |
73+
| 6 | PA8 | MOTOR 6 | |
74+
75+
## Serial Ports
76+
77+
| Value | Identifier | Board Markings | Notes |
78+
| ----- | ------------ | -------------- | ------------------------------------------|
79+
| 1 | VCP | USB PORT | |
80+
| 2 | UART1 | MAIN PORT | Connected to an MCU controllable inverter |
81+
| 3 | UART3 | FLEX PORT | |
82+
| 4 | UART6 | RC connector | Pins 4 and 5 (Tx and Rx respectively) |
83+
84+
The UART6 port is not available when RX_PARALLEL_PWM is used.
85+
86+
### Main Port
87+
88+
The main port is connected to an inverter which is automatically enabled as required. For example, if the main port is used for SBus Serial RX then an external inverter is not required.
89+
90+
| Pin | Signal | Notes |
91+
| --- | ------------------ | ----------------------- |
92+
| 1 | GND | |
93+
| 2 | VCC unregulated | |
94+
| 3 | UART1 TX | 3.3v level |
95+
| 4 | UART1 RX | 3.3v level (5v tolerant)|
96+
97+
### Flex Port
98+
99+
The flex port will be enabled in I2C mode unless UART3 is used. You can connect external I2C sensors and displays to this port.
100+
101+
You cannot use USART3 and I2C at the same time.
102+
103+
| Pin | Signal | Notes |
104+
| --- | ------------------ | ----------------------- |
105+
| 1 | GND | |
106+
| 2 | VCC unregulated | |
107+
| 3 | I2C SCL / UART3 TX | 3.3v level |
108+
| 4 | I2C SDA / UART3 RX | 3.3v level (5v tolerant) |
109+
110+
## Buzzer
111+
112+
External buzzer should be wired to PB4 CPU pin using a transistor circuit
113+
114+
## Notes
115+
116+
* At this moment LED Strip is not functional on this target
117+
* Motor out put 5 and 6 needs testing
118+
* Servo output might not be working at the moment of writing this documentation
119+
* I2C might not be working at the moment of writing this documentation
120+
* LED Strip might not be working at the moment of writing this documentation

‎docs/Boards.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ The core set of supported flyable boards are:
1111
* Naze32
1212
* Sparky
1313
* SPRacingF3
14+
* [OpenPilot Revolution](Board%20-%20Revolution.md)
1415

1516
INAV also runs on the following developer boards:
1617

0 commit comments

Comments
 (0)