1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 01:05:27 +03:00

Merge branch 'master' into betaflight

Conflicts:
	Makefile
	src/main/io/serial_cli.c
	src/main/main.c
	src/main/sensors/initialisation.c
	src/main/sensors/initialisation.h
This commit is contained in:
borisbstyle 2015-09-11 11:19:25 +02:00
commit 5a1301f73d
27 changed files with 852 additions and 111 deletions

View file

@ -28,6 +28,7 @@ typedef enum {
#define BARO_MAX BARO_BMP280
#define BARO_SAMPLE_COUNT_MAX 48
#define BARO_MAX BARO_MS5611
typedef struct barometerConfig_s {
uint8_t baro_sample_count; // size of baro filter array