mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-21 15:25:36 +03:00
Timer DMA definitions incorrect for TIM5, and moving led to PB0 on BlueJayF4 (motor 5 as default)
This commit is contained in:
parent
9519282932
commit
71193681f6
3 changed files with 8 additions and 8 deletions
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define EEPROM_CONF_VERSION 144
|
#define EEPROM_CONF_VERSION 145
|
||||||
|
|
||||||
void initEEPROM(void);
|
void initEEPROM(void);
|
||||||
void writeEEPROM();
|
void writeEEPROM();
|
||||||
|
|
|
@ -345,11 +345,11 @@
|
||||||
#define DEF_TIM_DMA_CHN_0__TIM4_CH3 DMA_Channel_2
|
#define DEF_TIM_DMA_CHN_0__TIM4_CH3 DMA_Channel_2
|
||||||
#define DEF_TIM_DMA_CHN_0__TIM4_CH4 DMA_Channel_2
|
#define DEF_TIM_DMA_CHN_0__TIM4_CH4 DMA_Channel_2
|
||||||
|
|
||||||
#define DEF_TIM_DMA_CHN_0__TIM5_CH1 DMA_Channel_3
|
#define DEF_TIM_DMA_CHN_0__TIM5_CH1 DMA_Channel_6
|
||||||
#define DEF_TIM_DMA_CHN_0__TIM5_CH2 DMA_Channel_3
|
#define DEF_TIM_DMA_CHN_0__TIM5_CH2 DMA_Channel_6
|
||||||
#define DEF_TIM_DMA_CHN_0__TIM5_CH3 DMA_Channel_3
|
#define DEF_TIM_DMA_CHN_0__TIM5_CH3 DMA_Channel_6
|
||||||
#define DEF_TIM_DMA_CHN_0__TIM5_CH4 DMA_Channel_3
|
#define DEF_TIM_DMA_CHN_0__TIM5_CH4 DMA_Channel_6
|
||||||
#define DEF_TIM_DMA_CHN_1__TIM5_CH4 DMA_Channel_3
|
#define DEF_TIM_DMA_CHN_1__TIM5_CH4 DMA_Channel_6
|
||||||
|
|
||||||
#define DEF_TIM_DMA_CHN_0__TIM8_CH1 DMA_Channel_0
|
#define DEF_TIM_DMA_CHN_0__TIM8_CH1 DMA_Channel_0
|
||||||
#define DEF_TIM_DMA_CHN_1__TIM8_CH1 DMA_Channel_7
|
#define DEF_TIM_DMA_CHN_1__TIM8_CH1 DMA_Channel_7
|
||||||
|
|
|
@ -42,6 +42,6 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
|
||||||
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S2_OUT - DMA1_ST4
|
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S2_OUT - DMA1_ST4
|
||||||
DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S3_OUT - DMA1_ST1
|
DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S3_OUT - DMA1_ST1
|
||||||
DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 1 ), // S4_OUT - DMA1_ST6
|
DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 1 ), // S4_OUT - DMA1_ST6
|
||||||
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S5_OUT - DMA1_ST2
|
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR | TIM_USE_LED, TIMER_OUTPUT_ENABLED, 0 ), // S5_OUT - DMA1_ST7
|
||||||
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR | TIM_USE_LED, TIMER_OUTPUT_ENABLED, 0 ), // S6_OUT - DMA1_ST7
|
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S6_OUT - DMA1_ST2
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue