Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 00:05:33 +03:00
Code Issues Wiki Activity

Fixed build if none of USE_DSHOT, USE_LED_STRIP, USE_TRANSPONDER are defined.

Browse source
This commit is contained in:
mikeller 2019-06-29 19:43:15 +12:00
parent 23ca254277
commit 72d05f682c
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,7 +112,7 @@ typedef struct timerHardware_s {
#if defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) #if defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
uint8_t alternateFunction; uint8_t alternateFunction;
#endif #endif
#if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(USE_TRANSPONDER) #if defined(USE_TIMER_DMA)
#if defined(USE_DMA_SPEC) #if defined(USE_DMA_SPEC)
#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
DMA_Stream_TypeDef *dmaRefConfigured; DMA_Stream_TypeDef *dmaRefConfigured;

2
src/main/drivers/timer_def.h
View file

@ -24,7 +24,7 @@
#include "common/utils.h" #include "common/utils.h"
// allow conditional definition of DMA related members // allow conditional definition of DMA related members
#if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(USE_TRANSPONDER) #if defined(USE_TIMER_DMA)
# define DEF_TIM_DMA_COND(...) __VA_ARGS__ # define DEF_TIM_DMA_COND(...) __VA_ARGS__
#else #else
# define DEF_TIM_DMA_COND(...) # define DEF_TIM_DMA_COND(...)

6
src/main/target/common_post.h
View file

@ -310,6 +310,12 @@
#undef BEEPER_PWM_HZ #undef BEEPER_PWM_HZ
#endif #endif
#if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(USE_TRANSPONDER)
#define USE_TIMER_DMA
#else
#undef USE_DMA_SPEC
#endif
#if !defined(USE_DMA_SPEC) #if !defined(USE_DMA_SPEC)
#undef USE_TIMER_MGMT #undef USE_TIMER_MGMT
#endif #endif