Merge branch 'LSM303DLHC_compass_new' of https://github.com/MJ666/cleanflight into MJ666-LSM303DLHC_compass_new
Conflicts: src/main/target/STM32F3DISCOVERY/target.h
This commit is contained in:
commit
1a2ee0e5b9
|
@ -42,6 +42,9 @@
|
||||||
#define ACC
|
#define ACC
|
||||||
#define USE_ACC_LSM303DLHC
|
#define USE_ACC_LSM303DLHC
|
||||||
|
|
||||||
|
#define MAG
|
||||||
|
#define USE_MAG_HMC5883
|
||||||
|
|
||||||
#define BEEPER
|
#define BEEPER
|
||||||
#define LED0
|
#define LED0
|
||||||
#define LED1
|
#define LED1
|
||||||
|
@ -56,7 +59,7 @@
|
||||||
|
|
||||||
#define USE_ADC
|
#define USE_ADC
|
||||||
|
|
||||||
#define SENSORS_SET (SENSOR_ACC)
|
#define SENSORS_SET (SENSOR_ACC | SENSOR_MAG)
|
||||||
|
|
||||||
#define BLACKBOX
|
#define BLACKBOX
|
||||||
#define GPS
|
#define GPS
|
||||||
|
|
Loading…
Reference in New Issue