Merge pull request #7680 from mikeller/fix_led_strip_transponder
Fixed LED_STRIP and TRANSPONDER.
This commit is contained in:
commit
111834d6e3
|
@ -39,12 +39,6 @@
|
|||
|
||||
#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;
|
||||
#if defined(STM32F4)
|
||||
static DMA_Stream_TypeDef *dmaRef = NULL;
|
||||
|
@ -101,12 +95,12 @@ bool ws2811LedStripHardwareInit(ioTag_t ioTag)
|
|||
return false;
|
||||
}
|
||||
|
||||
dmaStream_t *dmaRef = dmaSpec->ref;
|
||||
dmaRef = dmaSpec->ref;
|
||||
#if defined(STM32F4)
|
||||
uint32_t dmaChannel = dmaSpec->channel;
|
||||
#endif
|
||||
#else
|
||||
dmaStream_t *dmaRef = timerHardware->dmaRef;
|
||||
dmaRef = timerHardware->dmaRef;
|
||||
#if defined(STM32F4)
|
||||
uint32_t dmaChannel = timerHardware->dmaChannel;
|
||||
#endif
|
||||
|
|
|
@ -38,12 +38,6 @@
|
|||
|
||||
#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;
|
||||
|
||||
static IO_t transponderIO = IO_NONE;
|
||||
|
@ -88,12 +82,12 @@ void transponderIrHardwareInit(ioTag_t ioTag, transponder_t *transponder)
|
|||
return;
|
||||
}
|
||||
|
||||
dmaStream_t *dmaRef = dmaSpec->ref;
|
||||
dmaRef = dmaSpec->ref;
|
||||
#if defined(STM32F4)
|
||||
uint32_t dmaChannel = dmaSpec->channel;
|
||||
#endif
|
||||
#else
|
||||
dmaStream_t *dmaRef = timerHardware->dmaRef;
|
||||
dmaRef = timerHardware->dmaRef;
|
||||
#if defined(STM32F4)
|
||||
uint32_t dmaChannel = timerHardware->dmaChannel;
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue