diff --git a/Makefile b/Makefile index d5bfb1d00..1c1e2ac26 100644 --- a/Makefile +++ b/Makefile @@ -719,17 +719,8 @@ IRCFUSIONF3_SRC = \ $(STM32F30x_COMMON_SRC) \ drivers/accgyro_mpu.c \ drivers/accgyro_mpu6050.c \ - drivers/barometer_ms5611.c \ - drivers/compass_ak8975.c \ drivers/barometer_bmp085.c \ - drivers/barometer_bmp280.c \ - drivers/compass_hmc5883l.c \ - drivers/display_ug2864hsweg01.h \ drivers/flash_m25p16.c \ - drivers/light_ws2811strip.c \ - drivers/light_ws2811strip_stm32f30x.c \ - drivers/serial_softserial.c \ - drivers/sonar_hcsr04.c \ io/flashfs.c \ $(HIGHEND_SRC) \ $(COMMON_SRC) @@ -773,7 +764,7 @@ MOTOLAB_SRC = \ $(HIGHEND_SRC) \ $(COMMON_SRC) \ $(VCP_SRC) - + SPRACINGF3MINI_SRC = \ $(STM32F30x_COMMON_SRC) \ drivers/accgyro_mpu.c \ diff --git a/src/main/target/IRCFUSIONF3/target.h b/src/main/target/IRCFUSIONF3/target.h index ccc9fa997..c3b99b5c7 100644 --- a/src/main/target/IRCFUSIONF3/target.h +++ b/src/main/target/IRCFUSIONF3/target.h @@ -19,26 +19,18 @@ #define TARGET_BOARD_IDENTIFIER "IFF3" +#define LED0 #define LED0_GPIO GPIOB #define LED0_PIN Pin_3 #define LED0_PERIPHERAL RCC_AHBPeriph_GPIOB -#define BEEP_GPIO GPIOC -#define BEEP_PIN Pin_15 -#define BEEP_PERIPHERAL RCC_AHBPeriph_GPIOC -#define BEEPER_INVERTED - #define USABLE_TIMER_CHANNEL_COUNT 17 -#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready and MAG data ready +#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready, no MAG #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 @@ -48,27 +40,15 @@ #define ACC_MPU6050_ALIGN CW270_DEG #define BARO -#define USE_BARO_MS5611 #define USE_BARO_BMP085 -#define MAG -#define USE_MAG_AK8975 -#define USE_MAG_HMC5883 -#define MAG_HMC5883_ALIGN CW270_DEG - #define USE_FLASHFS #define USE_FLASH_M25P16 -#define SONAR -#define BEEPER -#define LED0 - #define USE_USART1 #define USE_USART2 #define USE_USART3 -#define USE_SOFTSERIAL1 -#define USE_SOFTSERIAL2 -#define SERIAL_PORT_COUNT 5 +#define SERIAL_PORT_COUNT 3 #ifndef UART1_GPIO #define UART1_TX_PIN GPIO_Pin_9 // PA9 @@ -95,13 +75,6 @@ #define UART3_RX_PINSOURCE GPIO_PinSource11 #endif -#define SOFTSERIAL_1_TIMER TIM3 -#define SOFTSERIAL_1_TIMER_RX_HARDWARE 4 // PWM 5 -#define SOFTSERIAL_1_TIMER_TX_HARDWARE 5 // PWM 6 -#define SOFTSERIAL_2_TIMER TIM3 -#define SOFTSERIAL_2_TIMER_RX_HARDWARE 6 // PWM 7 -#define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8 - #define USE_I2C #define I2C_DEVICE (I2CDEV_1) // PB6/SCL, PB7/SDA @@ -132,29 +105,12 @@ #define RSSI_ADC_GPIO_PIN GPIO_Pin_2 #define RSSI_ADC_CHANNEL ADC_Channel_12 -#define LED_STRIP -#define LED_STRIP_TIMER TIM1 - -#define USE_LED_STRIP_ON_DMA1_CHANNEL2 -#define WS2811_GPIO GPIOA -#define WS2811_GPIO_AHB_PERIPHERAL RCC_AHBPeriph_GPIOA -#define WS2811_GPIO_AF GPIO_AF_6 -#define WS2811_PIN GPIO_Pin_8 -#define WS2811_PIN_SOURCE GPIO_PinSource8 -#define WS2811_TIMER TIM1 -#define WS2811_TIMER_APB2_PERIPHERAL RCC_APB2Periph_TIM1 -#define WS2811_DMA_CHANNEL DMA1_Channel2 -#define WS2811_IRQ DMA1_Channel2_IRQn -#define WS2811_DMA_TC_FLAG DMA1_FLAG_TC2 -#define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH2_HANDLER - #define BLACKBOX -#define DISPLAY #define GPS //#define GTUNE #define SERIAL_RX -#define TELEMETRY #define USE_SERVOS +#define TELEMETRY #define USE_CLI #define SPEKTRUM_BIND @@ -180,4 +136,3 @@ #define S1W_RX_PIN GPIO_Pin_10 #endif -