mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-19 06:15:16 +03:00
Fixed missing timer definition for F7.
This commit is contained in:
mikeller
parent
9c4e750f39
commit
a5753600ed
5 changed files with 249 additions and 259 deletions
|
|
@ -169,11 +169,11 @@ extern const timerHardware_t timerHardware[];
|
|||
#if defined(USE_TIMER_MGMT)
|
||||
#if defined(STM32F4)
|
||||
|
||||
#define FULL_TIMER_CHANNEL_COUNT 70
|
||||
#define FULL_TIMER_CHANNEL_COUNT 78
|
||||
|
||||
#elif defined(STM32F7)
|
||||
|
||||
#define FULL_TIMER_CHANNEL_COUNT 70
|
||||
#define FULL_TIMER_CHANNEL_COUNT 78
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -144,6 +144,27 @@ const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = {
|
|||
//PORTF
|
||||
DEF_TIM(TIM10, CH1, PF6, 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
|
||||
|
||||
|
|
|
|||
|
|
@ -79,6 +79,7 @@ const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = {
|
|||
DEF_TIM(TIM14, CH1, PA7, TIM_USE_ANY, 0, 0),
|
||||
|
||||
//PORTB
|
||||
DEF_TIM(TIM1, CH2N, PB0, 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, CH3, PB10, TIM_USE_ANY, 0, 0),
|
||||
|
|
@ -138,6 +139,27 @@ const timerHardware_t fullTimerHardware[FULL_TIMER_CHANNEL_COUNT] = {
|
|||
//PORTF
|
||||
DEF_TIM(TIM10, CH1, PF6, 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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# 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
|
||||
manufacturer_id HBRO
|
||||
|
|
@ -36,7 +36,6 @@ resource SPI_MISO 4 E05
|
|||
resource SPI_MOSI 1 A07
|
||||
resource SPI_MOSI 2 B15
|
||||
resource SPI_MOSI 4 E06
|
||||
resource ESCSERIAL 1 E13
|
||||
resource ADC_BATT 1 C03
|
||||
resource ADC_RSSI 1 C05
|
||||
resource ADC_CURR 1 C02
|
||||
|
|
@ -49,7 +48,7 @@ resource USB_DETECT 1 A08
|
|||
|
||||
# timer
|
||||
timer E13 0
|
||||
timer B00 0
|
||||
timer B00 1
|
||||
timer B01 1
|
||||
timer E09 0
|
||||
timer E11 0
|
||||
|
|
@ -79,35 +78,18 @@ dma pin A03 0
|
|||
dma pin D12 0
|
||||
# pin D12: DMA1 Stream 0 Channel 2
|
||||
|
||||
# feature
|
||||
feature -RX_PARALLEL_PWM
|
||||
feature RX_SERIAL
|
||||
feature OSD
|
||||
|
||||
# serial
|
||||
serial 20 1 115200 57600 0 115200
|
||||
serial 5 64 115200 57600 0 115200
|
||||
serial 6 1024 115200 57600 0 115200
|
||||
|
||||
# master
|
||||
# Re-enable these once I2C has been fixed on F7
|
||||
#set baro_bustype = I2C
|
||||
#set baro_i2c_device = 1
|
||||
#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 dashboard_i2c_bus = 1
|
||||
set gyro_1_bustype = SPI
|
||||
set gyro_1_spibus = 4
|
||||
set gyro_1_sensor_align = CW270
|
||||
set gyro_2_spibus = 4
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# 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
|
||||
manufacturer_id AIRB
|
||||
|
|
@ -34,7 +34,6 @@ resource SPI_MOSI 1 A07
|
|||
resource SPI_MOSI 2 B15
|
||||
resource SPI_MOSI 3 C12
|
||||
resource SPI_MOSI 4 E06
|
||||
resource ESCSERIAL 1 A02
|
||||
resource ADC_BATT 1 C03
|
||||
resource ADC_RSSI 1 C05
|
||||
resource ADC_CURR 1 C02
|
||||
|
|
@ -50,7 +49,7 @@ resource USB_DETECT 1 C04
|
|||
|
||||
# timer
|
||||
timer E13 0
|
||||
timer B00 0
|
||||
timer B00 1
|
||||
timer B01 1
|
||||
timer E09 0
|
||||
timer E11 0
|
||||
|
|
@ -90,55 +89,21 @@ dma pin C07 1
|
|||
dma pin A03 0
|
||||
# pin A03: DMA1 Stream 7 Channel 3
|
||||
|
||||
feature RX_SERIAL
|
||||
feature OSD
|
||||
feature AIRMODE
|
||||
feature ANTI_GRAVITY
|
||||
feature DYNAMIC_FILTER
|
||||
|
||||
# serial
|
||||
serial 1 64 115200 57600 0 115200
|
||||
serial 6 1024 115200 57600 0 115200
|
||||
|
||||
# master
|
||||
set gyro_to_use = FIRST
|
||||
set align_mag = DEFAULT
|
||||
set mag_bustype = I2C
|
||||
set mag_i2c_device = 2
|
||||
set mag_i2c_address = 0
|
||||
set mag_spi_device = 0
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue