From 0f4b3dbe7f094aab9f4e87ba4b48ab1b847ed608 Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Sun, 17 Jul 2016 09:35:22 +0100 Subject: [PATCH] Further standardisation of target.h files --- src/main/target/AIR32/target.h | 3 +-- src/main/target/ALIENFLIGHTF4/target.h | 3 +-- src/main/target/CHEBUZZF3/target.h | 3 +-- src/main/target/COLIBRI_RACE/target.h | 20 ++++++++------------ src/main/target/EUSTM32F103RC/target.h | 3 ++- src/main/target/FURYF3/target.h | 12 ++++-------- src/main/target/LUX_RACE/target.h | 20 +++++++++----------- src/main/target/MOTOLAB/target.h | 3 +-- src/main/target/NAZE/target.h | 15 ++++++--------- src/main/target/REVO/target.h | 7 +++---- src/main/target/REVONANO/target.h | 7 +++---- src/main/target/RMDO/target.h | 6 +----- src/main/target/SPARKY/target.h | 3 +-- src/main/target/SPRACINGF3/target.h | 9 +++------ src/main/target/STM32F3DISCOVERY/target.h | 11 +++++------ 15 files changed, 49 insertions(+), 76 deletions(-) diff --git a/src/main/target/AIR32/target.h b/src/main/target/AIR32/target.h index 10bc3a49b..e4c97dfc5 100644 --- a/src/main/target/AIR32/target.h +++ b/src/main/target/AIR32/target.h @@ -26,8 +26,6 @@ #define BEEPER PA0 -#define USABLE_TIMER_CHANNEL_COUNT 9 - // MPU6050 interrupts #define USE_EXTI #define MPU_INT_EXTI PA15 @@ -142,5 +140,6 @@ // !!TODO - check the following line is correct #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(3)|BIT(4)) +#define USABLE_TIMER_CHANNEL_COUNT 9 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(15) | TIM_N(17)) diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h index 45a40fb0f..5bd61457f 100644 --- a/src/main/target/ALIENFLIGHTF4/target.h +++ b/src/main/target/ALIENFLIGHTF4/target.h @@ -93,8 +93,6 @@ //#define USE_FLASHFS //#define USE_FLASH_M25P16 -#define USABLE_TIMER_CHANNEL_COUNT 13 - #define USE_VCP #define USE_UART1 @@ -175,5 +173,6 @@ #define TARGET_IO_PORTC 0xffff #define TARGET_IO_PORTD (BIT(2)) +#define USABLE_TIMER_CHANNEL_COUNT 13 #define USED_TIMERS ( TIM_N(1) | TIM_N(3) | TIM_N(4) | TIM_N(5) | TIM_N(8) ) diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h index 84f7071c8..5623a8a87 100644 --- a/src/main/target/CHEBUZZF3/target.h +++ b/src/main/target/CHEBUZZF3/target.h @@ -32,8 +32,6 @@ #define BEEPER PE9 // Red LEDs - PE9/PE13 #define BEEPER_INVERTED -#define USABLE_TIMER_CHANNEL_COUNT 18 - #define USE_SPI #define USE_SPI_DEVICE_1 #define USE_SPI_DEVICE_2 @@ -113,5 +111,6 @@ #define TARGET_IO_PORTE 0xffff #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(4)|BIT(9)|BIT(10)) +#define USABLE_TIMER_CHANNEL_COUNT 18 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) | TIM_N(15) | TIM_N(16) | TIM_N(17)) diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h index f98d39eb3..d4db45a6d 100755 --- a/src/main/target/COLIBRI_RACE/target.h +++ b/src/main/target/COLIBRI_RACE/target.h @@ -31,7 +31,14 @@ #define BEEPER PB13 #define BEEPER_INVERTED +// MPU6500 interrupt #define USE_EXTI +#define MPU_INT_EXTI PA5 +#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready +#define USE_MPU_DATA_READY_SIGNAL +#define ENSURE_MPU_DATA_READY_IS_LOW +//#define DEBUG_MPU_DATA_READY_INTERRUPT + #define USE_SPI #define USE_SPI_DEVICE_1 @@ -47,10 +54,6 @@ #define MPU6000_CS_PIN SPI1_NSS_PIN #define MPU6000_SPI_INSTANCE SPI1 -#define USABLE_TIMER_CHANNEL_COUNT 11 - -#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready - #define GYRO #define USE_GYRO_SPI_MPU6000 #define GYRO_MPU6000_ALIGN CW270_DEG @@ -119,14 +122,6 @@ #define WS2811_DMA_TC_FLAG DMA1_FLAG_TC3 #define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH3_HANDLER - -// MPU6500 interrupt -#define USE_EXTI -#define MPU_INT_EXTI PA5 -//#define DEBUG_MPU_DATA_READY_INTERRUPT -#define USE_MPU_DATA_READY_SIGNAL -#define ENSURE_MPU_DATA_READY_IS_LOW - #define DEFAULT_FEATURES FEATURE_VBAT #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS @@ -141,5 +136,6 @@ #define TARGET_IO_PORTD (BIT(2)) #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(4)) +#define USABLE_TIMER_CHANNEL_COUNT 11 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(15)) diff --git a/src/main/target/EUSTM32F103RC/target.h b/src/main/target/EUSTM32F103RC/target.h index 87c531b10..12ec85f37 100644 --- a/src/main/target/EUSTM32F103RC/target.h +++ b/src/main/target/EUSTM32F103RC/target.h @@ -23,9 +23,10 @@ #define LED1 PB4 #define INVERTER PB2 // PB2 (BOOT1) abused as inverter select GPIO -#define INVERTER_USART USART2 +#define INVERTER_USART USART2 #define USE_EXTI + #define MPU6000_CS_GPIO GPIOB #define MPU6000_CS_PIN PB12 #define MPU6000_SPI_INSTANCE SPI2 diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h index 82323ad05..858b2d76e 100644 --- a/src/main/target/FURYF3/target.h +++ b/src/main/target/FURYF3/target.h @@ -20,9 +20,6 @@ #define TARGET_BOARD_IDENTIFIER "FYF3" #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT - -#define MPU_INT_EXTI PC4 -#define USE_EXTI #define CONFIG_PREFER_ACC_ON #define LED0 PC14 @@ -30,18 +27,18 @@ #define BEEPER PC15 #define BEEPER_INVERTED +#define USE_EXTI +#define MPU_INT_EXTI PC4 #define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU INT, SDCardDetect - #define USE_MPU_DATA_READY_SIGNAL #define ENSURE_MPU_DATA_READY_IS_LOW -#define GYRO - #define MPU6000_CS_PIN PA4 #define MPU6000_SPI_INSTANCE SPI1 #define MPU6500_CS_PIN PA4 #define MPU6500_SPI_INSTANCE SPI1 +#define GYRO #define USE_GYRO_SPI_MPU6000 #define GYRO_MPU6000_ALIGN CW180_DEG #define USE_ACC_SPI_MPU6000 @@ -101,8 +98,6 @@ // Performance logging for SD card operations: // #define AFATFS_USE_INTROSPECTIVE_LOGGING -#define USABLE_TIMER_CHANNEL_COUNT 8 - #define USB_IO #define USE_VCP @@ -167,5 +162,6 @@ #define TARGET_IO_PORTD 0xffff #define TARGET_IO_PORTF (BIT(4)) +#define USABLE_TIMER_CHANNEL_COUNT 8 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(16) |TIM_N(17)) diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h index ef5fc8547..b0a2bf752 100644 --- a/src/main/target/LUX_RACE/target.h +++ b/src/main/target/LUX_RACE/target.h @@ -29,6 +29,14 @@ #define BEEPER PB13 #define BEEPER_INVERTED +// MPU6500 interrupt +#define USE_EXTI +#define MPU_INT_EXTI PA5 +#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready +//#define DEBUG_MPU_DATA_READY_INTERRUPT +#define USE_MPU_DATA_READY_SIGNAL +#define ENSURE_MPU_DATA_READY_IS_LOW + #define USE_SPI #define USE_SPI_DEVICE_1 @@ -40,10 +48,6 @@ #define MPU6500_CS_PIN SPI1_NSS_PIN #define MPU6500_SPI_INSTANCE SPI1 -#define USABLE_TIMER_CHANNEL_COUNT 11 - -#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready - #define GYRO #define USE_GYRO_MPU6500 #define USE_GYRO_SPI_MPU6500 @@ -90,13 +94,6 @@ #define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH3_HANDLER -// MPU6500 interrupt -#define USE_EXTI -#define MPU_INT_EXTI PA5 -//#define DEBUG_MPU_DATA_READY_INTERRUPT -#define USE_MPU_DATA_READY_SIGNAL -#define ENSURE_MPU_DATA_READY_IS_LOW - #define DEFAULT_RX_FEATURE FEATURE_RX_PPM #define SPEKTRUM_BIND @@ -112,5 +109,6 @@ #define TARGET_IO_PORTD (BIT(2)) #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(4)) +#define USABLE_TIMER_CHANNEL_COUNT 11 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(15)) diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h index 1db54b988..fe465da9c 100644 --- a/src/main/target/MOTOLAB/target.h +++ b/src/main/target/MOTOLAB/target.h @@ -28,8 +28,6 @@ #define BEEPER PA0 #define BEEPER_INVERTED -#define USABLE_TIMER_CHANNEL_COUNT 9 - // MPU6050 interrupts #define USE_EXTI #define MPU_INT_EXTI PA15 @@ -147,5 +145,6 @@ // !!TODO - check the following line is correct #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(3)|BIT(4)) +#define USABLE_TIMER_CHANNEL_COUNT 9 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(15) | TIM_N(17)) diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h index 390dc39f2..512746d00 100644 --- a/src/main/target/NAZE/target.h +++ b/src/main/target/NAZE/target.h @@ -37,6 +37,12 @@ #define INVERTER_USART USART2 #define USE_EXTI +#define MAG_INT_EXTI PC14 +#define EXTI_CALLBACK_HANDLER_COUNT 3 // MPU data ready, MAG data ready, BMP085 EOC +//#define DEBUG_MPU_DATA_READY_INTERRUPT +#define USE_MPU_DATA_READY_SIGNAL +//#define DEBUG_MAG_DATA_READY_INTERRUPT +#define USE_MAG_DATA_READY_SIGNAL // SPI2 // PB15 28 SPI2_MOSI @@ -65,15 +71,6 @@ #define USE_FLASHFS #define USE_FLASH_M25P16 -#define EXTI_CALLBACK_HANDLER_COUNT 3 // MPU data ready, MAG data ready, BMP085 EOC - -//#define DEBUG_MPU_DATA_READY_INTERRUPT -#define USE_MPU_DATA_READY_SIGNAL - -//#define DEBUG_MAG_DATA_READY_INTERRUPT -#define USE_MAG_DATA_READY_SIGNAL -#define MAG_INT_EXTI PC14 - #define GYRO #define USE_GYRO_MPU3050 #define USE_GYRO_MPU6050 diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index f566b07da..9aab5b4b1 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -44,10 +44,10 @@ #define ACC_MPU6000_ALIGN CW270_DEG // MPU6000 interrupts +#define USE_EXTI +#define MPU_INT_EXTI PC4 #define USE_MPU_DATA_READY_SIGNAL #define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled) -#define MPU_INT_EXTI PC4 -#define USE_EXTI #define MAG #define USE_MAG_HMC5883 @@ -69,8 +69,6 @@ #define USE_FLASHFS #define USE_FLASH_M25P16 -#define USABLE_TIMER_CHANNEL_COUNT 12 - #define USE_VCP #define VBUS_SENSING_PIN PC5 @@ -121,4 +119,5 @@ #define TARGET_IO_PORTC 0xffff #define TARGET_IO_PORTD 0xffff +#define USABLE_TIMER_CHANNEL_COUNT 12 #define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(12) | TIM_N(8) | TIM_N(9) ) diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h index a298c3ed9..448d235b8 100644 --- a/src/main/target/REVONANO/target.h +++ b/src/main/target/REVONANO/target.h @@ -53,13 +53,11 @@ #define USE_BARO_MS5611 // MPU9250 interrupts +#define USE_EXTI +#define MPU_INT_EXTI PA15 #define USE_MPU_DATA_READY_SIGNAL //#define ENSURE_MPU_DATA_READY_IS_LOW #define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready (mag disabled) -#define MPU_INT_EXTI PA15 -#define USE_EXTI - -#define USABLE_TIMER_CHANNEL_COUNT 12 #define USE_VCP #define VBUS_SENSING_PIN PA9 @@ -98,5 +96,6 @@ #define TARGET_IO_PORTB 0xffff #define TARGET_IO_PORTC 0xffff +#define USABLE_TIMER_CHANNEL_COUNT 12 #define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(5) ) diff --git a/src/main/target/RMDO/target.h b/src/main/target/RMDO/target.h index fadbdb874..67d2232e6 100644 --- a/src/main/target/RMDO/target.h +++ b/src/main/target/RMDO/target.h @@ -26,17 +26,12 @@ #define BEEPER PC15 #define BEEPER_INVERTED -#define USABLE_TIMER_CHANNEL_COUNT 17 - #define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready and MAG data ready - #define USE_MPU_DATA_READY_SIGNAL #define ENSURE_MPU_DATA_READY_IS_LOW - #define USE_MAG_DATA_READY_SIGNAL #define ENSURE_MAG_DATA_READY_IS_HIGH - #define GYRO #define USE_GYRO_MPU6050 #define GYRO_MPU6050_ALIGN CW270_DEG @@ -119,5 +114,6 @@ #define TARGET_IO_PORTC (BIT(13)|BIT(14)|BIT(15)) #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(4)) +#define USABLE_TIMER_CHANNEL_COUNT 17 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(15) | TIM_N(16) |TIM_N(17)) diff --git a/src/main/target/SPARKY/target.h b/src/main/target/SPARKY/target.h index db0528e98..ab498ff5a 100644 --- a/src/main/target/SPARKY/target.h +++ b/src/main/target/SPARKY/target.h @@ -27,8 +27,6 @@ #define BEEPER PA1 #define BEEPER_INVERTED -#define USABLE_TIMER_CHANNEL_COUNT 11 - // MPU6050 interrupts #define USE_EXTI #define MPU_INT_EXTI PA15 @@ -127,5 +125,6 @@ #define TARGET_IO_PORTB (BIT(0)|BIT(1)|BIT(6)|BIT(10)|BIT(11)|BIT(14)|BIT(15)|BIT(3)|BIT(4)|BIT(5)|BIT(6)|BIT(7)|BIT(8)|BIT(9)|BIT(12)|BIT(13)) #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(4)) +#define USABLE_TIMER_CHANNEL_COUNT 11 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(15) | TIM_N(17)) diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h index c68e8b2b2..4b2ac2e94 100644 --- a/src/main/target/SPRACINGF3/target.h +++ b/src/main/target/SPRACINGF3/target.h @@ -26,12 +26,9 @@ #define BEEPER PC15 #define BEEPER_INVERTED -#define USABLE_TIMER_CHANNEL_COUNT 17 - -#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready and MAG data ready - #define USE_EXTI #define MPU_INT_EXTI PC13 +#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready and MAG data ready #define USE_MPU_DATA_READY_SIGNAL #define ENSURE_MPU_DATA_READY_IS_LOW @@ -57,13 +54,12 @@ #define ENSURE_MAG_DATA_READY_IS_HIGH #define MAG_INT_EXTI PC14 - #define USE_FLASHFS #define USE_FLASH_M25P16 #define SONAR -#define SONAR_ECHO_PIN PB1 #define SONAR_TRIGGER_PIN PB0 +#define SONAR_ECHO_PIN PB1 #define USE_UART1 #define USE_UART2 @@ -131,5 +127,6 @@ #define TARGET_IO_PORTC (BIT(13)|BIT(14)|BIT(15)) #define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(3)|BIT(4)) +#define USABLE_TIMER_CHANNEL_COUNT 17 #define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(15) | TIM_N(16) | TIM_N(17) ) diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h index b5e9ae0e0..592833bc4 100644 --- a/src/main/target/STM32F3DISCOVERY/target.h +++ b/src/main/target/STM32F3DISCOVERY/target.h @@ -81,15 +81,15 @@ // Support the GY-91 MPU9250 dev board #define USE_GYRO_MPU6500 #define USE_GYRO_SPI_MPU6500 -#define MPU6500_CS_PIN PC14 -#define MPU6500_SPI_INSTANCE SPI2 -#define GYRO_MPU6500_ALIGN CW270_DEG_FLIP +#define MPU6500_CS_PIN PC14 +#define MPU6500_SPI_INSTANCE SPI2 +#define GYRO_MPU6500_ALIGN CW270_DEG_FLIP #define ACC #define USE_ACC_LSM303DLHC #define USE_ACC_MPU6500 #define USE_ACC_SPI_MPU6500 -#define ACC_MPU6500_ALIGN CW270_DEG_FLIP +#define ACC_MPU6500_ALIGN CW270_DEG_FLIP //#define BARO //#define BMP280_CS_PIN PB12 @@ -136,7 +136,7 @@ //#define UART2_RX_PINSOURCE GPIO_PinSource6 #define USE_I2C -#define I2C_DEVICE (I2CDEV_1) +#define I2C_DEVICE (I2CDEV_1) #define USE_ADC #define ADC_INSTANCE ADC1 @@ -165,6 +165,5 @@ #define TARGET_IO_PORTE 0xffff #define TARGET_IO_PORTF 0x00ff - #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) | TIM_N(16) | TIM_N(17))