Commit Graph

9 Commits

Author SHA1 Message Date
borisbstyle 12c9f65f43 Merge branch 'master' into betaflight
Conflicts:
	Makefile
	docs/Cli.md
	src/main/config/config.c
	src/main/drivers/accgyro_mpu3050.c
	src/main/drivers/accgyro_mpu6050.c
	src/main/drivers/accgyro_mpu6050.h
	src/main/drivers/accgyro_spi_mpu6000.c
	src/main/drivers/accgyro_spi_mpu6000.h
	src/main/drivers/accgyro_spi_mpu6500.c
	src/main/drivers/accgyro_spi_mpu6500.h
	src/main/drivers/barometer_bmp280.c
	src/main/drivers/sensor.h
	src/main/flight/pid.c
	src/main/mw.c
	src/main/rx/rx.c
	src/main/sensors/initialisation.c
	src/main/target/CC3D/target.h
2015-10-07 17:12:54 +02:00
Dominic Clifton 07d985ba5c More MPU cleanups. 2015-10-02 15:43:44 +01:00
Dominic Clifton aac13914f9 LPF setting is not needed to detect the gyro sensor, only when it's
initialised; now the lpf setting is passed to gyroInit().

This saves a bit of code size and ram as well as making the code
cleaner.
2015-10-02 15:43:44 +01:00
Dominic Clifton 06ceac0614 Remove unused variable warnings when no SPI sensors are used. 2015-10-02 15:43:44 +01:00
Dominic Clifton 85ba1eb0bd Add support for MPU6500 connected via I2C. 2015-10-02 15:43:44 +01:00
Dominic Clifton 678c0413cb Relocate and use some of the common MPU code from MPU6000 into
accgyro_mpu.c.
2015-10-02 15:43:44 +01:00
Dominic Clifton 0361d161fb Relocate and use some of the common MPU code from MPU6500 into
accgyro_mpu.c.
2015-10-02 15:43:44 +01:00
Dominic Clifton da46d9f1d2 Relocate and use some of the common MPU code from MPU3050 into
accgyro_mpu.c.
2015-10-02 15:43:44 +01:00
Dominic Clifton b46d56a5bd Relocate some of the common MPU code from MPU6050 into accgyro_mpu.c. 2015-10-02 15:43:44 +01:00