Merge pull request #9628 from jflyper/bfdev-f1-maintenance-415

[F1] Maintenance to keep F1 buildable
This commit is contained in:
Michael Keller 2020-03-24 02:34:09 +13:00 committed by GitHub
commit 5f5f469c2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions

View File

@ -21,5 +21,6 @@ MEMORY
REGION_ALIAS("STACKRAM", RAM)
REGION_ALIAS("FASTRAM", RAM)
REGION_ALIAS("CCM", RAM)
INCLUDE "stm32_flash.ld"

View File

@ -117,7 +117,7 @@ void targetConfiguration(void)
}
#endif
#ifdef MAG_INT_EXTI
#if defined(USE_MAG) && defined(MAG_INT_EXTI)
if (hardwareRevision < NAZE32_REV5) {
compassConfigMutable()->interruptTag = IO_TAG(PB12);
}

View File

@ -43,7 +43,7 @@ void targetBusInit(void)
sensorsPreInit();
spiPreinit();
#ifdef USE_SPI_DEVICE_2
spiInit(SPIDEV_2);
spiInit(SPIDEV_2, false); // Leading edge not required for legacy sensors
#endif
#endif

View File

@ -101,16 +101,18 @@
//#define ACC_MMA8452_ALIGN CW90_DEG
//#define ACC_BMA280_ALIGN CW0_DEG
#define USE_BARO
#define USE_BARO_MS5611 // needed for Flip32 board
#define USE_BARO_BMP280
/*
#define USE_MAG
#define USE_MAG_HMC5883
#define MAG_HMC5883_ALIGN CW180_DEG
*/
// Barometer dropped to make flash space
//#define USE_BARO
//#define USE_BARO_MS5611 // needed for Flip32 board
//#define USE_BARO_BMP280
// Compass dropped to make flash space
//#define USE_MAG
//#define USE_MAG_HMC5883
//#define MAG_HMC5883_ALIGN CW180_DEG
// Rangefinder dropped to make flash space
//#define USE_RANGEFINDER
//#define USE_RANGEFINDER_HCSR04
//#define RANGEFINDER_HCSR04_TRIGGER_PIN PB0