diff options
| author | Antonio Borneo <antonio.borneo@st.com> | 2017-03-23 23:03:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-23 23:03:39 +0000 |
| commit | 546d870f25957f363eb0ac5f834d68c54b636ee6 (patch) | |
| tree | 202855945f3d4f826db2f1c73834504f86b80e72 | |
| parent | 862082fad7351da2b0149094467ec22497acd535 (diff) | |
| parent | 17ee09d4ce31c2035e770f8ac02b306e8f8a9b5a (diff) | |
| download | contexthub-546d870f25957f363eb0ac5f834d68c54b636ee6.tar.gz | |
firmware: drivers/bosch_bmp280: move I2C ID definition in variant
am: 17ee09d4ce
Change-Id: I40d35eddd323fd72dd5af29cbd038d7c413cbbb6
| -rw-r--r-- | firmware/os/drivers/bosch_bmp280/bosch_bmp280.c | 7 | ||||
| -rw-r--r-- | firmware/variant/lunchbox/inc/variant/variant.h | 2 | ||||
| -rw-r--r-- | firmware/variant/nucleo/inc/variant/variant.h | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/firmware/os/drivers/bosch_bmp280/bosch_bmp280.c b/firmware/os/drivers/bosch_bmp280/bosch_bmp280.c index 5982c0c0..8525a233 100644 --- a/firmware/os/drivers/bosch_bmp280/bosch_bmp280.c +++ b/firmware/os/drivers/bosch_bmp280/bosch_bmp280.c @@ -28,12 +28,17 @@ #include <slab.h> #include <timer.h> #include <util.h> +#include <variant/variant.h> #define BMP280_APP_ID APP_ID_MAKE(NANOHUB_VENDOR_GOOGLE, 5) #define BMP280_APP_VERSION 3 -#define I2C_BUS_ID 0 +#ifndef BMP280_I2C_BUS_ID +#define BMP280_I2C_BUS_ID 0 +#endif + +#define I2C_BUS_ID BMP280_I2C_BUS_ID #define I2C_SPEED 400000 #define I2C_ADDR 0x76 diff --git a/firmware/variant/lunchbox/inc/variant/variant.h b/firmware/variant/lunchbox/inc/variant/variant.h index ae499f2e..39c723df 100644 --- a/firmware/variant/lunchbox/inc/variant/variant.h +++ b/firmware/variant/lunchbox/inc/variant/variant.h @@ -57,6 +57,8 @@ extern "C" { { (uint8_t *)(__shared_start + 0x20000), 0x20000, BL_FLASH_SHARED },\ } +#define BMP280_I2C_BUS_ID 0 + #define BMI160_TO_ANDROID_COORDINATE(x, y, z) \ do { \ int32_t xi = x, yi = y, zi = z; \ diff --git a/firmware/variant/nucleo/inc/variant/variant.h b/firmware/variant/nucleo/inc/variant/variant.h index 4cefbeeb..375dd7e0 100644 --- a/firmware/variant/nucleo/inc/variant/variant.h +++ b/firmware/variant/nucleo/inc/variant/variant.h @@ -38,6 +38,8 @@ extern "C" { #define DEBUG_UART_GPIO_TX GPIO_PA(2) #define DEBUG_UART_GPIO_RX GPIO_PA(3) +#define BMP280_I2C_BUS_ID 0 + #define BMI160_TO_ANDROID_COORDINATE(x, y, z) \ do { \ int32_t xi = x, yi = y, zi = z; \ |