[fix] fix build with a proper config of WS2812 timer

paparazzi · May 15, 2020 · 1d54969 · 1d54969
1 parent 019beed
commit 1d54969
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/conf/modules/light_scheduler.xml b/conf/modules/light_scheduler.xml
@@ -9,6 +9,7 @@
       This module is an example of controlling several leds with the color changing continuously.
       Implementation for ChibiOS using DMA.
     </description>
+    <configure name="WS2812_TIM" value="TIM1" description="Select the timer used to control the LEDs"/>
     <define name="WS2812_NB_LEDS" value="8" description="Number of leds"/>
   </doc>
   <header>
@@ -17,6 +18,8 @@
   <init fun="light_scheduler_init()"/>
   <periodic fun="light_scheduler_periodic()" freq="8"/>
   <makefile target="ap">
+    <configure name="WS2812_TIM" default="TIM1" case="upper"/>
+    <define name="STM32_PWM_USE_$(WS2812_TIM)" cond="ifeq ($(RTOS),chibios)"/>
     <file name="light_scheduler.c"/>
     <file_arch name="light_ws2812_arch.c"/>
     <file_arch name="hal_stm32_dma.c" dir="mcu_periph" cond="ifeq ($(RTOS),chibios)"/>

diff --git a/sw/airborne/boards/apogee/chibios/v1.0/board.h b/sw/airborne/boards/apogee/chibios/v1.0/board.h
@@ -582,7 +582,6 @@
 /**
  * For WS2812
  */
-#define STM32_PWM_USE_TIM1 TRUE
 #define WS2812D1_GPIO GPIOA
 #define WS2812D1_PIN GPIO8
 #define WS2812D1_AF 1

diff --git a/sw/airborne/boards/tawaki/chibios/v1.0/tawaki.h b/sw/airborne/boards/tawaki/chibios/v1.0/tawaki.h
@@ -819,7 +819,6 @@
 /**
  * For WS2812
  */
-#define STM32_PWM_USE_TIM5 TRUE
 #define WS2812D1_GPIO GPIOA
 #define WS2812D1_PIN GPIO0
 #define WS2812D1_AF 2