Final touch-ups
This commit is contained in:
parent
ec8592d779
commit
f2d313e849
|
@ -101,7 +101,7 @@ void bmp280BusInit(busDevice_t *busdev)
|
||||||
if (busdev->bustype == BUSTYPE_SPI) {
|
if (busdev->bustype == BUSTYPE_SPI) {
|
||||||
IOInit(busdev->busdev_u.spi.csnPin, OWNER_BARO_CS, 0);
|
IOInit(busdev->busdev_u.spi.csnPin, OWNER_BARO_CS, 0);
|
||||||
IOConfigGPIO(busdev->busdev_u.spi.csnPin, IOCFG_OUT_PP);
|
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
|
spiSetDivisor(busdev->busdev_u.spi.instance, SPI_CLOCK_STANDARD); // XXX
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -17,6 +17,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#undef TELEMETRY_JETIEXBUS // no space left
|
||||||
|
|
||||||
#define TARGET_BOARD_IDENTIFIER "FRF3"
|
#define TARGET_BOARD_IDENTIFIER "FRF3"
|
||||||
#define TARGET_CONFIG
|
#define TARGET_CONFIG
|
||||||
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
|
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
|
||||||
|
|
|
@ -96,7 +96,6 @@
|
||||||
//#define MAG_NAZA_ALIGN CW180_DEG_FLIP // Ditto
|
//#define MAG_NAZA_ALIGN CW180_DEG_FLIP // Ditto
|
||||||
|
|
||||||
#define BARO
|
#define BARO
|
||||||
//#define USE_BARO_MS5611
|
|
||||||
#if defined(OMNIBUSF4SD)
|
#if defined(OMNIBUSF4SD)
|
||||||
#define USE_BARO_BMP280
|
#define USE_BARO_BMP280
|
||||||
#define USE_BARO_SPI_BMP280
|
#define USE_BARO_SPI_BMP280
|
||||||
|
@ -104,6 +103,7 @@
|
||||||
#define BMP280_CS_PIN PB3 // v1
|
#define BMP280_CS_PIN PB3 // v1
|
||||||
#endif
|
#endif
|
||||||
#define USE_BARO_BMP280
|
#define USE_BARO_BMP280
|
||||||
|
#define USE_BARO_MS5611
|
||||||
#define BARO_I2C_INSTANCE (I2CDEV_2)
|
#define BARO_I2C_INSTANCE (I2CDEV_2)
|
||||||
|
|
||||||
#define OSD
|
#define OSD
|
||||||
|
|
|
@ -140,11 +140,11 @@ extern "C" {
|
||||||
|
|
||||||
void delay(uint32_t) {}
|
void delay(uint32_t) {}
|
||||||
|
|
||||||
bool i2cWrite(uint8_t, uint8_t, uint8_t) {
|
bool i2cWriteRegister(uint8_t, uint8_t, uint8_t) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool i2cRead(uint8_t, uint8_t, uint8_t, uint8_t) {
|
bool i2cReadRegisterBuffer(uint8_t, uint8_t, uint8_t, uint8_t) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -141,15 +141,14 @@ extern "C" {
|
||||||
void delay(uint32_t) {}
|
void delay(uint32_t) {}
|
||||||
void delayMicroseconds(uint32_t) {}
|
void delayMicroseconds(uint32_t) {}
|
||||||
|
|
||||||
bool i2cWrite(uint8_t, uint8_t, uint8_t) {
|
bool i2cWriteRegister(uint8_t, uint8_t, uint8_t) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool i2cRead(uint8_t, uint8_t, uint8_t, uint8_t) {
|
bool i2cReadRegisterBuffer(uint8_t, uint8_t, uint8_t, uint8_t) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool spiWriteRegister(uint8_t, uint8_t, uint8_t) {
|
bool spiWriteRegister(uint8_t, uint8_t, uint8_t) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue