rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5900 from jflyper/bfdev-drop-stale-gyro-support 

Gradually retire stale/unused acc/gyro support
This commit is contained in:
Michael Keller 2018-05-17 23:16:21 +12:00 committed by GitHub
parent 2cb8f7e3e6 6c044829cc
commit edfa6cfcb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 86 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
make/source.mk
View File

@ -195,22 +195,22 @@ SPEED_OPTIMISED_SRC := $(SPEED_OPTIMISED_SRC) \
common/filter.c \
common/maths.c \
common/typeconversion.c \
drivers/accgyro/accgyro_adxl345.c \
drivers/accgyro/accgyro_bma280.c \
drivers/accgyro/accgyro_fake.c \
drivers/accgyro/accgyro_l3g4200d.c \
drivers/accgyro/accgyro_l3gd20.c \
drivers/accgyro/accgyro_lsm303dlhc.c \
drivers/accgyro/accgyro_mma845x.c \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_mpu3050.c \
drivers/accgyro/accgyro_mpu6050.c \
drivers/accgyro/accgyro_mpu6500.c \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_spi_bmi160.c \
drivers/accgyro/accgyro_spi_icm20689.c \
drivers/accgyro/accgyro_spi_mpu6000.c \
drivers/accgyro/accgyro_spi_mpu6500.c \
drivers/accgyro/accgyro_spi_mpu9250.c \
drivers/accgyro_legacy/accgyro_adxl345.c \
drivers/accgyro_legacy/accgyro_bma280.c \
drivers/accgyro_legacy/accgyro_l3g4200d.c \
drivers/accgyro_legacy/accgyro_l3gd20.c \
drivers/accgyro_legacy/accgyro_lsm303dlhc.c \
drivers/accgyro_legacy/accgyro_mma845x.c \
drivers/adc.c \
drivers/buf_writer.c \
drivers/bus.c \

1
src/main/drivers/accgyro/accgyro_mpu.c
View File

@ -54,7 +54,6 @@
#include "drivers/accgyro/accgyro_spi_mpu9250.h"
#include "drivers/accgyro/accgyro_mpu.h"
mpuResetFnPtr mpuResetFn;
#ifndef MPU_I2C_INSTANCE

2
src/main/drivers/accgyro/accgyro_adxl345.c → src/main/drivers/accgyro_legacy/accgyro_adxl345.c
View File

@ -26,7 +26,7 @@
#include "drivers/bus_i2c.h"
#include "drivers/sensor.h"
#include "accgyro.h"
#include "drivers/accgyro/accgyro.h"
#include "accgyro_adxl345.h"
// ADXL345, Alternative address mode 0x53

0
src/main/drivers/accgyro/accgyro_adxl345.h → src/main/drivers/accgyro_legacy/accgyro_adxl345.h
View File

2
src/main/drivers/accgyro/accgyro_bma280.c → src/main/drivers/accgyro_legacy/accgyro_bma280.c
View File

@ -26,7 +26,7 @@
#include "drivers/bus_i2c.h"
#include "drivers/sensor.h"
#include "accgyro.h"
#include "drivers/accgyro/accgyro.h"
#include "accgyro_bma280.h"
// BMA280, default I2C address mode 0x18

0
src/main/drivers/accgyro/accgyro_bma280.h → src/main/drivers/accgyro_legacy/accgyro_bma280.h
View File

2
src/main/drivers/accgyro/accgyro_l3g4200d.c → src/main/drivers/accgyro_legacy/accgyro_l3g4200d.c
View File

@ -25,7 +25,7 @@
#include <platform.h>
#include "accgyro.h"
#include "drivers/accgyro/accgyro.h"
#include "accgyro_l3g4200d.h"
#include "common/maths.h"

0
src/main/drivers/accgyro/accgyro_l3g4200d.h → src/main/drivers/accgyro_legacy/accgyro_l3g4200d.h
View File

2
src/main/drivers/accgyro/accgyro_l3gd20.c → src/main/drivers/accgyro_legacy/accgyro_l3gd20.c
View File

@ -35,7 +35,7 @@
#include "drivers/bus_spi.h"
#include "drivers/sensor.h"
#include "accgyro.h"
#include "drivers/accgyro/accgyro.h"
#include "accgyro_l3gd20.h"
#define READ_CMD ((uint8_t)0x80)

0
src/main/drivers/accgyro/accgyro_l3gd20.h → src/main/drivers/accgyro_legacy/accgyro_l3gd20.h
View File

2
src/main/drivers/accgyro/accgyro_lsm303dlhc.c → src/main/drivers/accgyro_legacy/accgyro_lsm303dlhc.c
View File

@ -35,7 +35,7 @@
#include "drivers/bus_i2c.h"
#include "drivers/sensor.h"
#include "accgyro.h"
#include "drivers/accgyro/accgyro.h"
#include "accgyro_lsm303dlhc.h"
// Addresses (7 bit address format)

0
src/main/drivers/accgyro/accgyro_lsm303dlhc.h → src/main/drivers/accgyro_legacy/accgyro_lsm303dlhc.h
View File

2
src/main/drivers/accgyro/accgyro_mma845x.c → src/main/drivers/accgyro_legacy/accgyro_mma845x.c
View File

@ -27,7 +27,7 @@
#include "drivers/bus_i2c.h"
#include "drivers/sensor.h"
#include "accgyro.h"
#include "drivers/accgyro/accgyro.h"
#include "accgyro_mma845x.h"
#ifndef MMA8452_I2C_INSTANCE

0
src/main/drivers/accgyro/accgyro_mma845x.h → src/main/drivers/accgyro_legacy/accgyro_mma845x.h
View File

23
src/main/sensors/acceleration.c
View File

@ -37,13 +37,7 @@
#include "pg/pg_ids.h"
#include "drivers/accgyro/accgyro.h"
#include "drivers/accgyro/accgyro_adxl345.h"
#include "drivers/accgyro/accgyro_bma280.h"
#include "drivers/accgyro/accgyro_fake.h"
#include "drivers/accgyro/accgyro_l3g4200d.h"
#include "drivers/accgyro/accgyro_l3gd20.h"
#include "drivers/accgyro/accgyro_lsm303dlhc.h"
#include "drivers/accgyro/accgyro_mma845x.h"
#include "drivers/accgyro/accgyro_mpu.h"
#include "drivers/accgyro/accgyro_mpu3050.h"
#include "drivers/accgyro/accgyro_mpu6050.h"
@ -54,6 +48,23 @@
#include "drivers/accgyro/accgyro_spi_mpu6000.h"
#include "drivers/accgyro/accgyro_spi_mpu6500.h"
#include "drivers/accgyro/accgyro_spi_mpu9250.h"
#ifdef USE_ACC_ADXL345
#include "drivers/accgyro_legacy/accgyro_adxl345.h"
#endif
#ifdef USE_ACC_BMA280
#include "drivers/accgyro_legacy/accgyro_bma280.h"
#endif
#ifdef USE_ACC_LSM303DLHC
#include "drivers/accgyro_legacy/accgyro_lsm303dlhc.h"
#endif
#ifdef USE_ACC_MMA8452
#include "drivers/accgyro_legacy/accgyro_mma845x.h"
#endif
#include "drivers/bus_spi.h"
#include "fc/config.h"

15
src/main/sensors/gyro.c
View File

@ -38,13 +38,7 @@
#include "pg/pg_ids.h"
#include "drivers/accgyro/accgyro.h"
#include "drivers/accgyro/accgyro_adxl345.h"
#include "drivers/accgyro/accgyro_bma280.h"
#include "drivers/accgyro/accgyro_fake.h"
#include "drivers/accgyro/accgyro_l3g4200d.h"
#include "drivers/accgyro/accgyro_l3gd20.h"
#include "drivers/accgyro/accgyro_lsm303dlhc.h"
#include "drivers/accgyro/accgyro_mma845x.h"
#include "drivers/accgyro/accgyro_mpu.h"
#include "drivers/accgyro/accgyro_mpu3050.h"
#include "drivers/accgyro/accgyro_mpu6050.h"
@ -55,6 +49,15 @@
#include "drivers/accgyro/accgyro_spi_mpu6000.h"
#include "drivers/accgyro/accgyro_spi_mpu6500.h"
#include "drivers/accgyro/accgyro_spi_mpu9250.h"
#ifdef USE_GYRO_L3G4200D
#include "drivers/accgyro_legacy/accgyro_l3g4200d.h"
#endif
#ifdef USE_GYRO_L3GD20
#include "drivers/accgyro_legacy/accgyro_l3gd20.h"
#endif
#include "drivers/accgyro/gyro_sync.h"
#include "drivers/bus_spi.h"
#include "drivers/io.h"

26
src/main/target/CHEBUZZF3/target.h
View File

@ -61,26 +61,26 @@
#define SDCARD_DMA_CHANNEL_TX DMA1_Channel5
#define USE_GYRO
#define USE_GYRO_L3GD20
//#define USE_GYRO_L3GD20
#define USE_GYRO_MPU6050
#define L3GD20_SPI SPI1
#define L3GD20_CS_GPIO_CLK_PERIPHERAL RCC_AHBPeriph_GPIOE
#define L3GD20_CS_GPIO GPIOE
#define L3GD20_CS_PIN PE3
//#define L3GD20_SPI SPI1
//#define L3GD20_CS_GPIO_CLK_PERIPHERAL RCC_AHBPeriph_GPIOE
//#define L3GD20_CS_GPIO GPIOE
//#define L3GD20_CS_PIN PE3
#define GYRO_L3GD20_ALIGN CW270_DEG
//#define GYRO_L3GD20_ALIGN CW270_DEG
#define GYRO_MPU6050_ALIGN CW0_DEG
#define USE_ACC
#define USE_ACC_MPU6050
#define USE_ACC_LSM303DLHC
#define LSM303DLHC_I2C I2C1
#define LSM303DLHC_I2C_SCK_PIN PB6
#define LSM303DLHC_I2C_SDA_PIN PB7
#define LSM303DLHC_DRDY_PIN PE2
#define LSM303DLHC_I2C_INT1_PIN PE4
#define LSM303DLHC_I2C_INT2_PIN PE5
//#define USE_ACC_LSM303DLHC
//#define LSM303DLHC_I2C I2C1
//#define LSM303DLHC_I2C_SCK_PIN PB6
//#define LSM303DLHC_I2C_SDA_PIN PB7
//#define LSM303DLHC_DRDY_PIN PE2
//#define LSM303DLHC_I2C_INT1_PIN PE4
//#define LSM303DLHC_I2C_INT2_PIN PE5
#define ACC_MPU6050_ALIGN CW0_DEG

12
src/main/target/CHEBUZZF3/target.mk
View File

@ -2,16 +2,16 @@ F3_TARGETS += $(TARGET)
FEATURES = VCP SDCARD
TARGET_SRC = \
drivers/accgyro/accgyro_l3gd20.c \
drivers/accgyro/accgyro_lsm303dlhc.c \
drivers/compass/compass_hmc5883l.c \
drivers/accgyro/accgyro_adxl345.c \
drivers/accgyro/accgyro_bma280.c \
drivers/accgyro/accgyro_mma845x.c \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_mpu3050.c \
drivers/accgyro/accgyro_mpu6050.c \
drivers/accgyro/accgyro_l3g4200d.c \
drivers/accgyro_legacy/accgyro_l3gd20.c \
drivers/accgyro_legacy/accgyro_lsm303dlhc.c \
drivers/accgyro_legacy/accgyro_adxl345.c \
drivers/accgyro_legacy/accgyro_bma280.c \
drivers/accgyro_legacy/accgyro_mma845x.c \
drivers/accgyro_legacy/accgyro_l3g4200d.c \
drivers/barometer/barometer_ms5611.c \
drivers/barometer/barometer_bmp280.c \
drivers/compass/compass_ak8975.c

12
src/main/target/NAZE/target.h
View File

@ -91,17 +91,17 @@
#define GYRO_MPU6500_ALIGN CW0_DEG
#define USE_ACC
#define USE_ACC_ADXL345
#define USE_ACC_BMA280
#define USE_ACC_MMA8452
//#define USE_ACC_ADXL345
//#define USE_ACC_BMA280
//#define USE_ACC_MMA8452
#define USE_ACC_MPU6050
#define USE_ACC_MPU6500
#define USE_ACC_SPI_MPU6500
#define ACC_ADXL345_ALIGN CW270_DEG
//#define ACC_ADXL345_ALIGN CW270_DEG
#define ACC_MPU6050_ALIGN CW0_DEG
#define ACC_MMA8452_ALIGN CW90_DEG
#define ACC_BMA280_ALIGN CW0_DEG
//#define ACC_MMA8452_ALIGN CW90_DEG
//#define ACC_BMA280_ALIGN CW0_DEG
#define ACC_MPU6500_ALIGN CW0_DEG
#define USE_BARO

8
src/main/target/NAZE/target.mk
View File

@ -2,10 +2,10 @@ F1_TARGETS += $(TARGET)
FEATURES = ONBOARDFLASH
TARGET_SRC = \
drivers/accgyro/accgyro_adxl345.c \
drivers/accgyro/accgyro_bma280.c \
drivers/accgyro/accgyro_l3g4200d.c \
drivers/accgyro/accgyro_mma845x.c \
drivers/accgyro_legacy/accgyro_adxl345.c \
drivers/accgyro_legacy/accgyro_bma280.c \
drivers/accgyro_legacy/accgyro_l3g4200d.c \
drivers/accgyro_legacy/accgyro_mma845x.c \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_mpu3050.c \
drivers/accgyro/accgyro_mpu6050.c \

20
src/main/target/STM32F3DISCOVERY/target.h
View File

@ -85,11 +85,11 @@
#define USE_GYRO
#define USE_FAKE_GYRO
#define USE_GYRO_L3GD20
#define L3GD20_SPI SPI1
#define L3GD20_CS_PIN PE3
#define GYRO_L3GD20_ALIGN CW270_DEG
#define USE_GYRO_L3G4200D
//#define USE_GYRO_L3GD20
//#define L3GD20_SPI SPI1
//#define L3GD20_CS_PIN PE3
//#define GYRO_L3GD20_ALIGN CW270_DEG
//#define USE_GYRO_L3G4200D
#define USE_GYRO_MPU3050
#define USE_GYRO_MPU6050
#define USE_GYRO_SPI_MPU6000
@ -105,7 +105,7 @@
#define MPU9250_CS_PIN SPI2_NSS_PIN
#define MPU9250_SPI_INSTANCE SPI2
// BMI160 gyro support
//#define USE_ACCGYRO_BMI160
#define USE_ACCGYRO_BMI160
#ifdef USE_ACCGYRO_BMI160
#define BMI160_CS_PIN SPI2_NSS_PIN
#define BMI160_SPI_INSTANCE SPI2
@ -117,11 +117,11 @@
#define USE_ACC
#define USE_FAKE_ACC
#define USE_ACC_ADXL345
#define USE_ACC_BMA280
#define USE_ACC_MMA8452
//#define USE_ACC_ADXL345
//#define USE_ACC_BMA280
//#define USE_ACC_MMA8452
#define USE_ACC_MPU6050
#define USE_ACC_LSM303DLHC
//#define USE_ACC_LSM303DLHC
#define USE_ACC_MPU6000
#define USE_ACC_SPI_MPU6000
#define USE_ACC_MPU6500

16
src/main/target/STM32F3DISCOVERY/target.mk
View File

@ -2,15 +2,7 @@ F3_TARGETS += $(TARGET)
FEATURES = VCP SDCARD ONBOARDFLASH
TARGET_SRC = \
drivers/accgyro/accgyro_adxl345.c \
drivers/accgyro/accgyro_bma280.c \
drivers/accgyro/accgyro_l3gd20.c \
drivers/accgyro/accgyro_l3g4200d.c \
drivers/accgyro/accgyro_lsm303dlhc.c \
drivers/accgyro/accgyro_adxl345.c \
drivers/accgyro/accgyro_fake.c \
drivers/accgyro/accgyro_bma280.c \
drivers/accgyro/accgyro_mma845x.c \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_mpu3050.c \
drivers/accgyro/accgyro_mpu6050.c \
@ -19,6 +11,14 @@ TARGET_SRC = \
drivers/accgyro/accgyro_spi_mpu6000.c \
drivers/accgyro/accgyro_spi_mpu6500.c \
drivers/accgyro/accgyro_spi_mpu9250.c \
drivers/accgyro_legacy/accgyro_adxl345.c \
drivers/accgyro_legacy/accgyro_bma280.c \
drivers/accgyro_legacy/accgyro_l3gd20.c \
drivers/accgyro_legacy/accgyro_l3g4200d.c \
drivers/accgyro_legacy/accgyro_lsm303dlhc.c \
drivers/accgyro_legacy/accgyro_adxl345.c \
drivers/accgyro_legacy/accgyro_bma280.c \
drivers/accgyro_legacy/accgyro_mma845x.c \
drivers/barometer/barometer_bmp085.c \
drivers/barometer/barometer_bmp280.c \
drivers/barometer/barometer_fake.c \