Merge pull request #719 from nathantsoi/cleanup/defines

some #defines
This commit is contained in:
Nathan 2016-07-12 23:33:56 -07:00 committed by GitHub
commit 16d59ff321
3 changed files with 8 additions and 1 deletions

View File

@ -40,6 +40,9 @@
#include "sensor.h"
#include "accgyro.h"
#include "accgyro_mpu.h"
#if defined(USE_GYRO_SPI_MPU6000) || defined(USE_ACC_SPI_MPU6000)
#include "accgyro_spi_mpu6000.h"
static void mpu6000AccAndGyroInit(void);
@ -282,3 +285,5 @@ bool mpu6000SpiGyroDetect(gyro_t *gyro)
return true;
}
#endif

View File

@ -25,6 +25,7 @@
#include "barometer.h"
#include "barometer_bmp280.h"
#ifdef USE_BARO_SPI_BMP280
#define DISABLE_BMP280 IOHi(bmp280CsPin)
#define ENABLE_BMP280 IOLo(bmp280CsPin)
@ -88,3 +89,4 @@ void bmp280_spi_get_up(void)
bmp280_up = (int32_t)((((uint32_t)(data[0])) << 12) | (((uint32_t)(data[1])) << 4) | ((uint32_t)data[2] >> 4));
bmp280_ut = (int32_t)((((uint32_t)(data[3])) << 12) | (((uint32_t)(data[4])) << 4) | ((uint32_t)data[5] >> 4));
}
#endif

View File

@ -193,7 +193,7 @@ void init(void)
EXTIInit();
#endif
#if defined(SPRACINGF3MINI) || defined(OMNIBUS)
#if defined(BUTTONS)
gpio_config_t buttonAGpioConfig = {
BUTTON_A_PIN,
Mode_IPU,