Skip to content

Commit

Permalink
Merge pull request #4851 from iNavFlight/development
Browse files Browse the repository at this point in the history
Release 2.2.0
  • Loading branch information
digitalentity authored Jun 18, 2019
2 parents 0fd2ac0 + d551063 commit 5e5551b
Show file tree
Hide file tree
Showing 321 changed files with 9,888 additions and 4,672 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ env:
- GOAL=targets-group-2
- GOAL=targets-group-3
- GOAL=targets-group-4
- GOAL=targets-group-5
- GOAL=targets-group-6
- GOAL=targets-group-7
- GOAL=targets-group-rest

# use new docker environment
Expand All @@ -28,7 +31,7 @@ before_install:

install:
- ./install-toolchain.sh
- export TOOLCHAINPATH=$PWD/gcc-arm-none-eabi-7-2018-q2-update/bin
- export TOOLCHAINPATH=$PWD/gcc-arm-none-eabi-8-2018-q4-major/bin
- export PATH=$TOOLCHAINPATH:$PATH

before_script:
Expand All @@ -41,7 +44,7 @@ script: ./.travis.sh
cache:
apt: true
directories:
- $PWD/gcc-arm-none-eabi-7-2018-q2-update
- $PWD/gcc-arm-none-eabi-8-2018-q4-major

notifications:
#slack: inavflight:UWRoWFJ4cbbpHXT8HJJlAPXa
Expand All @@ -51,4 +54,4 @@ notifications:
- https://webhooks.gitter.im/e/34e795df229478ac3a3b
on_success: always
on_failure: always
on_start: never
on_start: never
24 changes: 20 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,13 @@ $(error Unknown target MCU specified.)
endif

GROUP_1_TARGETS := ALIENFLIGHTF3 ALIENFLIGHTF4 AIRHEROF3 AIRHEROF3_QUAD COLIBRI_RACE LUX_RACE SPARKY REVO SPARKY2 COLIBRI KISSFC FALCORE FF_F35_LIGHTNING FF_FORTINIF4 FF_PIKOF4 FF_PIKOF4OSD
GROUP_2_TARGETS := SPRACINGF3 SPRACINGF3EVO SPRACINGF3EVO_1SS SPRACINGF3MINI SPRACINGF4EVO CLRACINGF4AIR CLRACINGF4AIRV2 BEEROTORF4 BETAFLIGHTF3 BETAFLIGHTF4 PIKOBLX SPRACINGF3NEO
GROUP_3_TARGETS := OMNIBUS AIRBOTF4 BLUEJAYF4 OMNIBUSF4 OMNIBUSF4PRO OMNIBUSF4V3 FIREWORKSV2 SPARKY2 MATEKF405 OMNIBUSF7 DYSF4PRO OMNIBUSF4PRO_LEDSTRIPM5 OMNIBUSF7NXT OMNIBUSF7V2 ASGARD32F4
GROUP_2_TARGETS := SPRACINGF3 SPRACINGF3EVO SPRACINGF3EVO_1SS SPRACINGF3MINI SPRACINGF4EVO CLRACINGF4AIR CLRACINGF4AIRV2 BEEROTORF4 BETAFLIGHTF3 BETAFLIGHTF4 PIKOBLX
GROUP_3_TARGETS := OMNIBUS AIRBOTF4 BLUEJAYF4 OMNIBUSF4 OMNIBUSF4PRO FIREWORKSV2 SPARKY2 MATEKF405 OMNIBUSF7 DYSF4PRO OMNIBUSF4PRO_LEDSTRIPM5 OMNIBUSF7NXT OMNIBUSF7V2 ASGARD32F4
GROUP_4_TARGETS := ANYFC ANYFCF7 ANYFCF7_EXTERNAL_BARO ANYFCM7 ALIENFLIGHTNGF7 PIXRACER YUPIF4 YUPIF4MINI YUPIF4R2 YUPIF7 MATEKF405SE MATEKF411 MATEKF722 MATEKF405OSD MATEKF405_SERVOS6 NOX
GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS), $(VALID_TARGETS))
GROUP_5_TARGETS := ASGARD32F7 CHEBUZZF3 CLRACINGF4AIRV3 DALRCF405 DALRCF722DUAL DYSF4PROV2 F4BY FISHDRONEF4 FOXEERF405 FOXEERF722DUAL FRSKYF3 FRSKYF4 FURYF3 FURYF3_SPIFLASH FURYF4OSD
GROUP_6_TARGETS := MAMBAF405 OMNIBUSF4V3 OMNIBUSF4V3_S6_SS OMNIBUSF4V3_S5S6_SS OMNIBUSF4V3_S5_S6_2SS
GROUP_7_TARGETS := KAKUTEF4 KAKUTEF4V2 KAKUTEF7 KAKUTEF7MINI KFC32F3_INAV KROOZX MATEKF411_RSSI MATEKF411_SFTSRL2 MATEKF722MINI MATEKF722SE MATEKF722_HEXSERVO
GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS) $(GROUP_5_TARGETS) $(GROUP_6_TARGETS) $(GROUP_7_TARGETS), $(VALID_TARGETS))

REVISION = $(shell git rev-parse --short HEAD)

Expand Down Expand Up @@ -221,6 +224,7 @@ CFLAGS += $(ARCH_FLAGS) \
$(DEBUG_FLAGS) \
-std=gnu99 \
-Wall -Wextra -Wunsafe-loop-optimizations -Wdouble-promotion \
-Wstrict-prototypes \
-Werror=switch \
-ffunction-sections \
-fdata-sections \
Expand Down Expand Up @@ -377,9 +381,18 @@ targets-group-2: $(GROUP_2_TARGETS)
## targets-group-3 : build some targets
targets-group-3: $(GROUP_3_TARGETS)

## targets-group-3 : build some targets
## targets-group-4 : build some targets
targets-group-4: $(GROUP_4_TARGETS)

## targets-group-5 : build some targets
targets-group-5: $(GROUP_5_TARGETS)

## targets-group-6 : build some targets
targets-group-6: $(GROUP_6_TARGETS)

## targets-group-7 : build some targets
targets-group-7: $(GROUP_7_TARGETS)

## targets-group-rest: build the rest of the targets (not listed in group 1, 2 or 3)
targets-group-rest: $(GROUP_OTHER_TARGETS)

Expand Down Expand Up @@ -471,6 +484,9 @@ targets:
$(V0) @echo "targets-group-2: $(GROUP_2_TARGETS)"
$(V0) @echo "targets-group-3: $(GROUP_3_TARGETS)"
$(V0) @echo "targets-group-4: $(GROUP_4_TARGETS)"
$(V0) @echo "targets-group-5: $(GROUP_5_TARGETS)"
$(V0) @echo "targets-group-6: $(GROUP_6_TARGETS)"
$(V0) @echo "targets-group-7: $(GROUP_7_TARGETS)"
$(V0) @echo "targets-group-rest: $(GROUP_OTHER_TARGETS)"
$(V0) @echo "Release targets: $(RELEASE_TARGETS)"

Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ Users of FrSky Taranis X9 and Q X7 can use INAV Lua Telemetry screen created by
See: https://github.com/iNavFlight/inav/blob/master/docs/Installation.md

## Documentation, support and learning resources

* [Fixed Wing Guide](docs/INAV_Fixed_Wing_Setup_Guide.pdf)
* [Autolaunch Guide](docs/INAV_Autolaunch.pdf)
* [Modes Guide](docs/INAV_Modes.pdf)
* [Wing Tuning Masterclass](docs/INAV_Wing_Tuning_Masterclass.pdf)
* [Official documentation](https://github.com/iNavFlight/inav/tree/master/docs)
* [Official Wiki](https://github.com/iNavFlight/inav/wiki)
* [INAV Official on Telegram](https://t.me/INAVFlight)
Expand Down
3 changes: 2 additions & 1 deletion docs/Board - Matek F411 Wing.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
## Available TARGETS

* `MATEKF411` if you want to control LEDs and have SS1 TX on ST1 pad.
* `MATEKF411_SFTSRL2`if you want to use two softserials (TX only) at the same time. Eg. Smart Audio + S. Port, Smart Audio + LTM
* `MATEKF411_FD_SFTSRL` if you need the softserial to be full-duplex (TX = ST1 pad, RX = LED pad), at the cost of losing the LED output.
* `MATEKF411_RSSI` if you want to have analog RSSI input on ST1 pad. SS1 TX will be available on the LED pad.
* `MATEKF411_SFTSRL2`if you want to use two softserials (TX only) at the same time. Eg. Smart Audio + S. Port, Smart Audio + LTM

## Where to buy:

Expand Down
2 changes: 2 additions & 0 deletions docs/Board - MatekF405.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,6 @@ Rcgroups Thread Matek F405: https://www.rcgroups.com/forums/showthread.php?28892

Rcgroups Thread Matek F405-AIO: https://www.rcgroups.com/forums/showthread.php?2912273-Matek-Flight-Controller-F405-AIO

This board doesn't have hardware inverters for UART pins. This page explains getting SmartPort telemetry working on F4 board: https://github.com/iNavFlight/inav/blob/master/docs/Telemetry.md


2 changes: 1 addition & 1 deletion docs/Board - NOX.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@

## Where to buy:
* [Airbot](https://store.myairbot.com/noxv2.html)
* [Banggood](https://www.banggood.com/nl/20x20mm-Betaflight-F4-Noxe-MPU6000-Flight-Controller-AIO-OSD-5V-BEC-Built-in-LC-Filter-for-RC-Drone-p-1310419.html)
* [Banggood](https:inavflight.com/shop/s/bg/1310419)
5 changes: 5 additions & 0 deletions docs/Board - Omnibus F4.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@
* PPM and UART6 can be used together when S.BUS jumper is removed (close to PPM/SBUS connector)
* Uses target **OMNIBUSF4V3**

More target options:
* OMNIBUSF4V3_S6_SS: Softserial1 on S6
* OMNIBUSF4V3_S5_S6_2SS: Softserial1 on S5 and Softserial2 on S6
* OMNIBUSF4V3_S5S6_SS: Softserial1 on S5/RX and S6/TX

### [Omnibus F4 v4/v5](https://inavflight.com/shop/p/OMNIBUSF4V5)

* Switching voltage regulator - solves problem of overheating BEC
Expand Down
41 changes: 39 additions & 2 deletions docs/Buzzer.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,43 @@ Sequences:
14 DISARM_REPEAT 0, 100, 10 Stick held in disarm position (after pause)
15 ARMED 0, 245, 10, 5 Board is armed (after pause ; repeats until board is disarmed or throttle is increased)

## Controlling buzzer usage

The usage of the buzzer can be controlled by the CLI `beeper` command.

### List current usage

```
beeper
```
### List all buzzer setting options

```
beeper list
```
giving:

```
Available: RUNTIME_CALIBRATION HW_FAILURE RX_LOST RX_LOST_LANDING DISARMING ARMING ARMING_GPS_FIX BAT_CRIT_LOW BAT_LOW GPS_STATUS RX_SET ACTION_SUCCESS ACTION_FAIL READY_BEEP MULTI_BEEPS DISARM_REPEAT ARMED SYSTEM_INIT ON_USB LAUNCH_MODE CAM_CONNECTION_OPEN CAM_CONNECTION_CLOSED ALL PREFERED
```

The `beeper` command syntax follows that of the `feature` command; a minus (`-`) in front of a name disables that function.

So to disable the beeper / buzzer when connected to USB (may enhance domestic harmony)

```
beeper -ON_USB
```

Now the `beeper` command will show:

```
# beeper
Disabled: ON_USB
```

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

## Types of buzzer supported

Expand All @@ -54,7 +91,7 @@ Buzzers that need an analog or PWM signal do not work and will make clicking noi
Examples of a known-working buzzers.

* [Hcm1205x Miniature Buzzer 5v](http://www.rapidonline.com/Audio-Visual/Hcm1205x-Miniature-Buzzer-5v-35-0055)
* [5V Electromagnetic Active Buzzer Continuous Beep](http://www.banggood.com/10Pcs-5V-Electromagnetic-Active-Buzzer-Continuous-Beep-Continuously-p-943524.html)
* [5V Electromagnetic Active Buzzer Continuous Beep](https://inavflight.com/shop/s/bg/943524)
* [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)
* [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)
* [3-24V Piezo Electronic Tone Buzzer Alarm 95DB](http://www.banggood.com/3-24V-Piezo-Electronic-Tone-Buzzer-Alarm-95DB-Continuous-Sound-p-919348.html)
* [3-24V Piezo Electronic Tone Buzzer Alarm 95DB](https://inavflight.com/shop/s/bg/919348)
Loading

0 comments on commit 5e5551b

Please sign in to comment.