1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 14:25:20 +03:00

Merge branch 'feature-sonar-flight-mode-no-baro' of dclifton-github.com:nebbian/cleanflight into nebbian-feature-sonar-flight-mode-no-baro

Fixed tabs, kept old references to VARIO.  Made SONAR mode a new option so that aux settings could be preserved.

Conflicts:
	src/main/config/runtime_config.h
	src/main/flight/altitudehold.h
	src/main/flight/imu.c
	src/main/io/rc_controls.h
	src/main/mw.c
	src/main/sensors/initialisation.c
This commit is contained in:
Dominic Clifton 2014-09-26 13:36:19 +01:00
commit 3eb8bcb3e5
8 changed files with 77 additions and 20 deletions

View file

@ -40,6 +40,7 @@ typedef enum {
BOXOSD,
BOXTELEMETRY,
BOXAUTOTUNE,
BOXSONAR,
CHECKBOX_ITEM_COUNT
} boxId_e;