diff --git a/src/main/drivers/timer.h b/src/main/drivers/timer.h index 7bd661b47c..553128c77e 100644 --- a/src/main/drivers/timer.h +++ b/src/main/drivers/timer.h @@ -167,11 +167,11 @@ extern const timerHardware_t timerHardware[]; #endif #if defined(USE_TIMER_MGMT) -#if defined(STM32F40_41xxx) +#if defined(STM32F4) #define FULL_TIMER_CHANNEL_COUNT 70 -#elif defined(STM32F722xx) +#elif defined(STM32F7) #define FULL_TIMER_CHANNEL_COUNT 70 diff --git a/src/main/drivers/timer_stm32f4xx.c b/src/main/drivers/timer_stm32f4xx.c index 18fb1ba731..bc32282089 100644 --- a/src/main/drivers/timer_stm32f4xx.c +++ b/src/main/drivers/timer_stm32f4xx.c @@ -53,7 +53,6 @@ const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = { }; #if defined(USE_TIMER_MGMT) -#if defined(STM32F40_41xxx) const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = { // Auto-generated from 'timer_def.h' //PORTA @@ -147,7 +146,6 @@ const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM11, CH1, PF7, TIM_USE_ANY, 0, 0), }; #endif -#endif // USE_TIMER_MGMT /* diff --git a/src/main/drivers/timer_stm32f7xx.c b/src/main/drivers/timer_stm32f7xx.c index a34d1f4b3a..03ba6ab1ee 100644 --- a/src/main/drivers/timer_stm32f7xx.c +++ b/src/main/drivers/timer_stm32f7xx.c @@ -48,8 +48,6 @@ const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = { }; #if defined(USE_TIMER_MGMT) -#if defined(STM32F722xx) - const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = { // Auto-generated from 'timer_def.h' //PORTA @@ -142,7 +140,6 @@ const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM11, CH1, PF7, TIM_USE_ANY, 0, 0), }; #endif -#endif // USE_TIMER_MGMT /* diff --git a/src/main/target/common_pre.h b/src/main/target/common_pre.h index 6da9457725..8a145fd2f7 100644 --- a/src/main/target/common_pre.h +++ b/src/main/target/common_pre.h @@ -63,6 +63,7 @@ #define USE_USB_MSC #define USE_PERSISTENT_MSC_RTC #define USE_DMA_SPEC +#define USE_TIMER_MGMT // Re-enable this after 4.0 has been released, and remove the define from STM32F4DISCOVERY //#define USE_SPI_TRANSACTION @@ -70,10 +71,6 @@ #define USE_OVERCLOCK #endif -#if defined(STM32F40_41xxx) -#define USE_TIMER_MGMT -#endif - #endif // STM32F4 #ifdef STM32F7 @@ -91,13 +88,9 @@ #define USE_PERSISTENT_MSC_RTC #define USE_MCO #define USE_DMA_SPEC +#define USE_TIMER_MGMT // Re-enable this after 4.0 has been released, and remove the define from STM32F4DISCOVERY //#define USE_SPI_TRANSACTION - -#if defined(STM32F722xx) -#define USE_TIMER_MGMT -#endif - #endif // STM32F7 #if defined(STM32F4) || defined(STM32F7) diff --git a/unified_targets/configs/CRAZYBEEF4FR.config b/unified_targets/configs/CRAZYBEEF4FR.config new file mode 100644 index 0000000000..4b1841aeed --- /dev/null +++ b/unified_targets/configs/CRAZYBEEF4FR.config @@ -0,0 +1,93 @@ +# Betaflight / CRAZYBEEF4FR (C4FR) 4.0.0 Feb 28 2019 / 18:10:50 (b63a3e117) MSP API: 1.41 + +board_name CRAZYBEEF4FR +manufacturer_id HAMO + +# resources +resource BEEPER 1 C15 +resource MOTOR 1 B10 +resource MOTOR 2 B06 +resource MOTOR 3 B07 +resource MOTOR 4 B08 +resource PPM 1 A03 +resource PWM 1 A02 +resource PWM 2 A09 +resource PWM 3 A10 +resource LED_STRIP 1 A00 +resource SERIAL_TX 1 A09 +resource SERIAL_TX 2 A02 +resource SERIAL_RX 1 A10 +resource SERIAL_RX 2 A03 +resource LED 1 C13 +resource RX_BIND_PLUG 1 B02 +resource SPI_SCK 1 A05 +resource SPI_SCK 2 B13 +resource SPI_SCK 3 B03 +resource SPI_MISO 1 A06 +resource SPI_MISO 2 B14 +resource SPI_MISO 3 B04 +resource SPI_MOSI 1 A07 +resource SPI_MOSI 2 B15 +resource SPI_MOSI 3 B05 +resource ADC_BATT 1 B00 +resource ADC_CURR 1 B01 +resource OSD_CS 1 B12 +resource RX_SPI_CS 1 A15 +resource RX_SPI_BIND 1 B02 +resource RX_SPI_LED 1 B09 +resource GYRO_EXTI 1 A01 +resource GYRO_CS 1 A04 + +# timer +timer A03 2 +timer B10 0 +timer B06 0 +timer B07 0 +timer B08 0 +timer A00 1 +timer A02 2 +timer A09 0 +timer A10 0 + +# dmaopt +dmaopt ADC 1 0 +# ADC 1: DMA2 Stream 0 Channel 0 +dmaopt pin B10 0 +# pin B10: DMA1 Stream 1 Channel 3 +dmaopt pin B06 0 +# pin B06: DMA1 Stream 0 Channel 2 +dmaopt pin B07 0 +# pin B07: DMA1 Stream 3 Channel 2 +dmaopt pin B08 0 +# pin B08: DMA1 Stream 7 Channel 2 +dmaopt pin A00 0 +# pin A00: DMA1 Stream 2 Channel 6 +dmaopt pin A09 0 +# pin A09: DMA2 Stream 6 Channel 0 +dmaopt pin A10 0 +# pin A10: DMA2 Stream 6 Channel 0 + +# feature +feature TELEMETRY +feature OSD +feature AIRMODE +feature RX_SPI +feature ANTI_GRAVITY +feature DYNAMIC_FILTER + +# master +set rx_spi_protocol = FRSKY_X +set rx_spi_bus = 3 +set rx_spi_led_inversion = OFF +set adc_device = 1 +set motor_pwm_protocol = DSHOT600 +set beeper_inversion = ON +set beeper_od = OFF +set max7456_clock = DEFAULT +set max7456_spi_bus = 2 +set max7456_preinit_opu = OFF +set gyro_1_bustype = SPI +set gyro_1_spibus = 1 +set gyro_1_i2cBus = 0 +set gyro_1_i2c_address = 0 +set gyro_1_sensor_align = CW90 diff --git a/unified_targets/configs/MATEKF411.config b/unified_targets/configs/MATEKF411.config new file mode 100644 index 0000000000..243d75df64 --- /dev/null +++ b/unified_targets/configs/MATEKF411.config @@ -0,0 +1,98 @@ +board_name MATEKF411 +manufacturer_id MTKS + +# resources +resource BEEPER 1 B02 +resource MOTOR 1 B04 +resource MOTOR 2 B05 +resource MOTOR 3 B06 +resource MOTOR 4 B07 +resource MOTOR 5 B03 +resource MOTOR 6 B10 +resource PPM 1 A03 +resource LED_STRIP 1 A08 +resource SERIAL_TX 1 A09 +resource SERIAL_TX 2 A02 +resource SERIAL_RX 1 A10 +resource SERIAL_RX 2 A03 +resource LED 1 C13 +resource LED 2 C14 +resource SPI_SCK 1 A05 +resource SPI_SCK 2 B13 +resource SPI_MISO 1 A06 +resource SPI_MISO 2 B14 +resource SPI_MOSI 1 A07 +resource SPI_MOSI 2 B15 +resource ADC_BATT 1 B00 +resource ADC_CURR 1 B01 +resource GYRO_EXTI 1 A01 +resource GYRO_EXTI 2 NONE +resource GYRO_CS 1 A04 +resource USB_DETECT 1 C15 + +# timer list +timer A03 2 +timer B04 0 +timer B05 0 +timer B06 0 +timer B07 0 +timer B03 0 +timer B10 0 +timer A00 1 +timer A02 1 +timer A08 0 + +# dmaopt +dmaopt ADC 1 0 +# ADC 1: DMA2 Stream 0 Channel 0 +dmaopt pin B04 0 +# pin B04: DMA1 Stream 4 Channel 5 +dmaopt pin B05 0 +# pin B05: DMA1 Stream 5 Channel 5 +dmaopt pin B06 0 +# pin B06: DMA1 Stream 0 Channel 2 +dmaopt pin B07 0 +# pin B07: DMA1 Stream 3 Channel 2 +dmaopt pin B03 0 +# pin B03: DMA1 Stream 6 Channel 3 +dmaopt pin B10 0 +# pin B10: DMA1 Stream 1 Channel 3 +dmaopt pin A00 0 +# pin A00: DMA1 Stream 2 Channel 6 +dmaopt pin A02 0 +# pin A02: DMA1 Stream 0 Channel 6 +dmaopt pin A08 0 +# pin A08: DMA2 Stream 6 Channel 0 + +# feature +feature RX_SERIAL +feature SOFTSERIAL +feature TELEMETRY +feature OSD +feature AIRMODE +feature ANTI_GRAVITY +feature DYNAMIC_FILTER + +# serial +serial 0 64 115200 57600 0 115200 + +# master +set serialrx_provider = SBUS +set motor_pwm_protocol = ONESHOT125 +set current_meter = ADC +set battery_meter = ADC +set vbat_detect_cell_voltage = 300 +set system_hse_mhz = 8 +set max7456_clock = DEFAULT +set max7456_spi_bus = 2 +set max7456_preinit_opu = OFF +set gyro_1_bustype = SPI +set gyro_1_spibus = 1 +set gyro_1_i2cBus = 0 +set gyro_1_i2c_address = 0 +set gyro_1_sensor_align = CW180 +set gyro_2_bustype = SPI +set gyro_2_spibus = 1 +set gyro_2_i2cBus = 0 +set gyro_2_i2c_address = 0 +set gyro_2_sensor_align = DEFAULT diff --git a/unified_targets/docs/Manufacturers.md b/unified_targets/docs/Manufacturers.md index 4548742116..157502d3bc 100644 --- a/unified_targets/docs/Manufacturers.md +++ b/unified_targets/docs/Manufacturers.md @@ -8,5 +8,7 @@ Last updated: 17/02/2019 |DRCL|dronercland|https://www.instagram.com/dronercland/| |DYST|DongYang Smart Technology Co.,Ltd (dys)|http://www.dys.hk/| |FFPV|Furious FPV|https://furiousfpv.com/| +|HAMO|Happymodel|http://www.happymodel.cn/| +|MTKS|Matek Systems|http://www.mateksys.com/| This is the official list of manufacturer ids (`manufacturer_id` in the target config) that will be supported for loading onto unified targets by Betaflight configurator.