Update to LED STRIP to use new IO

src/main/config/config.c

@@ -848,10 +848,10 @@ void validateAndFixConfig(void)
     if (featureConfigured(FEATURE_SOFTSERIAL) && (
             0
 #ifdef USE_SOFTSERIAL1
-            || (LED_STRIP_TIMER == SOFTSERIAL_1_TIMER)
+            || (WS2811_TIMER == SOFTSERIAL_1_TIMER)
 #endif
 #ifdef USE_SOFTSERIAL2
-            || (LED_STRIP_TIMER == SOFTSERIAL_2_TIMER)
+            || (WS2811_TIMER == SOFTSERIAL_2_TIMER)
 #endif
     )) {
         // led strip needs the same timer as softserial

src/main/drivers/light_ws2811strip.c

@@ -80,18 +80,9 @@ void setStripColors(const hsvColor_t *colors)
     }
 }
 
-void ws2811DMAHandler(DMA_Channel_TypeDef *channel) {
-    if (DMA_GetFlagStatus(WS2811_DMA_TC_FLAG)) {
-        ws2811LedDataTransferInProgress = 0;
-        DMA_Cmd(channel, DISABLE);
-        DMA_ClearFlag(WS2811_DMA_TC_FLAG);
-    }
-}
-
 void ws2811LedStripInit(void)
 {
     memset(&ledStripDMABuffer, 0, WS2811_DMA_BUFFER_SIZE);
-    dmaSetHandler(WS2811_DMA_HANDLER_IDENTIFER, ws2811DMAHandler);
     ws2811LedStripHardwareInit();
     ws2811UpdateStrip();
 }
@@ -141,12 +132,11 @@ STATIC_UNIT_TESTED void updateLEDDMABuffer(uint8_t componentValue)
  */
 void ws2811UpdateStrip(void)
 {
-    static uint32_t waitCounter = 0;
     static rgbColor24bpp_t *rgb24;
 
-    // wait until previous transfer completes
+    // don't wait - risk of infinite block, just get an update next time round
-    while(ws2811LedDataTransferInProgress) {
+    if (ws2811LedDataTransferInProgress) {
-        waitCounter++;
+        return;
     }
 
     dmaBufferOffset = 0;                // reset buffer memory index

src/main/drivers/light_ws2811strip_stm32f10x.c

@@ -23,35 +23,41 @@
 #include "common/color.h"
 #include "drivers/light_ws2811strip.h"
 #include "nvic.h"
+#include "io.h"
+#include "dma.h"
+#include "timer.h"
+
+#ifdef LED_STRIP
+
+static IO_t ws2811IO = IO_NONE;
+bool ws2811Initialised = false;
+
+void ws2811DMAHandler(DMA_Channel_TypeDef *channel)
+{
+    if (DMA_GetFlagStatus(WS2811_DMA_TC_FLAG)) {
+        ws2811LedDataTransferInProgress = 0;
+        DMA_Cmd(channel, DISABLE);
+        DMA_ClearFlag(WS2811_DMA_TC_FLAG);
+    }
+}
 
 void ws2811LedStripHardwareInit(void)
 {
     TIM_TimeBaseInitTypeDef  TIM_TimeBaseStructure;
     TIM_OCInitTypeDef  TIM_OCInitStructure;
-    GPIO_InitTypeDef GPIO_InitStructure;
     DMA_InitTypeDef DMA_InitStructure;
 
     uint16_t prescalerValue;
 
-#ifdef CC3D
+    dmaSetHandler(WS2811_DMA_HANDLER_IDENTIFER, ws2811DMAHandler);
-    RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB, ENABLE);
-    GPIO_StructInit(&GPIO_InitStructure);
-    GPIO_InitStructure.GPIO_Pin = GPIO_Pin_4;
-    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
-    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
-    GPIO_Init(GPIOB, &GPIO_InitStructure);
-#else
-    RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE);
     
-    /* GPIOA Configuration: TIM3 Channel 1 as alternate function push-pull */
+    ws2811IO = IOGetByTag(IO_TAG(WS2811_PIN));
-    GPIO_StructInit(&GPIO_InitStructure);
+/* GPIOA Configuration: TIM5 Channel 1 as alternate function push-pull */
-    GPIO_InitStructure.GPIO_Pin = GPIO_Pin_6;
+    IOInit(ws2811IO, OWNER_SYSTEM, RESOURCE_OUTPUT);
-    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
+    IOConfigGPIO(ws2811IO, IO_CONFIG(GPIO_Speed_50MHz, GPIO_Mode_AF_PP));
-    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+    
-    GPIO_Init(GPIOA, &GPIO_InitStructure);
+    RCC_ClockCmd(timerRCC(WS2811_TIMER), ENABLE);
-#endif
     
-    RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM3, ENABLE);
     /* Compute the prescaler value */
     prescalerValue = (uint16_t) (SystemCoreClock / 24000000) - 1;
     /* Time base configuration */
@@ -108,16 +114,20 @@ void ws2811LedStripHardwareInit(void)
     NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
     NVIC_Init(&NVIC_InitStructure);
 
+    ws2811Initialised = true;
     setStripColor(&hsv_white);
     ws2811UpdateStrip();
 }
 
 void ws2811LedStripDMAEnable(void)
 {
+    if (!ws2811Initialised)
+        return;
+    
     DMA_SetCurrDataCounter(DMA1_Channel6, WS2811_DMA_BUFFER_SIZE);  // load number of bytes to be transferred
     TIM_SetCounter(TIM3, 0);
     TIM_Cmd(TIM3, ENABLE);
     DMA_Cmd(DMA1_Channel6, ENABLE);
 }
 
-
+#endif

src/main/drivers/light_ws2811strip_stm32f30x.c

@@ -20,51 +20,54 @@
 
 #include <platform.h>
 
-#include "gpio.h"
+#include "io.h"
 #include "nvic.h"
 
 #include "common/color.h"
 #include "drivers/light_ws2811strip.h"
+#include "dma.h"
+#include "rcc.h"
+#include "timer.h"
 
-#ifndef WS2811_GPIO
+#ifdef LED_STRIP
-#define WS2811_GPIO                     GPIOB
+
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOB
+#ifndef WS2811_PIN
-#define WS2811_GPIO_AF                  GPIO_AF_1
+#define WS2811_PIN                      PB8 // TIM16_CH1
-#define WS2811_PIN                      GPIO_Pin_8 // TIM16_CH1
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM16
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM16
 #define WS2811_DMA_CHANNEL              DMA1_Channel3
 #define WS2811_IRQ                      DMA1_Channel3_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC3
 #define WS2811_DMA_HANDLER_IDENTIFER    DMA1_CH3_HANDLER
-
 #endif
 
+static IO_t ws2811IO = IO_NONE;
+bool ws2811Initialised = false;
+
+void ws2811DMAHandler(DMA_Channel_TypeDef *channel) 
+{
+    if (DMA_GetFlagStatus(WS2811_DMA_TC_FLAG)) {
+        ws2811LedDataTransferInProgress = 0;
+        DMA_Cmd(channel, DISABLE);
+        DMA_ClearFlag(WS2811_DMA_TC_FLAG);
+    }
+}
+
 void ws2811LedStripHardwareInit(void)
 {
     TIM_TimeBaseInitTypeDef  TIM_TimeBaseStructure;
     TIM_OCInitTypeDef  TIM_OCInitStructure;
-    GPIO_InitTypeDef GPIO_InitStructure;
     DMA_InitTypeDef DMA_InitStructure;
 
     uint16_t prescalerValue;
     
-    RCC_AHBPeriphClockCmd(WS2811_GPIO_AHB_PERIPHERAL, ENABLE);
+    dmaSetHandler(WS2811_DMA_HANDLER_IDENTIFER, ws2811DMAHandler);
     
-    GPIO_PinAFConfig(WS2811_GPIO, WS2811_PIN_SOURCE,  WS2811_GPIO_AF);
+    ws2811IO = IOGetByTag(IO_TAG(WS2811_PIN));
+    /* GPIOA Configuration: TIM5 Channel 1 as alternate function push-pull */
+    IOInit(ws2811IO, OWNER_SYSTEM, RESOURCE_OUTPUT);
+    IOConfigGPIOAF(ws2811IO, IO_CONFIG(GPIO_Mode_AF, GPIO_Speed_50MHz, GPIO_OType_PP, GPIO_PuPd_UP), timerGPIOAF(WS2811_TIMER));
     
-    /* Configuration alternate function push-pull */
+    RCC_ClockCmd(timerRCC(WS2811_TIMER), ENABLE);
-    GPIO_StructInit(&GPIO_InitStructure);
-    GPIO_InitStructure.GPIO_Pin = WS2811_PIN;
-    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;
-    GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
-    GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
-    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
-    GPIO_Init(WS2811_GPIO, &GPIO_InitStructure);
-
-
-    RCC_APB2PeriphClockCmd(WS2811_TIMER_APB2_PERIPHERAL, ENABLE);
 
     /* Compute the prescaler value */
     prescalerValue = (uint16_t) (SystemCoreClock / 24000000) - 1;
@@ -122,16 +125,20 @@ void ws2811LedStripHardwareInit(void)
     NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
     NVIC_Init(&NVIC_InitStructure);
 
+    ws2811Initialised = true;
     setStripColor(&hsv_white);
     ws2811UpdateStrip();
 }
 
 void ws2811LedStripDMAEnable(void)
 {
+    if (!ws2811Initialised)
+        return;
+    
     DMA_SetCurrDataCounter(WS2811_DMA_CHANNEL, WS2811_DMA_BUFFER_SIZE);  // load number of bytes to be transferred
     TIM_SetCounter(WS2811_TIMER, 0);
     TIM_Cmd(WS2811_TIMER, ENABLE);
     DMA_Cmd(WS2811_DMA_CHANNEL, ENABLE);
 }
 
-
+#endif

src/main/drivers/light_ws2811strip_stm32f4xx.c

@@ -22,64 +22,122 @@
 
 #include "common/color.h"
 #include "light_ws2811strip.h"
+#include "dma.h"
 #include "nvic.h"
+#include "io.h"
+#include "system.h"
+#include "rcc.h"
+#include "timer.h"
 
 #ifdef LED_STRIP
+
+#if !defined(WS2811_PIN) 
+#define WS2811_PIN                      PA0 
+#define WS2811_TIMER                    TIM5
+#define WS2811_DMA_HANDLER_IDENTIFER    DMA1_ST2_HANDLER
+#define WS2811_DMA_STREAM               DMA1_Stream2
+#define WS2811_DMA_FLAG                 DMA_FLAG_TCIF2
+#define WS2811_DMA_IT                   DMA_IT_TCIF2
+#define WS2811_DMA_CHANNEL              DMA_Channel_6
+#define WS2811_DMA_IRQ                  DMA1_Stream2_IRQn
+#define WS2811_TIMER_CHANNEL            TIM_Channel_1
+#endif
+
+static IO_t ws2811IO = IO_NONE;
+static uint16_t timDMASource = 0;
+bool ws2811Initialised = false;
+
+void ws2811DMAHandler(DMA_Stream_TypeDef *stream)
+{
+    if (DMA_GetFlagStatus(stream, WS2811_DMA_FLAG)) {
+        ws2811LedDataTransferInProgress = 0;
+        DMA_ClearITPendingBit(stream, WS2811_DMA_IT);
+        DMA_Cmd(stream, DISABLE);
+        TIM_DMACmd(WS2811_TIMER, timDMASource, DISABLE);
+    }
+}
+
 void ws2811LedStripHardwareInit(void)
 {
     TIM_TimeBaseInitTypeDef  TIM_TimeBaseStructure;
     TIM_OCInitTypeDef  TIM_OCInitStructure;
-    GPIO_InitTypeDef GPIO_InitStructure;
     DMA_InitTypeDef DMA_InitStructure;
 
     uint16_t prescalerValue;
 
-    RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA, ENABLE);
+    RCC_ClockCmd(timerRCC(WS2811_TIMER), ENABLE);
-    RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM5, ENABLE);
-    RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_DMA1, ENABLE);
-
 
+    ws2811IO = IOGetByTag(IO_TAG(WS2811_PIN));
     /* GPIOA Configuration: TIM5 Channel 1 as alternate function push-pull */
-    GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0;
+    IOInit(ws2811IO, OWNER_SYSTEM, RESOURCE_OUTPUT);
-    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;
+    IOConfigGPIOAF(ws2811IO, IO_CONFIG(GPIO_Mode_AF, GPIO_Speed_50MHz, GPIO_OType_PP, GPIO_PuPd_UP), timerGPIOAF(WS2811_TIMER));
-    GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
-    GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
-    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
-    GPIO_Init(GPIOA, &GPIO_InitStructure);
-
-    GPIO_PinAFConfig(GPIOA, GPIO_PinSource0,  GPIO_AF_TIM5);
-
     
     // Stop timer
-    TIM_Cmd(TIM5, DISABLE);
+    TIM_Cmd(WS2811_TIMER, DISABLE);
 
     /* Compute the prescaler value */
-    prescalerValue = (uint16_t) (SystemCoreClock / 2 / 84000000) - 1;
+    prescalerValue = (uint16_t)(SystemCoreClock / 2 / 84000000) - 1;
+    
     /* Time base configuration */
     TIM_TimeBaseStructure.TIM_Period = 104; // 800kHz
     TIM_TimeBaseStructure.TIM_Prescaler = prescalerValue;
-    TIM_TimeBaseStructure.TIM_ClockDivision = 0;
+    TIM_TimeBaseStructure.TIM_ClockDivision = TIM_CKD_DIV1;
     TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;
-    TIM_TimeBaseInit(TIM5, &TIM_TimeBaseStructure);
+    TIM_TimeBaseInit(WS2811_TIMER, &TIM_TimeBaseStructure);
 
     /* PWM1 Mode configuration: Channel1 */
     TIM_OCInitStructure.TIM_OCMode = TIM_OCMode_PWM1;
+    TIM_OCInitStructure.TIM_OCIdleState = TIM_OCIdleState_Reset;
+    TIM_OCInitStructure.TIM_OCNIdleState = TIM_OCNIdleState_Set;
+    TIM_OCInitStructure.TIM_OCPolarity = TIM_OCNPolarity_High;
+    TIM_OCInitStructure.TIM_OCNPolarity = TIM_OCNPolarity_High;
     TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
+    TIM_OCInitStructure.TIM_OutputNState = TIM_OutputNState_Disable;
     TIM_OCInitStructure.TIM_Pulse = 0;
-    TIM_OCInitStructure.TIM_OCPolarity = TIM_OCPolarity_High;
-    TIM_OC1Init(TIM5, &TIM_OCInitStructure);
-    TIM_OC1PreloadConfig(TIM5, TIM_OCPreload_Enable);
     
-    TIM_Cmd(TIM5, ENABLE);
+    uint32_t channelAddress = 0;
+    switch (WS2811_TIMER_CHANNEL)
+    {
+    case TIM_Channel_1:
+        TIM_OC1Init(WS2811_TIMER, &TIM_OCInitStructure);
+        timDMASource = TIM_DMA_CC1;
+        channelAddress = (uint32_t)(&WS2811_TIMER->CCR1);
+        TIM_OC1PreloadConfig(WS2811_TIMER, TIM_OCPreload_Enable);
+        break;        
+    case TIM_Channel_2:
+        TIM_OC2Init(WS2811_TIMER, &TIM_OCInitStructure);
+        timDMASource = TIM_DMA_CC2;
+        channelAddress = (uint32_t)(&WS2811_TIMER->CCR2);
+        TIM_OC2PreloadConfig(WS2811_TIMER, TIM_OCPreload_Enable);
+        break;        
+    case TIM_Channel_3:
+        TIM_OC3Init(WS2811_TIMER, &TIM_OCInitStructure);
+        timDMASource = TIM_DMA_CC3;
+        channelAddress = (uint32_t)(&WS2811_TIMER->CCR3);
+        TIM_OC3PreloadConfig(WS2811_TIMER, TIM_OCPreload_Enable);
+        break;        
+    case TIM_Channel_4:
+        TIM_OC4Init(WS2811_TIMER, &TIM_OCInitStructure);
+        timDMASource = TIM_DMA_CC4;
+        channelAddress = (uint32_t)(&WS2811_TIMER->CCR4);
+        TIM_OC4PreloadConfig(WS2811_TIMER, TIM_OCPreload_Enable);
+        break;        
+    }
     
+    TIM_CtrlPWMOutputs(WS2811_TIMER, ENABLE);    
+    TIM_ARRPreloadConfig(WS2811_TIMER, ENABLE);
+
+    TIM_CCxCmd(WS2811_TIMER, WS2811_TIMER_CHANNEL, TIM_CCx_Enable);
+    TIM_Cmd(WS2811_TIMER, ENABLE);
+
+    dmaSetHandler(WS2811_DMA_HANDLER_IDENTIFER, ws2811DMAHandler);
 
     /* configure DMA */
-    /* DMA1 Channel Config */
+    DMA_Cmd(WS2811_DMA_STREAM, DISABLE);            
-    DMA_Cmd(DMA1_Stream2, DISABLE);            // disable DMA channel 6
+    DMA_DeInit(WS2811_DMA_STREAM);
-    DMA_DeInit(DMA1_Stream2);
     DMA_StructInit(&DMA_InitStructure);
-    DMA_InitStructure.DMA_Channel = DMA_Channel_6;
+    DMA_InitStructure.DMA_Channel = WS2811_DMA_CHANNEL;
-    DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)&(TIM5->CCR1);
+    DMA_InitStructure.DMA_PeripheralBaseAddr = channelAddress;
     DMA_InitStructure.DMA_Memory0BaseAddr = (uint32_t)ledStripDMABuffer;
     DMA_InitStructure.DMA_DIR = DMA_DIR_MemoryToPeripheral;
     DMA_InitStructure.DMA_BufferSize = WS2811_DMA_BUFFER_SIZE;
@@ -93,38 +151,36 @@ void ws2811LedStripHardwareInit(void)
     DMA_InitStructure.DMA_FIFOThreshold = DMA_FIFOThreshold_1QuarterFull;
     DMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_Single;
     DMA_InitStructure.DMA_PeripheralBurst = DMA_PeripheralBurst_Single;
-    DMA_Init(DMA1_Stream2, &DMA_InitStructure);
 
-    DMA_ITConfig(DMA1_Stream2, DMA_IT_TC, ENABLE);
+    
-    DMA_ClearITPendingBit(DMA1_Stream2, DMA_IT_TCIF2);               // clear DMA1 Channel 6 transfer complete flag
+    RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_DMA1, ENABLE);    
+    DMA_Init(WS2811_DMA_STREAM, &DMA_InitStructure);
+
+    DMA_ITConfig(WS2811_DMA_STREAM, DMA_IT_TC, ENABLE);
+    DMA_ClearITPendingBit(WS2811_DMA_STREAM, WS2811_DMA_IT);              
     
     NVIC_InitTypeDef NVIC_InitStructure;
 
-    NVIC_InitStructure.NVIC_IRQChannel = DMA1_Stream2_IRQn;
+    NVIC_InitStructure.NVIC_IRQChannel = WS2811_DMA_IRQ;
     NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = NVIC_PRIORITY_BASE(NVIC_PRIO_WS2811_DMA);
     NVIC_InitStructure.NVIC_IRQChannelSubPriority = NVIC_PRIORITY_SUB(NVIC_PRIO_WS2811_DMA);
     NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
     NVIC_Init(&NVIC_InitStructure);
 
+    ws2811Initialised = true;
     setStripColor(&hsv_white);
     ws2811UpdateStrip();
 }
 
-void DMA1_Stream2_IRQHandler(void)
-{
-    if (DMA_GetFlagStatus(DMA1_Stream2, DMA_FLAG_TCIF2)) {
-        ws2811LedDataTransferInProgress = 0;
-        DMA_Cmd(DMA1_Stream2, DISABLE);
-        TIM_DMACmd(TIM5, TIM_DMA_CC1, DISABLE);
-        DMA_ClearITPendingBit(DMA1_Stream2, DMA_IT_TCIF2);
-    }
-}
-
 void ws2811LedStripDMAEnable(void)
 {
-    DMA_SetCurrDataCounter(DMA1_Stream2, WS2811_DMA_BUFFER_SIZE);  // load number of bytes to be transferred
+    if (!ws2811Initialised)
-    TIM_SetCounter(TIM5, 0);
+        return;
-    DMA_Cmd(DMA1_Stream2, ENABLE);
+    
-    TIM_DMACmd(TIM5, TIM_DMA_CC1, ENABLE);
+    DMA_SetCurrDataCounter(WS2811_DMA_STREAM, WS2811_DMA_BUFFER_SIZE);  // load number of bytes to be transferred
+    TIM_SetCounter(WS2811_TIMER, 0);
+    DMA_Cmd(WS2811_DMA_STREAM, ENABLE);
+    TIM_DMACmd(WS2811_TIMER, timDMASource, ENABLE);
 }
+
 #endif

src/main/drivers/pwm_mapping.c

@@ -157,33 +157,33 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
             continue;
 #endif
 
-#ifdef LED_STRIP_TIMER
+#ifdef WS2811_TIMER
         // skip LED Strip output
         if (init->useLEDStrip) {
-            if (timerHardwarePtr->tim == LED_STRIP_TIMER)
+            if (timerHardwarePtr->tim == WS2811_TIMER)
                 continue;
-#if defined(STM32F303xC) && defined(WS2811_GPIO) && defined(WS2811_PIN_SOURCE)
+#if defined(STM32F303xC) && defined(WS2811_PIN)
-            if (CheckGPIOPinSource(timerHardwarePtr->tag, WS2811_GPIO, WS2811_PIN_SOURCE))
+            if (timerHardwarePtr->tag == IO_TAG(WS2811_PIN))
                 continue;
 #endif
         }
 
 #endif
 
-#ifdef VBAT_ADC_GPIO
+#ifdef VBAT_ADC_PIN
-        if (init->useVbat && CheckGPIOPin(timerHardwarePtr->tag, VBAT_ADC_GPIO, VBAT_ADC_GPIO_PIN)) {
+        if (init->useVbat && timerHardwarePtr->tag == IO_TAG(VBAT_ADC_PIN)) {
             continue;
         }
 #endif
 
 #ifdef RSSI_ADC_GPIO
-        if (init->useRSSIADC && CheckGPIOPin(timerHardwarePtr->tag, RSSI_ADC_GPIO, RSSI_ADC_GPIO_PIN)) {
+        if (init->useRSSIADC && timerHardwarePtr->tag == IO_TAG(RSSI_ADC_PIN)) {
             continue;
         }
 #endif
 
 #ifdef CURRENT_METER_ADC_GPIO
-        if (init->useCurrentMeterADC && CheckGPIOPin(timerHardwarePtr->tag, CURRENT_METER_ADC_GPIO, CURRENT_METER_ADC_GPIO_PIN)) {
+        if (init->useCurrentMeterADC && timerHardwarePtr->tag == IO_TAG(CURRENT_METER_ADC_PIN)) {
             continue;
         }
 #endif
@@ -274,7 +274,7 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
         }
 
         if (init->useChannelForwarding && !init->airplane) {
-#if defined(NAZE) && defined(LED_STRIP_TIMER)
+#if defined(NAZE) && defined(WS2811_TIMER)
             // if LED strip is active, PWM5-8 are unavailable, so map AUX1+AUX2 to PWM13+PWM14
             if (init->useLEDStrip) { 
                 if (timerIndex >= PWM13 && timerIndex <= PWM14) {

src/main/drivers/timer.c

@@ -151,6 +151,18 @@ rccPeriphTag_t timerRCC(TIM_TypeDef *tim)
     return 0;
 }
 
+#if defined(STM32F3) || defined(STM32F4)
+uint8_t timerGPIOAF(TIM_TypeDef *tim)
+{
+    for (uint8_t i = 0; i < HARDWARE_TIMER_DEFINITION_COUNT; i++) {
+        if (timerDefinitions[i].TIMx == tim) {
+            return timerDefinitions[i].alternateFunction;
+        }
+    }
+    return 0;
+}
+#endif
+
 void timerNVICConfigure(uint8_t irq)
 {
     NVIC_InitTypeDef NVIC_InitStructure;

src/main/drivers/timer.h

@@ -69,6 +69,9 @@ typedef struct timerOvrHandlerRec_s {
 typedef struct timerDef_s {
     TIM_TypeDef *TIMx;
     rccPeriphTag_t rcc;
+#if defined(STM32F3) || defined(STM32F4)
+    uint8_t alternateFunction;
+#endif
 } timerDef_t;
 
 typedef struct timerHardware_s {
@@ -82,8 +85,11 @@ typedef struct timerHardware_s {
     uint8_t alternateFunction;
 #endif
 } timerHardware_t;
-enum {TIMER_OUTPUT_ENABLED = 0x01, TIMER_OUTPUT_INVERTED = 0x02};
 
+enum {
+    TIMER_OUTPUT_ENABLED = 0x01, 
+    TIMER_OUTPUT_INVERTED = 0x02
+};
 
 #ifdef STM32F1
 #if defined(STM32F10X_XL) || defined(STM32F10X_HD_VL)
@@ -149,3 +155,7 @@ void timerForceOverflow(TIM_TypeDef *tim);
 void configTimeBase(TIM_TypeDef *tim, uint16_t period, uint8_t mhz);  // TODO - just for migration
 
 rccPeriphTag_t timerRCC(TIM_TypeDef *tim);
+
+#if defined(STM32F3) || defined(STM32F4)
+uint8_t timerGPIOAF(TIM_TypeDef *tim);
+#endif

src/main/drivers/timer_stm32f30x.c

@@ -10,16 +10,16 @@
 #include "timer.h"
 
 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
-    { .TIMx = TIM1,  .rcc = RCC_APB2(TIM1)  },
+    { .TIMx = TIM1,  .rcc = RCC_APB2(TIM1),  GPIO_AF_6    },
-    { .TIMx = TIM2,  .rcc = RCC_APB1(TIM2)  },
+    { .TIMx = TIM2,  .rcc = RCC_APB1(TIM2),  GPIO_AF_1    },
-    { .TIMx = TIM3,  .rcc = RCC_APB1(TIM3)  },
+    { .TIMx = TIM3,  .rcc = RCC_APB1(TIM3),  GPIO_AF_2    },
-    { .TIMx = TIM4,  .rcc = RCC_APB1(TIM4)  },
+    { .TIMx = TIM4,  .rcc = RCC_APB1(TIM4),  GPIO_AF_10   },
-    { .TIMx = TIM6,  .rcc = RCC_APB1(TIM6)  },
+    { .TIMx = TIM6,  .rcc = RCC_APB1(TIM6),  0   },
-    { .TIMx = TIM7,  .rcc = RCC_APB1(TIM7)  },
+    { .TIMx = TIM7,  .rcc = RCC_APB1(TIM7),  0   },
-    { .TIMx = TIM8,  .rcc = RCC_APB2(TIM8)  },
+    { .TIMx = TIM8,  .rcc = RCC_APB2(TIM8),   GPIO_AF_5  },
-    { .TIMx = TIM15, .rcc = RCC_APB2(TIM15) },
+    { .TIMx = TIM15, .rcc = RCC_APB2(TIM15),  GPIO_AF_9  },
-    { .TIMx = TIM16, .rcc = RCC_APB2(TIM16) },
+    { .TIMx = TIM16, .rcc = RCC_APB2(TIM16),  GPIO_AF_1  },
-    { .TIMx = TIM17, .rcc = RCC_APB2(TIM17) },
+    { .TIMx = TIM17, .rcc = RCC_APB2(TIM17),  GPIO_AF_1  },
 };
 
 

src/main/drivers/timer_stm32f4xx.c

@@ -35,20 +35,20 @@
 #define CCMR_Offset                 ((uint16_t)0x0018)
 
 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
-    { .TIMx = TIM1,  .rcc = RCC_APB2(TIM1)  },
+	{ .TIMx = TIM1, .rcc = RCC_APB2(TIM1),   GPIO_AF_TIM1  },
-    { .TIMx = TIM2,  .rcc = RCC_APB1(TIM2)  },
+	{ .TIMx = TIM2, .rcc = RCC_APB1(TIM2),   GPIO_AF_TIM2  },
-    { .TIMx = TIM3,  .rcc = RCC_APB1(TIM3)  },
+	{ .TIMx = TIM3, .rcc = RCC_APB1(TIM3),   GPIO_AF_TIM3  },
-    { .TIMx = TIM4,  .rcc = RCC_APB1(TIM4)  },
+	{ .TIMx = TIM4, .rcc = RCC_APB1(TIM4),   GPIO_AF_TIM4  },
-    { .TIMx = TIM5,  .rcc = RCC_APB1(TIM5)  },
+	{ .TIMx = TIM5, .rcc = RCC_APB1(TIM5),   GPIO_AF_TIM5  },
-    { .TIMx = TIM6,  .rcc = RCC_APB1(TIM6)  },
+	{ .TIMx = TIM6, .rcc = RCC_APB1(TIM6),   0  },
-    { .TIMx = TIM7,  .rcc = RCC_APB1(TIM7)  },
+	{ .TIMx = TIM7, .rcc = RCC_APB1(TIM7),   0  },
-    { .TIMx = TIM8,  .rcc = RCC_APB2(TIM8)  },
+	{ .TIMx = TIM8, .rcc = RCC_APB2(TIM8),   GPIO_AF_TIM8  },
-    { .TIMx = TIM9,  .rcc = RCC_APB2(TIM9)  },
+	{ .TIMx = TIM9, .rcc = RCC_APB2(TIM9),   GPIO_AF_TIM9  },
-    { .TIMx = TIM10, .rcc = RCC_APB2(TIM10) },
+	{ .TIMx = TIM10, .rcc = RCC_APB2(TIM10), GPIO_AF_TIM10 },
-    { .TIMx = TIM11, .rcc = RCC_APB2(TIM11) },
+	{ .TIMx = TIM11, .rcc = RCC_APB2(TIM11), GPIO_AF_TIM11 },
-    { .TIMx = TIM12, .rcc = RCC_APB1(TIM12) },
+	{ .TIMx = TIM12, .rcc = RCC_APB1(TIM12), GPIO_AF_TIM12 },
-    { .TIMx = TIM13, .rcc = RCC_APB1(TIM13) },
+	{ .TIMx = TIM13, .rcc = RCC_APB1(TIM13), GPIO_AF_TIM13 },
-    { .TIMx = TIM14, .rcc = RCC_APB1(TIM14) },
+	{ .TIMx = TIM14, .rcc = RCC_APB1(TIM14), GPIO_AF_TIM14 },
 };
 
 void TIM_SelectOCxM_NoDisable(TIM_TypeDef* TIMx, uint16_t TIM_Channel, uint16_t TIM_OCMode)

src/main/io/ledstrip.c

@@ -440,7 +440,7 @@ void updateLedCount(void)
     }
 }
 
-void reevalulateLedConfig(void)
+void reevaluateLedConfig(void)
 {
     updateLedCount();
     determineLedStripDimensions();
@@ -534,7 +534,7 @@ bool parseLedStripConfig(uint8_t ledIndex, const char *config)
         memset(ledConfig, 0, sizeof(ledConfig_t));
     }
 
-    reevalulateLedConfig();
+    reevaluateLedConfig();
 
     return ok;
 }
@@ -1095,7 +1095,7 @@ void applyDefaultLedStripConfig(ledConfig_t *ledConfigs)
     memset(ledConfigs, 0, MAX_LED_STRIP_LENGTH * sizeof(ledConfig_t));
     memcpy(ledConfigs, &defaultLedStripConfig, sizeof(defaultLedStripConfig));
 
-    reevalulateLedConfig();
+    reevaluateLedConfig();
 }
 
 void ledStripInit(ledConfig_t *ledConfigsToUse, hsvColor_t *colorsToUse)
@@ -1107,7 +1107,7 @@ void ledStripInit(ledConfig_t *ledConfigsToUse, hsvColor_t *colorsToUse)
 
 void ledStripEnable(void)
 {
-    reevalulateLedConfig();
+    reevaluateLedConfig();
     ledStripInitialised = true;
 
     ws2811LedStripInit();

src/main/io/ledstrip.h

@@ -94,4 +94,4 @@ bool parseColor(uint8_t index, const char *colorConfig);
 void applyDefaultColors(hsvColor_t *colors, uint8_t colorCount);
 
 void ledStripEnable(void);
-void reevalulateLedConfig(void);
+void reevaluateLedConfig(void);

src/main/io/serial_msp.c

@@ -1807,7 +1807,7 @@ static bool processInCommand(void)
 
             ledConfig->color = read8();
 
-            reevalulateLedConfig();
+            reevaluateLedConfig();
         }
         break;
 #endif

src/main/scheduler/scheduler_tasks.c

@@ -168,8 +168,8 @@ cfTask_t cfTasks[TASK_COUNT] = {
     [TASK_LEDSTRIP] = {
         .taskName = "LEDSTRIP",
         .taskFunc = taskLedStrip,
-        .desiredPeriod = 1000000 / 100,         // 100 Hz
+        .desiredPeriod = 1000000 / 10,         // 10 Hz
-        .staticPriority = TASK_PRIORITY_IDLE,
+        .staticPriority = TASK_PRIORITY_LOW,
     },
 #endif
 

src/main/target/ALIENFLIGHTF4/target.h

@@ -146,16 +146,10 @@
 
 // LED strip configuration using RC5 pin.
 //#define LED_STRIP
-//#define LED_STRIP_TIMER               TIM8
 
 //#define USE_LED_STRIP_ON_DMA1_CHANNEL3
-//#define WS2811_GPIO                   GPIOB
+//#define WS2811_PIN                    PB15 // TIM8_CH3
-//#define WS2811_GPIO_AHB_PERIPHERAL    RCC_AHBPeriph_GPIOB
-//#define WS2811_GPIO_AF                GPIO_AF_3
-//#define WS2811_PIN                    GPIO_Pin_15 // TIM8_CH3
-//#define WS2811_PIN_SOURCE             GPIO_PinSource15
 //#define WS2811_TIMER                  TIM8
-//#define WS2811_TIMER_APB2_PERIPHERAL  RCC_APB2Periph_TIM8
 //#define WS2811_DMA_CHANNEL            DMA1_Channel3
 //#define WS2811_IRQ                    DMA1_Channel3_IRQn
 

src/main/target/BLUEJAYF4/target.h

@@ -134,6 +134,19 @@
 #define USE_ADC
 #define VBAT_ADC_PIN           PC3
 
+#define LED_STRIP
+// LED Strip can run off Pin 6 (PB1) of the ESC outputs.
+#define WS2811_PIN                      PB1 
+#define WS2811_TIMER                    TIM3
+#define WS2811_TIMER_CHANNEL            TIM_Channel_4
+#define WS2811_DMA_HANDLER_IDENTIFER    DMA1_ST2_HANDLER
+#define WS2811_DMA_STREAM               DMA1_Stream2
+#define WS2811_DMA_FLAG                 DMA_FLAG_TCIF2
+#define WS2811_DMA_IT                   DMA_IT_TCIF2
+#define WS2811_DMA_CHANNEL              DMA_Channel_5
+#define WS2811_DMA_IRQ                  DMA1_Stream2_IRQn
+
+
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
 #define DEFAULT_RX_FEATURE FEATURE_RX_PPM

src/main/target/BLUEJAYF4/target.mk

@@ -4,5 +4,7 @@ FEATURES        += SDCARD VCP
 TARGET_SRC = \
             drivers/accgyro_spi_mpu6500.c \
             drivers/accgyro_mpu6500.c \
-            drivers/barometer_ms5611.c
+            drivers/barometer_ms5611.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f4xx.c
 

src/main/target/CC3D/target.h

@@ -97,7 +97,8 @@
 #define RSSI_ADC_PIN                 PB0
 
 #define LED_STRIP
-#define LED_STRIP_TIMER              TIM3
+#define WS2811_PIN                   PB4
+#define WS2811_TIMER                 TIM3
 #define WS2811_DMA_TC_FLAG           DMA1_FLAG_TC6
 #define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH6_HANDLER
 

src/main/target/COLIBRI_RACE/i2c_bst.c

@@ -1403,7 +1403,7 @@ static bool bstSlaveProcessWriteCommand(uint8_t bstWriteCommand)
 
                ledConfig->color = bstRead8();
 
-               reevalulateLedConfig();
+               reevaluateLedConfig();
            }
            break;
 #endif

src/main/target/COLIBRI_RACE/target.h

@@ -122,15 +122,8 @@
 #define LED_STRIP
 #define USE_COLIBTI_RACE_LED_DEFAULT_CONFIG
 
-#define LED_STRIP_TIMER                 TIM16
+#define WS2811_PIN                      PA6 // TIM16_CH1
-
-#define WS2811_GPIO                     GPIOA
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_1
-#define WS2811_PIN                      GPIO_Pin_6 // TIM16_CH1
-#define WS2811_PIN_SOURCE               GPIO_PinSource6
 #define WS2811_TIMER                    TIM16
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM16
 #define WS2811_DMA_CHANNEL              DMA1_Channel3
 #define WS2811_IRQ                      DMA1_Channel3_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC3

src/main/target/DOGE/target.h

@@ -140,15 +140,9 @@
 #define LED_STRIP
 
 // tqfp48 pin 16
-#define LED_STRIP_TIMER TIM16
 #define USE_LED_STRIP_ON_DMA1_CHANNEL3
-#define WS2811_GPIO                     GPIOA
+#define WS2811_PIN                      PA6 // TIM16_CH1
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_1
-#define WS2811_PIN                      GPIO_Pin_6 // TIM16_CH1
-#define WS2811_PIN_SOURCE               GPIO_PinSource6
 #define WS2811_TIMER                    TIM16
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM16
 #define WS2811_DMA_CHANNEL              DMA1_Channel3
 #define WS2811_IRQ                      DMA1_Channel3_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC3

src/main/target/EUSTM32F103RC/target.h

@@ -102,9 +102,6 @@
 #define RSSI_ADC_PIN                PA1
 #define EXTERNAL1_ADC_PIN           PA5
 
-//#define LED_STRIP
-#define LED_STRIP_TIMER TIM3
-
 #define SPEKTRUM_BIND
 // USART2, PA3
 #define BIND_PIN   PA3

src/main/target/FURYF3/target.h

@@ -156,16 +156,10 @@
 #define CURRENT_METER_ADC_PIN       PA2
 
 #define LED_STRIP
-#define LED_STRIP_TIMER                 TIM1
 
 #define USE_LED_STRIP_ON_DMA1_CHANNEL2
-#define WS2811_GPIO                     GPIOA
+#define WS2811_PIN                      PA8
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_6
-#define WS2811_PIN                      GPIO_Pin_8
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM1
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM1
 #define WS2811_DMA_CHANNEL              DMA1_Channel2
 #define WS2811_IRQ                      DMA1_Channel2_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2

src/main/target/LUX_RACE/target.h

@@ -95,15 +95,8 @@
 #define EXTERNAL1_ADC_PIN           PC3
 
 #define LED_STRIP
-#define LED_STRIP_TIMER                 TIM16
+#define WS2811_PIN                      PA6 // TIM16_CH1
-
-#define WS2811_GPIO                     GPIOA
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_1
-#define WS2811_PIN                      GPIO_Pin_6 // TIM16_CH1
-#define WS2811_PIN_SOURCE               GPIO_PinSource6
 #define WS2811_TIMER                    TIM16
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM16
 #define WS2811_DMA_CHANNEL              DMA1_Channel3
 #define WS2811_IRQ                      DMA1_Channel3_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC3

src/main/target/MOTOLAB/target.h

@@ -126,16 +126,10 @@
 
 #define LED_STRIP
 #if 1
-#define LED_STRIP_TIMER TIM16
 
 #define USE_LED_STRIP_ON_DMA1_CHANNEL3
-#define WS2811_GPIO                     GPIOB
+#define WS2811_PIN                      PB8 // TIM16_CH1
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOB
-#define WS2811_GPIO_AF                  GPIO_AF_1
-#define WS2811_PIN                      GPIO_Pin_8 // TIM16_CH1
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM16
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM16
 #define WS2811_DMA_CHANNEL              DMA1_Channel3
 #define WS2811_IRQ                      DMA1_Channel3_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC3

src/main/target/NAZE/target.h

@@ -155,7 +155,8 @@
 
 
 #define LED_STRIP
-#define LED_STRIP_TIMER              TIM3
+#define WS2811_TIMER                 TIM3
+#define WS2811_PIN                   PA6 
 #define WS2811_DMA_TC_FLAG           DMA1_FLAG_TC6
 #define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH6_HANDLER
 

src/main/target/OLIMEXINO/target.h

@@ -78,18 +78,12 @@
 #define USE_I2C
 #define I2C_DEVICE (I2CDEV_2)
 
-// #define SOFT_I2C // enable to test software i2c
-// #define SOFT_I2C_PB1011 // If SOFT_I2C is enabled above, need to define pinout as well (I2C1 = PB67, I2C2 = PB1011)
-// #define SOFT_I2C_PB67
-
 #define USE_ADC
 #define CURRENT_METER_ADC_PIN       PB1
 #define VBAT_ADC_PIN                PA4
 #define RSSI_ADC_PIN                PA1
 #define EXTERNAL1_ADC_PIN           PA5
 
-//#define LED_STRIP
-//#define LED_STRIP_TIMER TIM3
 
 // IO - assuming all IOs on smt32f103rb LQFP64 package
 #define TARGET_IO_PORTA 0xffff

src/main/target/OMNIBUS/target.h

@@ -166,15 +166,9 @@
 
 
 #define LED_STRIP
-#define LED_STRIP_TIMER             TIM1
 
-#define WS2811_GPIO                     GPIOA
+#define WS2811_PIN                      PA8
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_6
-#define WS2811_PIN                      GPIO_Pin_8
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM1
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM1
 #define WS2811_DMA_CHANNEL              DMA1_Channel2
 #define WS2811_IRQ                      DMA1_Channel2_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2

src/main/target/PIKOBLX/target.h

@@ -94,16 +94,10 @@
 
 #define LED_STRIP
 #if 1
-#define LED_STRIP_TIMER                 TIM16
 
 #define USE_LED_STRIP_ON_DMA1_CHANNEL3
-#define WS2811_GPIO                     GPIOB
+#define WS2811_PIN                      PB8 // TIM16_CH1
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOB
-#define WS2811_GPIO_AF                  GPIO_AF_1
-#define WS2811_PIN                      GPIO_Pin_8 // TIM16_CH1
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM16
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM16
 #define WS2811_DMA_CHANNEL              DMA1_Channel3
 #define WS2811_IRQ                      DMA1_Channel3_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC3

src/main/target/PORT103R/target.h

@@ -115,9 +115,6 @@
 #define RSSI_ADC_PIN                PA1
 #define EXTERNAL1_ADC_PIN           PA5
 
-//#define LED_STRIP
-//#define LED_STRIP_TIMER TIM3
-
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
 // IO - stm32f103RCT6 in 64pin package

src/main/target/REVO/target.h

@@ -110,8 +110,6 @@
  
 #define SENSORS_SET (SENSOR_ACC)
 
-//#define LED_STRIP
-//#define LED_STRIP_TIMER TIM5
 
 #define DEFAULT_RX_FEATURE FEATURE_RX_PPM
 #define DEFAULT_FEATURES (FEATURE_BLACKBOX | FEATURE_ONESHOT125 | FEATURE_RX_SERIAL)

src/main/target/REVONANO/target.h

@@ -85,12 +85,6 @@
 #define VBAT_ADC_PIN                PA6
 #define RSSI_ADC_PIN                PA5
 
-
-//#define SENSORS_SET (SENSOR_ACC|SENSOR_MAG)
-
-//#define LED_STRIP
-//#define LED_STRIP_TIMER TIM5
-
 #define GPS
 #define BLACKBOX
 #define TELEMETRY

src/main/target/RMDO/target.h

@@ -112,16 +112,10 @@
 #define RSSI_ADC_PIN                PB2
 
 #define LED_STRIP
-#define LED_STRIP_TIMER                 TIM1
 
 #define USE_LED_STRIP_ON_DMA1_CHANNEL2
-#define WS2811_GPIO                     GPIOA
+#define WS2811_PIN                      PA8
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_6
-#define WS2811_PIN                      GPIO_Pin_8
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM1
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM1
 #define WS2811_DMA_CHANNEL              DMA1_Channel2
 #define WS2811_IRQ                      DMA1_Channel2_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2

src/main/target/SINGULARITY/target.h

@@ -98,16 +98,10 @@
 #define VBAT_SCALE_DEFAULT          77
 
 #define LED_STRIP
-#define LED_STRIP_TIMER TIM1
 
 #define USE_LED_STRIP_ON_DMA1_CHANNEL2
-#define WS2811_GPIO                     GPIOA
+#define WS2811_PIN                      PA8
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_6
-#define WS2811_PIN                      GPIO_Pin_8
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM1
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM1
 #define WS2811_DMA_CHANNEL              DMA1_Channel2
 #define WS2811_IRQ                      DMA1_Channel2_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2

src/main/target/SPARKY/target.h

@@ -97,16 +97,9 @@
 #define LED_STRIP
 #if 1
 // LED strip configuration using PWM motor output pin 5.
-#define LED_STRIP_TIMER                 TIM16
-
 #define USE_LED_STRIP_ON_DMA1_CHANNEL3
-#define WS2811_GPIO                     GPIOA
+#define WS2811_PIN                      PA6 // TIM16_CH1
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_1
-#define WS2811_PIN                      GPIO_Pin_6 // TIM16_CH1
-#define WS2811_PIN_SOURCE               GPIO_PinSource6
 #define WS2811_TIMER                    TIM16
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM16
 #define WS2811_DMA_CHANNEL              DMA1_Channel3
 #define WS2811_IRQ                      DMA1_Channel3_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC3

src/main/target/SPRACINGF3/target.h

@@ -121,16 +121,10 @@
 #define RSSI_ADC_PIN                PB2
 
 #define LED_STRIP
-#define LED_STRIP_TIMER             TIM1
 
 #define USE_LED_STRIP_ON_DMA1_CHANNEL2
-#define WS2811_GPIO                     GPIOA
+#define WS2811_PIN                      PA8
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_6
-#define WS2811_PIN                      GPIO_Pin_8
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM1
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM1
 #define WS2811_DMA_CHANNEL              DMA1_Channel2
 #define WS2811_IRQ                      DMA1_Channel2_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2

src/main/target/SPRACINGF3EVO/target.h

@@ -142,16 +142,9 @@
 #define RSSI_ADC_PIN                PB2
 
 #define LED_STRIP
-#define LED_STRIP_TIMER                 TIM1
-
 #define USE_LED_STRIP_ON_DMA1_CHANNEL2
-#define WS2811_GPIO                     GPIOA
+#define WS2811_PIN                      PA8
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_6
-#define WS2811_PIN                      GPIO_Pin_8
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM1
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM1
 #define WS2811_DMA_CHANNEL              DMA1_Channel2
 #define WS2811_IRQ                      DMA1_Channel2_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2

src/main/target/SPRACINGF3MINI/target.h

@@ -150,15 +150,8 @@
 #define RSSI_ADC_PIN                PB2
 
 #define LED_STRIP
-#define LED_STRIP_TIMER                 TIM1
+#define WS2811_PIN                      PA8
-
-#define WS2811_GPIO                     GPIOA
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_6
-#define WS2811_PIN                      GPIO_Pin_8
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM1
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM1
 #define WS2811_DMA_CHANNEL              DMA1_Channel2
 #define WS2811_IRQ                      DMA1_Channel2_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2

src/main/target/STM32F3DISCOVERY/target.h

@@ -146,14 +146,8 @@
 #define EXTERNAL1_ADC_PIN           PC3
 
 #define LED_STRIP
-#define LED_STRIP_TIMER                 TIM16
+#define WS2811_PIN                      PB8 // TIM16_CH1
-#define WS2811_GPIO                     GPIOB
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOB
-#define WS2811_GPIO_AF                  GPIO_AF_1
-#define WS2811_PIN                      GPIO_Pin_8 // TIM16_CH1
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM16
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM16
 #define WS2811_DMA_CHANNEL              DMA1_Channel3
 #define WS2811_IRQ                      DMA1_Channel3_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC3

src/main/target/X_RACERSPI/target.h

@@ -124,16 +124,10 @@
 #define RSSI_ADC_PIN                PB2
 
 #define LED_STRIP
-#define LED_STRIP_TIMER             TIM1
 
 #define USE_LED_STRIP_ON_DMA1_CHANNEL2
-#define WS2811_GPIO                     GPIOA
+#define WS2811_PIN                      PA8
-#define WS2811_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
-#define WS2811_GPIO_AF                  GPIO_AF_6
-#define WS2811_PIN                      GPIO_Pin_8
-#define WS2811_PIN_SOURCE               GPIO_PinSource8
 #define WS2811_TIMER                    TIM1
-#define WS2811_TIMER_APB2_PERIPHERAL    RCC_APB2Periph_TIM1
 #define WS2811_DMA_CHANNEL              DMA1_Channel2
 #define WS2811_IRQ                      DMA1_Channel2_IRQn
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2