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

Merge branch 'naze32pro' - work in progress

Conflicts:
	Makefile
This commit is contained in:
Dominic Clifton 2014-05-31 22:50:05 +01:00
commit 14448f4734
5 changed files with 51 additions and 10 deletions

View file

@ -53,6 +53,17 @@
#undef USE_GYRO_L3GD20
#endif
#ifdef NAZE32PRO
#undef USE_ACC_LSM303DLHC
#undef USE_ACC_ADXL345
#undef USE_ACC_BMA280
#undef USE_ACC_MMA8452
#undef USE_ACC_LSM303DLHC
#undef USE_GYRO_L3G4200D
#undef USE_GYRO_L3GD20
#undef USE_GYRO_MPU3050
#endif
#if defined(OLIMEXINO)
#undef USE_GYRO_L3GD20
#undef USE_GYRO_L3G4200D