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

Fixed LED_STRIP and TRANSPONDER.

Browse source
This commit is contained in:
mikeller 2019-03-01 04:53:32 +13:00
parent 1507cc880c
commit 1f0ab65c44
2 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/drivers/light_ws2811strip_stdperiph.c
View file

@ -39,12 +39,6 @@
#include "light_ws2811strip.h" #include "light_ws2811strip.h"
#if defined(STM32F4) || defined(STM32F7)
typedef DMA_Stream_TypeDef dmaStream_t;
#else
typedef DMA_Channel_TypeDef dmaStream_t;
#endif
static IO_t ws2811IO = IO_NONE; static IO_t ws2811IO = IO_NONE;
#if defined(STM32F4) #if defined(STM32F4)
static DMA_Stream_TypeDef *dmaRef = NULL; static DMA_Stream_TypeDef *dmaRef = NULL;
@ -101,12 +95,12 @@ bool ws2811LedStripHardwareInit(ioTag_t ioTag)
return false; return false;
} }
dmaStream_t *dmaRef = dmaSpec->ref; dmaRef = dmaSpec->ref;
#if defined(STM32F4) #if defined(STM32F4)
uint32_t dmaChannel = dmaSpec->channel; uint32_t dmaChannel = dmaSpec->channel;
#endif #endif
#else #else
dmaStream_t *dmaRef = timerHardware->dmaRef; dmaRef = timerHardware->dmaRef;
#if defined(STM32F4) #if defined(STM32F4)
uint32_t dmaChannel = timerHardware->dmaChannel; uint32_t dmaChannel = timerHardware->dmaChannel;
#endif #endif

10
src/main/drivers/transponder_ir_io_stdperiph.c
View file

@ -38,12 +38,6 @@
#include "transponder_ir.h" #include "transponder_ir.h"
#if defined(STM32F4) || defined(STM32F7)
typedef DMA_Stream_TypeDef dmaStream_t;
#else
typedef DMA_Channel_TypeDef dmaStream_t;
#endif
volatile uint8_t transponderIrDataTransferInProgress = 0; volatile uint8_t transponderIrDataTransferInProgress = 0;
static IO_t transponderIO = IO_NONE; static IO_t transponderIO = IO_NONE;
@ -88,12 +82,12 @@ void transponderIrHardwareInit(ioTag_t ioTag, transponder_t *transponder)
return; return;
} }
dmaStream_t *dmaRef = dmaSpec->ref; dmaRef = dmaSpec->ref;
#if defined(STM32F4) #if defined(STM32F4)
uint32_t dmaChannel = dmaSpec->channel; uint32_t dmaChannel = dmaSpec->channel;
#endif #endif
#else #else
dmaStream_t *dmaRef = timerHardware->dmaRef; dmaRef = timerHardware->dmaRef;
#if defined(STM32F4) #if defined(STM32F4)
uint32_t dmaChannel = timerHardware->dmaChannel; uint32_t dmaChannel = timerHardware->dmaChannel;
#endif #endif