From f2d313e8498a447524b4d33051fb1bd4aeb420aa Mon Sep 17 00:00:00 2001 From: jflyper Date: Tue, 18 Jul 2017 19:05:33 +0900 Subject: [PATCH] Final touch-ups --- src/main/drivers/barometer/barometer_bmp280.c | 2 +- src/main/target/FRSKYF3/target.h | 2 ++ src/main/target/OMNIBUSF4/target.h | 2 +- src/test/unit/baro_bmp280_unittest.cc | 4 ++-- src/test/unit/baro_ms5611_unittest.cc | 5 ++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/drivers/barometer/barometer_bmp280.c b/src/main/drivers/barometer/barometer_bmp280.c index a4a3d1569..794ec7f03 100644 --- a/src/main/drivers/barometer/barometer_bmp280.c +++ b/src/main/drivers/barometer/barometer_bmp280.c @@ -101,7 +101,7 @@ void bmp280BusInit(busDevice_t *busdev) if (busdev->bustype == BUSTYPE_SPI) { IOInit(busdev->busdev_u.spi.csnPin, OWNER_BARO_CS, 0); IOConfigGPIO(busdev->busdev_u.spi.csnPin, IOCFG_OUT_PP); - IOHi((busdev)->busdev_u.spi.csnPin); // Disable + IOHi(busdev->busdev_u.spi.csnPin); // Disable spiSetDivisor(busdev->busdev_u.spi.instance, SPI_CLOCK_STANDARD); // XXX } #else diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h index 7c6e3001f..6a577ed10 100644 --- a/src/main/target/FRSKYF3/target.h +++ b/src/main/target/FRSKYF3/target.h @@ -17,6 +17,8 @@ #pragma once +#undef TELEMETRY_JETIEXBUS // no space left + #define TARGET_BOARD_IDENTIFIER "FRF3" #define TARGET_CONFIG #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index 932282de3..478dcdffd 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -96,7 +96,6 @@ //#define MAG_NAZA_ALIGN CW180_DEG_FLIP // Ditto #define BARO -//#define USE_BARO_MS5611 #if defined(OMNIBUSF4SD) #define USE_BARO_BMP280 #define USE_BARO_SPI_BMP280 @@ -104,6 +103,7 @@ #define BMP280_CS_PIN PB3 // v1 #endif #define USE_BARO_BMP280 +#define USE_BARO_MS5611 #define BARO_I2C_INSTANCE (I2CDEV_2) #define OSD diff --git a/src/test/unit/baro_bmp280_unittest.cc b/src/test/unit/baro_bmp280_unittest.cc index 482a398a6..2fa0fdb6a 100644 --- a/src/test/unit/baro_bmp280_unittest.cc +++ b/src/test/unit/baro_bmp280_unittest.cc @@ -140,11 +140,11 @@ extern "C" { void delay(uint32_t) {} -bool i2cWrite(uint8_t, uint8_t, uint8_t) { +bool i2cWriteRegister(uint8_t, uint8_t, uint8_t) { return true; } -bool i2cRead(uint8_t, uint8_t, uint8_t, uint8_t) { +bool i2cReadRegisterBuffer(uint8_t, uint8_t, uint8_t, uint8_t) { return true; } diff --git a/src/test/unit/baro_ms5611_unittest.cc b/src/test/unit/baro_ms5611_unittest.cc index 882640974..26152b7f7 100644 --- a/src/test/unit/baro_ms5611_unittest.cc +++ b/src/test/unit/baro_ms5611_unittest.cc @@ -141,15 +141,14 @@ extern "C" { void delay(uint32_t) {} void delayMicroseconds(uint32_t) {} -bool i2cWrite(uint8_t, uint8_t, uint8_t) { +bool i2cWriteRegister(uint8_t, uint8_t, uint8_t) { return true; } -bool i2cRead(uint8_t, uint8_t, uint8_t, uint8_t) { +bool i2cReadRegisterBuffer(uint8_t, uint8_t, uint8_t, uint8_t) { return true; } - bool spiWriteRegister(uint8_t, uint8_t, uint8_t) { return true; }