diff --git a/src/main/target/SPRACINGF3MINI/target.c b/src/main/target/SPRACINGF3MINI/target.c
index efc7ce86d9..7b9cb1ef49 100644
--- a/src/main/target/SPRACINGF3MINI/target.c
+++ b/src/main/target/SPRACINGF3MINI/target.c
@@ -25,6 +25,20 @@
#include "drivers/dma.h"
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
+#ifdef TINYBEEF3
+ // PPM / UART2 RX
+ DEF_TIM(TIM8, CH1, PA15, TIM_USE_PPM, 0 ), // PPM
+ DEF_TIM(TIM2, CH2, PA1, TIM_USE_MOTOR, 1 ), // PWM1
+ DEF_TIM(TIM2, CH1, PA0, TIM_USE_MOTOR, 1 ), // PWM2
+ DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 1 ), // PWM3
+ DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 1 ), // PWM4
+ DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 1 ), // PWM5
+ DEF_TIM(TIM15, CH2, PA3, TIM_USE_MOTOR, 1 ), // PWM6
+ DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR, 1 ), // PWM7
+ DEF_TIM(TIM3, CH2, PA7, TIM_USE_MOTOR, 1 ), // PWM8
+ DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR, 1 ), // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7)
+ DEF_TIM(TIM2, CH4, PB11, TIM_USE_MOTOR, 1 ), // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7)
+#else
// PPM Pad
#ifdef SPRACINGF3MINI_MKII_REVA
DEF_TIM(TIM3, CH2, PB5, TIM_USE_PPM, 0), // PPM - PB5
@@ -44,5 +58,6 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM2, CH2, PA1, TIM_USE_MOTOR, 1), // PWM8 - PA1
DEF_TIM(TIM2, CH3, PB10, TIM_USE_NONE, 1), // PWM9 - PB10 - TIM2_CH3 / UART3_TX (AF7)
DEF_TIM(TIM2, CH4, PB11, TIM_USE_NONE, 1), // PWM10 - PB11 - TIM2_CH4 / UART3_RX (AF7)
+#endif
DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED | TIM_USE_TRANSPONDER, 1), // LED_STRIP / TRANSPONDER
};
diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h
index 35b74f1569..ac9793dda9 100644
--- a/src/main/target/SPRACINGF3MINI/target.h
+++ b/src/main/target/SPRACINGF3MINI/target.h
@@ -17,6 +17,13 @@
#pragma once
+#ifdef TINYBEEF3
+#define TARGET_BOARD_IDENTIFIER "TBF3"
+
+#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
+
+#define LED0 PB8
+#else
#define TARGET_BOARD_IDENTIFIER "SRFM"
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
@@ -25,6 +32,7 @@
//#define SPRACINGF3MINI_MKII_REVA
#define LED0 PB3
+#endif
#define BEEPER PC15
#define BEEPER_INVERTED
@@ -39,32 +47,46 @@
#define ENSURE_MAG_DATA_READY_IS_HIGH
#define GYRO
+#define ACC
+
+#define BARO
+#define USE_BARO_BMP280
+
+#ifdef TINYBEEF3
+#define USE_GYRO_SPI_MPU6500
+#define GYRO_MPU6500_ALIGN CW270_DEG
+
+#define USE_ACC_SPI_MPU6500
+#define ACC_MPU6500_ALIGN CW270_DEG
+
+#define MAG_AK8963_ALIGN CW90_DEG_FLIP
+#else
//#define USE_FAKE_GYRO
#define USE_GYRO_MPU6500
#define GYRO_MPU6500_ALIGN CW180_DEG
-#define ACC
//#define USE_FAKE_ACC
#define USE_ACC_MPU6500
#define ACC_MPU6500_ALIGN CW180_DEG
-#define BARO
-#define USE_BARO_BMP280
-
#define MAG
#define USE_MPU9250_MAG // Enables bypass configuration
#define USE_MAG_AK8975
#define USE_MAG_HMC5883 // External
#define MAG_AK8975_ALIGN CW90_DEG_FLIP
+#endif
//#define SONAR
//#define SONAR_ECHO_PIN PB1
//#define SONAR_TRIGGER_PIN PB0
#define USB_IO
+
+#ifndef TINYBEEF3
#define USB_CABLE_DETECTION
#define USB_DETECT_PIN PB5
+#endif
#define USE_VCP
#define USE_UART1
@@ -101,6 +123,18 @@
#define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15
+#ifdef TINYBEEF3
+#define USE_SPI_DEVICE_1 // PB9,3,4,5 on AF5 SPI1 (MPU)
+
+#define SPI1_NSS_PIN PB9
+#define SPI1_SCK_PIN PB3
+#define SPI1_MISO_PIN PB4
+#define SPI1_MOSI_PIN PB5
+
+#define MPU6500_CS_PIN PB9
+#define MPU6500_SPI_INSTANCE SPI1
+#endif
+
#define USE_SDCARD
#define USE_SDCARD_SPI2
@@ -138,19 +172,25 @@
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
+#ifdef TINYBEEF3
+#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_RSSI_ADC | FEATURE_CURRENT_METER | FEATURE_TELEMETRY)
+#else
#define DEFAULT_FEATURES FEATURE_BLACKBOX
+#endif
+#ifndef TINYBEEF3
#define BUTTONS
#define BUTTON_A_PIN PB1
#define BUTTON_B_PIN PB0
+#define HARDWARE_BIND_PLUG
+#define BINDPLUG_PIN PB0
+#endif
+
#define SPEKTRUM_BIND
// USART3,
#define BIND_PIN PB11
-#define HARDWARE_BIND_PLUG
-#define BINDPLUG_PIN PB0
-
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
#define TARGET_IO_PORTA 0xffff
@@ -159,5 +199,8 @@
#define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(4))
#define USABLE_TIMER_CHANNEL_COUNT 12 // 8 Outputs; PPM; LED Strip; 2 additional PWM pins also on UART3 RX/TX pins.
+#ifdef TINYBEEF3
+#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(15))
+#else
#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(15) | TIM_N(16) |TIM_N(17))
-
+#endif
diff --git a/src/main/target/SPRACINGF3MINI/target.mk b/src/main/target/SPRACINGF3MINI/target.mk
index af1bbcfe30..a46cf1be8f 100644
--- a/src/main/target/SPRACINGF3MINI/target.mk
+++ b/src/main/target/SPRACINGF3MINI/target.mk
@@ -7,8 +7,13 @@ TARGET_SRC = \
drivers/barometer_bmp280.c \
drivers/compass_ak8975.c \
drivers/compass_hmc5883l.c \
+ drivers/compass_ak8963.c \
drivers/flash_m25p16.c \
drivers/transponder_ir.c \
drivers/transponder_ir_stm32f30x.c \
io/transponder_ir.c
+ifeq ($(TARGET), TINYBEEF3)
+TARGET_SRC += \
+ drivers/accgyro_spi_mpu6500.c
+endif
diff --git a/src/main/target/TINYBEEF3/target.c b/src/main/target/TINYBEEF3/target.c
deleted file mode 100644
index ad5befebf4..0000000000
--- a/src/main/target/TINYBEEF3/target.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is part of Cleanflight.
- *
- * Cleanflight is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Cleanflight is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cleanflight. If not, see .
- */
-
-#include
-
-#include
-#include "drivers/io.h"
-
-#include "drivers/timer.h"
-#include "drivers/timer_def.h"
-#include "drivers/dma.h"
-
-const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
- // PPM / UART2 RX
- DEF_TIM(TIM8, CH1, PA15, TIM_USE_PPM, 0 ), // PPM
- DEF_TIM(TIM2, CH2, PA1, TIM_USE_MOTOR, 1 ), // PWM1
- DEF_TIM(TIM2, CH1, PA0, TIM_USE_MOTOR, 1 ), // PWM2
- DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 1 ), // PWM3
- DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 1 ), // PWM4
- DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 1 ), // PWM5
- DEF_TIM(TIM15, CH2, PA3, TIM_USE_MOTOR, 1 ), // PWM6
- DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR, 1 ), // PWM7
- DEF_TIM(TIM3, CH2, PA7, TIM_USE_MOTOR, 1 ), // PWM8
- DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR, 1 ), // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7)
- DEF_TIM(TIM2, CH4, PB11, TIM_USE_MOTOR, 1 ), // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7)
- DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED | TIM_USE_TRANSPONDER, 1 ), // LED_STRIP / TRANSPONDER
-};
diff --git a/src/main/target/TINYBEEF3/target.h b/src/main/target/TINYBEEF3/target.h
deleted file mode 100644
index b7b04730e5..0000000000
--- a/src/main/target/TINYBEEF3/target.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * This file is part of Cleanflight.
- *
- * Cleanflight is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Cleanflight is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cleanflight. If not, see .
- */
-
-#pragma once
-
-#define TARGET_BOARD_IDENTIFIER "TBF3"
-
-#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
-
-#define LED0 PB8
-
-#define BEEPER PC15
-#define BEEPER_INVERTED
-
-#define USE_EXTI
-#define MPU_INT_EXTI PC13
-#define EXTI15_10_CALLBACK_HANDLER_COUNT 2 // MPU_INT, SDCardDetect
-#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 USE_ESC_TELEMETRY
-
-#define GYRO
-#define USE_GYRO_SPI_MPU6500
-
-#define ACC
-#define USE_ACC_SPI_MPU6500
-
-#define ACC_MPU6500_ALIGN CW270_DEG
-#define GYRO_MPU6500_ALIGN CW270_DEG
-
-#define BARO
-#define USE_BARO_BMP280
-
-//#define MAG
-//#define USE_MAG_AK8963
-//#define USE_MAG_HMC5883 // External
-
-#define MAG_AK8963_ALIGN CW90_DEG_FLIP
-
-//#define SONAR
-
-#define USB_IO
-
-#define USE_VCP
-#define USE_UART1
-#define USE_UART2
-#define USE_UART3
-#define SERIAL_PORT_COUNT 4
-
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
-
-#define UART1_TX_PIN PA9
-#define UART1_RX_PIN PA10
-
-#define UART2_TX_PIN PA14 // PA14 / SWCLK
-#define UART2_RX_PIN PA15
-
-#define UART3_TX_PIN PB10 // PB10 (AF7)
-#define UART3_RX_PIN PB11 // PB11 (AF7)
-
-#define USE_I2C
-#define I2C_DEVICE (I2CDEV_1) // PB6/SCL, PB7/SDA
-
-#define USE_SPI
-#define USE_SPI_DEVICE_1 // PB9,3,4,5 on AF5 SPI1 (MPU)
-#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5 SPI2 (SDCard)
-
-#define SPI1_NSS_PIN PB9
-#define SPI1_SCK_PIN PB3
-#define SPI1_MISO_PIN PB4
-#define SPI1_MOSI_PIN PB5
-
-#define SPI2_NSS_PIN PB12
-#define SPI2_SCK_PIN PB13
-#define SPI2_MISO_PIN PB14
-#define SPI2_MOSI_PIN PB15
-
-#define USE_SDCARD
-#define USE_SDCARD_SPI2
-
-#define SDCARD_DETECT_INVERTED
-
-#define SDCARD_DETECT_PIN PC14
-#define SDCARD_SPI_INSTANCE SPI2
-#define SDCARD_SPI_CS_PIN SPI2_NSS_PIN
-
-// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init:
-#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128
-// Divide to under 25MHz for normal operation:
-#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2
-
-// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
-#define SDCARD_DMA_CHANNEL_TX DMA1_Channel5
-#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5
-
-#define MPU6500_CS_PIN PB9
-#define MPU6500_SPI_INSTANCE SPI1
-
-#define BOARD_HAS_VOLTAGE_DIVIDER
-#define USE_ADC
-#define ADC_INSTANCE ADC2
-#define VBAT_ADC_PIN PA4
-#define CURRENT_METER_ADC_PIN PA5
-#define RSSI_ADC_PIN PB2
-
-#define LED_STRIP
-
-#define TRANSPONDER
-
-#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
-
-#define DEFAULT_RX_FEATURE FEATURE_RX_PPM
-#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_RSSI_ADC | FEATURE_CURRENT_METER | FEATURE_TELEMETRY)
-
-#define SPEKTRUM_BIND
-// USART3,
-#define BIND_PIN PB11
-
-#define USE_SERIAL_4WAY_BLHELI_INTERFACE
-
-// IO - stm32f303cc in 48pin package
-#define TARGET_IO_PORTA 0xffff
-#define TARGET_IO_PORTB 0xffff
-#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 12 // PPM, 8 PWM, UART3 RX/TX, LED Strip
-#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(15))
diff --git a/src/main/target/TINYBEEF3/target.mk b/src/main/target/TINYBEEF3/target.mk
deleted file mode 100644
index 937cd6bf4d..0000000000
--- a/src/main/target/TINYBEEF3/target.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-F3_TARGETS += $(TARGET)
-FEATURES = VCP SDCARD
-
-TARGET_SRC = \
- drivers/accgyro_mpu.c \
- drivers/accgyro_mpu6500.c \
- drivers/accgyro_spi_mpu6500.c \
- drivers/barometer_bmp280.c \
- drivers/compass_ak8963.c \
- drivers/serial_usb_vcp.c \
- drivers/transponder_ir.c \
- drivers/transponder_ir_stm32f30x.c \
- io/transponder_ir.c
-