[VIVAF4AIO] Fix for non-working ACC (#8349)

[VIVAF4AIO] Fix for non-working ACC
This commit is contained in:
Michael Keller 2019-06-01 21:55:38 +12:00 committed by GitHub
commit e713cf0bdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 25 deletions

View File

@ -1 +0,0 @@
# VIVAF4AIO has motors 7 and 8 defined.

View File

@ -20,13 +20,8 @@
#pragma once
#if defined(VIVAF4AIO)
# define TARGET_BOARD_IDENTIFIER "VIVA"
# define USBD_PRODUCT_STRING "VIVAF405AIO"
#else
# define TARGET_BOARD_IDENTIFIER "DLF4"
# define USBD_PRODUCT_STRING "DALRCF405"
#endif
#define TARGET_BOARD_IDENTIFIER "DLF4"
#define USBD_PRODUCT_STRING "DALRCF405"
//----------------------------------------
//LED & BEE-------------------------------
@ -54,22 +49,14 @@
#define GYRO_1_CS_PIN PA4
#define GYRO_1_SPI_INSTANCE SPI1
#if defined(VIVAF4AIO)
//------ICM20602
# define USE_GYRO_SPI_ICM20602
# define USE_ACC_SPI_ICM20602
# define GYRO_1_ALIGN CW0_DEG
#else
//------ICM20689
# define USE_GYRO_SPI_ICM20689
# define USE_ACC_SPI_ICM20689
# define GYRO_1_ALIGN CW90_DEG
#endif
#define USE_GYRO_SPI_ICM20689
#define USE_ACC_SPI_ICM20689
//------MPU6000
#define USE_GYRO_SPI_MPU6000
#define USE_ACC_SPI_MPU6000
#define GYRO_1_ALIGN CW90_DEG
//Baro & MAG-------------------------------
#define USE_I2C
#define USE_I2C_DEVICE_1
@ -162,9 +149,5 @@
#define TARGET_IO_PORTC 0xffff
#define TARGET_IO_PORTD (BIT(2))
#if defined(VIVAF4AIO)
# define USABLE_TIMER_CHANNEL_COUNT 9
#else
# define USABLE_TIMER_CHANNEL_COUNT 11
#endif
#define USABLE_TIMER_CHANNEL_COUNT 11
#define USED_TIMERS (TIM_N(1)|TIM_N(2)|TIM_N(3)|TIM_N(4)|TIM_N(8)|TIM_N(12))