Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 06:15:16 +03:00
Code Issues Wiki Activity

Fixed missing timer definition for F7.

Browse source
This commit is contained in:
mikeller 2019-03-10 18:48:20 +13:00
parent 9c4e750f39
commit a5753600ed
5 changed files with 249 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/drivers/timer.h
View file

@ -169,11 +169,11 @@ extern const timerHardware_t timerHardware[];
#if defined(USE_TIMER_MGMT) #if defined(USE_TIMER_MGMT)
#if defined(STM32F4) #if defined(STM32F4)
#define FULL_TIMER_CHANNEL_COUNT 70 #define FULL_TIMER_CHANNEL_COUNT 78
#elif defined(STM32F7) #elif defined(STM32F7)
#define FULL_TIMER_CHANNEL_COUNT 70 #define FULL_TIMER_CHANNEL_COUNT 78
#endif #endif

21
src/main/drivers/timer_stm32f4xx.c
View file

@ -144,6 +144,27 @@ const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = {
//PORTF //PORTF
DEF_TIM(TIM10, CH1, PF6, TIM_USE_ANY, 0, 0), DEF_TIM(TIM10, CH1, PF6, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM11, CH1, PF7, TIM_USE_ANY, 0, 0), DEF_TIM(TIM11, CH1, PF7, TIM_USE_ANY, 0, 0),
//PORTH
DEF_TIM(TIM5, CH1, PH10, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM5, CH2, PH11, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM5, CH3, PH12, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM8, CH1N, PH13, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM8, CH2N, PH14, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM8, CH3N, PH15, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM12, CH1, PH6, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM12, CH2, PH9, TIM_USE_ANY, 0, 0),
//PORTI
// Not yet used
// DEF_TIM(TIM5, CH4, PI0, TIM_USE_ANY, 0, 0),
//
// DEF_TIM(TIM8, CH4, PI2, TIM_USE_ANY, 0, 0),
// DEF_TIM(TIM8, CH1, PI5, TIM_USE_ANY, 0, 0),
// DEF_TIM(TIM8, CH2, PI6, TIM_USE_ANY, 0, 0),
// DEF_TIM(TIM8, CH3, PI7, TIM_USE_ANY, 0, 0),
}; };
#endif #endif

22
src/main/drivers/timer_stm32f7xx.c
View file

@ -79,6 +79,7 @@ const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM14, CH1, PA7, TIM_USE_ANY, 0, 0), DEF_TIM(TIM14, CH1, PA7, TIM_USE_ANY, 0, 0),
//PORTB //PORTB
DEF_TIM(TIM1, CH2N, PB0, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM1, CH3N, PB1, TIM_USE_ANY, 0, 0), DEF_TIM(TIM1, CH3N, PB1, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM2, CH2, PB3, TIM_USE_ANY, 0, 0), DEF_TIM(TIM2, CH2, PB3, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM2, CH3, PB10, TIM_USE_ANY, 0, 0), DEF_TIM(TIM2, CH3, PB10, TIM_USE_ANY, 0, 0),
@ -138,6 +139,27 @@ const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = {
//PORTF //PORTF
DEF_TIM(TIM10, CH1, PF6, TIM_USE_ANY, 0, 0), DEF_TIM(TIM10, CH1, PF6, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM11, CH1, PF7, TIM_USE_ANY, 0, 0), DEF_TIM(TIM11, CH1, PF7, TIM_USE_ANY, 0, 0),
//PORTH
DEF_TIM(TIM5, CH1, PH10, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM5, CH2, PH11, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM5, CH3, PH12, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM8, CH1N, PH13, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM8, CH2N, PH14, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM8, CH3N, PH15, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM12, CH1, PH6, TIM_USE_ANY, 0, 0),
DEF_TIM(TIM12, CH2, PH9, TIM_USE_ANY, 0, 0),
//PORTI
// Not yet used
// DEF_TIM(TIM5, CH4, PI0, TIM_USE_ANY, 0, 0),
//
// DEF_TIM(TIM8, CH4, PI2, TIM_USE_ANY, 0, 0),
// DEF_TIM(TIM8, CH1, PI5, TIM_USE_ANY, 0, 0),
// DEF_TIM(TIM8, CH2, PI6, TIM_USE_ANY, 0, 0),
// DEF_TIM(TIM8, CH3, PI7, TIM_USE_ANY, 0, 0),
}; };
#endif #endif

208
unified_targets/configs/KAKUTEF7.config
View file

@ -1,113 +1,95 @@
# Betaflight / KAKUTEF7 (KTF7) 4.0.0 Mar 3 2019 / 20:23:18 (b1211ad6e) MSP API: 1.41 # Betaflight / STM32F745 (S745) 4.0.0 Mar 10 2019 / 21:49:53 (d6138c41e) MSP API: 1.41
board_name KAKUTEF7 board_name KAKUTEF7
manufacturer_id HBRO manufacturer_id HBRO
# resources # resources
resource BEEPER 1 D15 resource BEEPER 1 D15
resource MOTOR 1 B00 resource MOTOR 1 B00
resource MOTOR 2 B01 resource MOTOR 2 B01
resource MOTOR 3 E09 resource MOTOR 3 E09
resource MOTOR 4 E11 resource MOTOR 4 E11
resource MOTOR 5 C09 resource MOTOR 5 C09
resource MOTOR 6 A03 resource MOTOR 6 A03
resource PPM 1 E13 resource PPM 1 E13
resource LED_STRIP 1 D12 resource LED_STRIP 1 D12
resource SERIAL_TX 1 A09 resource SERIAL_TX 1 A09
resource SERIAL_TX 2 D05 resource SERIAL_TX 2 D05
resource SERIAL_TX 3 B10 resource SERIAL_TX 3 B10
resource SERIAL_TX 4 A00 resource SERIAL_TX 4 A00
resource SERIAL_TX 6 C06 resource SERIAL_TX 6 C06
resource SERIAL_RX 1 A10 resource SERIAL_RX 1 A10
resource SERIAL_RX 2 D06 resource SERIAL_RX 2 D06
resource SERIAL_RX 3 B11 resource SERIAL_RX 3 B11
resource SERIAL_RX 4 A01 resource SERIAL_RX 4 A01
resource SERIAL_RX 6 C07 resource SERIAL_RX 6 C07
resource SERIAL_RX 7 E07 resource SERIAL_RX 7 E07
resource I2C_SCL 1 B06 resource I2C_SCL 1 B06
resource I2C_SDA 1 B07 resource I2C_SDA 1 B07
resource LED 1 A02 resource LED 1 A02
resource SPI_SCK 1 A05 resource SPI_SCK 1 A05
resource SPI_SCK 2 B13 resource SPI_SCK 2 B13
resource SPI_SCK 4 E02 resource SPI_SCK 4 E02
resource SPI_MISO 1 A06 resource SPI_MISO 1 A06
resource SPI_MISO 2 B14 resource SPI_MISO 2 B14
resource SPI_MISO 4 E05 resource SPI_MISO 4 E05
resource SPI_MOSI 1 A07 resource SPI_MOSI 1 A07
resource SPI_MOSI 2 B15 resource SPI_MOSI 2 B15
resource SPI_MOSI 4 E06 resource SPI_MOSI 4 E06
resource ESCSERIAL 1 E13 resource ADC_BATT 1 C03
resource ADC_BATT 1 C03 resource ADC_RSSI 1 C05
resource ADC_RSSI 1 C05 resource ADC_CURR 1 C02
resource ADC_CURR 1 C02 resource SDCARD_CS 1 A04
resource SDCARD_CS 1 A04 resource SDCARD_DETECT 1 D08
resource SDCARD_DETECT 1 D08 resource OSD_CS 1 B12
resource OSD_CS 1 B12 resource GYRO_EXTI 1 E01
resource GYRO_EXTI 1 E01 resource GYRO_CS 1 E04
resource GYRO_CS 1 E04 resource USB_DETECT 1 A08
resource USB_DETECT 1 A08
# timer
# timer timer E13 0
timer E13 0 timer B00 1
timer B00 0 timer B01 1
timer B01 1 timer E09 0
timer E09 0 timer E11 0
timer E11 0 timer C09 1
timer C09 1 timer A03 1
timer A03 1 timer D12 0
timer D12 0
# dma
# dma dma SPI_TX 1 1
dma SPI_TX 1 1 # SPI_TX 1: DMA2 Stream 5 Channel 3
# SPI_TX 1: DMA2 Stream 5 Channel 3 dma ADC 1 1
dma ADC 1 1 # ADC 1: DMA2 Stream 4 Channel 0
# ADC 1: DMA2 Stream 4 Channel 0 dma pin E13 1
dma pin E13 1 # pin E13: DMA2 Stream 6 Channel 6
# pin E13: DMA2 Stream 6 Channel 6 dma pin B00 0
dma pin B00 0 # pin B00: DMA1 Stream 7 Channel 5
# pin B00: DMA1 Stream 7 Channel 5 dma pin B01 0
dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5
# pin B01: DMA1 Stream 2 Channel 5 dma pin E09 2
dma pin E09 2 # pin E09: DMA2 Stream 3 Channel 6
# pin E09: DMA2 Stream 3 Channel 6 dma pin E11 1
dma pin E11 1 # pin E11: DMA2 Stream 2 Channel 6
# pin E11: DMA2 Stream 2 Channel 6 dma pin C09 0
dma pin C09 0 # pin C09: DMA2 Stream 7 Channel 7
# pin C09: DMA2 Stream 7 Channel 7 dma pin A03 0
dma pin A03 0 # pin A03: DMA1 Stream 1 Channel 6
# pin A03: DMA1 Stream 1 Channel 6 dma pin D12 0
dma pin D12 0 # pin D12: DMA1 Stream 0 Channel 2
# pin D12: DMA1 Stream 0 Channel 2
# master
# feature set current_meter = ADC
feature -RX_PARALLEL_PWM set battery_meter = ADC
feature RX_SERIAL set beeper_inversion = ON
feature OSD set beeper_od = OFF
set sdcard_detect_inverted = ON
# serial set sdcard_mode = SPI
serial 20 1 115200 57600 0 115200 set sdcard_spi_bus = 1
serial 5 64 115200 57600 0 115200 set system_hse_mhz = 8
serial 6 1024 115200 57600 0 115200 set max7456_spi_bus = 2
set dashboard_i2c_bus = 1
# master set gyro_1_bustype = SPI
# Re-enable these once I2C has been fixed on F7 set gyro_1_spibus = 4
#set baro_bustype = I2C set gyro_1_sensor_align = CW270
#set baro_i2c_device = 1 set gyro_2_spibus = 4
#set baro_i2c_address = 0
set serialrx_provider = SBUS
set adc_device = 1
set dshot_burst = OFF
set motor_pwm_protocol = ONESHOT125
set current_meter = ADC
set battery_meter = ADC
set beeper_inversion = ON
set beeper_od = OFF
set sdcard_detect_inverted = ON
set sdcard_mode = SPI
set sdcard_dma = OFF
set sdcard_spi_bus = 1
set system_hse_mhz = 8
set max7456_spi_bus = 2
set gyro_1_bustype = SPI
set gyro_1_spibus = 4
set gyro_1_sensor_align = CW270

253
unified_targets/configs/OMNIBUSF7V2.config
View file

@ -1,144 +1,109 @@
# Betaflight / OMNIBUSF7V2 (OB72) 4.0.0 Mar 1 2019 / 03:53:33 (6cacaf00a) MSP API: 1.41 # Betaflight / STM32F745 (S745) 4.0.0 Mar 10 2019 / 21:49:53 (d6138c41e) MSP API: 1.41
board_name OMNIBUSF7V2 board_name OMNIBUSF7V2
manufacturer_id AIRB manufacturer_id AIRB
# resources # resources
resource BEEPER 1 D15 resource BEEPER 1 D15
resource MOTOR 1 B00 resource MOTOR 1 B00
resource MOTOR 2 B01 resource MOTOR 2 B01
resource MOTOR 3 E09 resource MOTOR 3 E09
resource MOTOR 4 E11 resource MOTOR 4 E11
resource PPM 1 A03 resource PPM 1 A03
resource SONAR_TRIGGER 1 B10 resource SONAR_TRIGGER 1 B10
resource SONAR_ECHO 1 B11 resource SONAR_ECHO 1 B11
resource LED_STRIP 1 D12 resource LED_STRIP 1 D12
resource SERIAL_TX 1 A09 resource SERIAL_TX 1 A09
resource SERIAL_TX 3 B10 resource SERIAL_TX 3 B10
resource SERIAL_TX 6 C06 resource SERIAL_TX 6 C06
resource SERIAL_RX 1 A10 resource SERIAL_RX 1 A10
resource SERIAL_RX 2 A03 resource SERIAL_RX 2 A03
resource SERIAL_RX 3 B11 resource SERIAL_RX 3 B11
resource SERIAL_RX 6 C07 resource SERIAL_RX 6 C07
resource SERIAL_RX 7 E07 resource SERIAL_RX 7 E07
resource LED 1 E00 resource LED 1 E00
resource SPI_SCK 1 A05 resource SPI_SCK 1 A05
resource SPI_SCK 2 B13 resource SPI_SCK 2 B13
resource SPI_SCK 3 C10 resource SPI_SCK 3 C10
resource SPI_SCK 4 E02 resource SPI_SCK 4 E02
resource SPI_MISO 1 A06 resource SPI_MISO 1 A06
resource SPI_MISO 2 B14 resource SPI_MISO 2 B14
resource SPI_MISO 3 C11 resource SPI_MISO 3 C11
resource SPI_MISO 4 E05 resource SPI_MISO 4 E05
resource SPI_MOSI 1 A07 resource SPI_MOSI 1 A07
resource SPI_MOSI 2 B15 resource SPI_MOSI 2 B15
resource SPI_MOSI 3 C12 resource SPI_MOSI 3 C12
resource SPI_MOSI 4 E06 resource SPI_MOSI 4 E06
resource ESCSERIAL 1 A02 resource ADC_BATT 1 C03
resource ADC_BATT 1 C03 resource ADC_RSSI 1 C05
resource ADC_RSSI 1 C05 resource ADC_CURR 1 C02
resource ADC_CURR 1 C02 resource BARO_CS 1 A01
resource BARO_CS 1 A01 resource SDCARD_CS 1 E04
resource SDCARD_CS 1 E04 resource SDCARD_DETECT 1 E03
resource SDCARD_DETECT 1 E03 resource OSD_CS 1 B12
resource OSD_CS 1 B12 resource GYRO_EXTI 1 D00
resource GYRO_EXTI 1 D00 resource GYRO_EXTI 2 E08
resource GYRO_EXTI 2 E08 resource GYRO_CS 1 A15
resource GYRO_CS 1 A15 resource GYRO_CS 2 A04
resource GYRO_CS 2 A04 resource USB_DETECT 1 C04
resource USB_DETECT 1 C04
# timer
# timer timer E13 0
timer E13 0 timer B00 1
timer B00 0 timer B01 1
timer B01 1 timer E09 0
timer E09 0 timer E11 0
timer E11 0 timer D12 0
timer D12 0 timer B10 0
timer B10 0 timer B11 0
timer B11 0 timer C06 1
timer C06 1 timer C07 1
timer C07 1 timer A03 0
timer A03 0 timer A02 2
timer A02 2
# dma
# dma dma SPI_TX 4 0
dma SPI_TX 4 0 # SPI_TX 4: DMA2 Stream 1 Channel 4
# SPI_TX 4: DMA2 Stream 1 Channel 4 dma ADC 1 1
dma ADC 1 1 # ADC 1: DMA2 Stream 4 Channel 0
# ADC 1: DMA2 Stream 4 Channel 0 dma pin E13 1
dma pin E13 1 # pin E13: DMA2 Stream 6 Channel 6
# pin E13: DMA2 Stream 6 Channel 6 dma pin B00 0
dma pin B00 0 # pin B00: DMA1 Stream 7 Channel 5
# pin B00: DMA1 Stream 7 Channel 5 dma pin B01 0
dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5
# pin B01: DMA1 Stream 2 Channel 5 dma pin E09 2
dma pin E09 2 # pin E09: DMA2 Stream 3 Channel 6
# pin E09: DMA2 Stream 3 Channel 6 dma pin E11 1
dma pin E11 1 # pin E11: DMA2 Stream 2 Channel 6
# pin E11: DMA2 Stream 2 Channel 6 dma pin D12 0
dma pin D12 0 # pin D12: DMA1 Stream 0 Channel 2
# pin D12: DMA1 Stream 0 Channel 2 dma pin B10 0
dma pin B10 0 # pin B10: DMA1 Stream 1 Channel 3
# pin B10: DMA1 Stream 1 Channel 3 dma pin B11 0
dma pin B11 0 # pin B11: DMA1 Stream 7 Channel 3
# pin B11: DMA1 Stream 7 Channel 3 dma pin C06 0
dma pin C06 0 # pin C06: DMA2 Stream 2 Channel 0
# pin C06: DMA2 Stream 2 Channel 0 dma pin C07 1
dma pin C07 1 # pin C07: DMA2 Stream 3 Channel 7
# pin C07: DMA2 Stream 3 Channel 7 dma pin A03 0
dma pin A03 0 # pin A03: DMA1 Stream 7 Channel 3
# pin A03: DMA1 Stream 7 Channel 3
# master
feature RX_SERIAL set mag_bustype = I2C
feature OSD set mag_i2c_device = 2
feature AIRMODE set baro_spi_device = 1
feature ANTI_GRAVITY set current_meter = ADC
feature DYNAMIC_FILTER set battery_meter = ADC
set beeper_inversion = ON
# serial set beeper_od = OFF
serial 1 64 115200 57600 0 115200 set sdcard_detect_inverted = ON
serial 6 1024 115200 57600 0 115200 set sdcard_mode = SPI
set sdcard_spi_bus = 4
# master set system_hse_mhz = 8
set gyro_to_use = FIRST set max7456_spi_bus = 2
set align_mag = DEFAULT set dashboard_i2c_bus = 2
set mag_bustype = I2C set gyro_1_bustype = SPI
set mag_i2c_device = 2 set gyro_1_spibus = 3
set mag_i2c_address = 0 set gyro_1_sensor_align = CW90
set mag_spi_device = 0 set gyro_2_spibus = 1
set mag_hardware = AUTO
set baro_bustype = SPI
set baro_spi_device = 1
set baro_i2c_device = 0
set baro_i2c_address = 0
set baro_hardware = AUTO
set serialrx_provider = SBUS
set adc_device = 1
set motor_pwm_protocol = ONESHOT125
set current_meter = ADC
set battery_meter = ADC
set beeper_inversion = ON
set beeper_od = OFF
set tlm_halfduplex = ON
set sdcard_detect_inverted = ON
set sdcard_mode = SPI
set sdcard_dma = OFF
set sdcard_spi_bus = 4
set system_hse_mhz = 8
set max7456_clock = DEFAULT
set max7456_spi_bus = 2
set max7456_preinit_opu = OFF
set dashboard_i2c_bus = 2
set dashboard_i2c_addr = 60
set usb_msc_pin_pullup = ON
set gyro_1_bustype = SPI
set gyro_1_spibus = 3
set gyro_1_i2cBus = 0
set gyro_1_i2c_address = 0
set gyro_1_sensor_align = CW90
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