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

Merge branch 'master' into oled-ssd1306

Conflicts:
	src/main/common/printf.c
	src/main/main.c
	src/main/sensors/initialisation.c
	src/main/target/NAZE/target.h
This commit is contained in:
Dominic Clifton 2014-09-15 23:36:17 +01:00
commit 876cf6bdd7
24 changed files with 1158 additions and 378 deletions

View file

@ -159,8 +159,6 @@
#undef USE_ACC_MMA8452
#endif
extern uint16_t batteryWarningVoltage;
extern uint8_t batteryCellCount;
extern float magneticDeclination;
extern gyro_t gyro;