diff options
| author | Nick Brassel <nick@tzarc.org> | 2020-08-25 18:58:22 +1000 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-08-29 14:30:02 -0700 |
| commit | 1de39e5632a1cc9c4541a6b62b6eb3b360ce8747 (patch) | |
| tree | 0906b266a81e2b5aac626619cefbfb09332c1692 | |
| parent | b89b2030af655132e2708cbdffd7fb1b8e1aaeb4 (diff) | |
| download | qmk_firmware-1de39e5632a1cc9c4541a6b62b6eb3b360ce8747.tar.gz qmk_firmware-1de39e5632a1cc9c4541a6b62b6eb3b360ce8747.zip | |
Define STM32_DMA_REQUIRED when using DMA-based WS2812 driver on STM32. (#10127)
| -rw-r--r-- | common_features.mk | 6 | ||||
| -rw-r--r-- | keyboards/zvecr/split_blackpill/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/zvecr/zv48/rules.mk | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/common_features.mk b/common_features.mk index 2806544f8..088db89ca 100644 --- a/common_features.mk +++ b/common_features.mk | |||
| @@ -304,6 +304,12 @@ ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes) | |||
| 304 | SRC += ws2812.c | 304 | SRC += ws2812.c |
| 305 | else | 305 | else |
| 306 | SRC += ws2812_$(strip $(WS2812_DRIVER)).c | 306 | SRC += ws2812_$(strip $(WS2812_DRIVER)).c |
| 307 | |||
| 308 | ifeq ($(strip $(PLATFORM)), CHIBIOS) | ||
| 309 | ifeq ($(strip $(WS2812_DRIVER)), pwm) | ||
| 310 | OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE | ||
| 311 | endif | ||
| 312 | endif | ||
| 307 | endif | 313 | endif |
| 308 | 314 | ||
| 309 | # add extra deps | 315 | # add extra deps |
diff --git a/keyboards/zvecr/split_blackpill/rules.mk b/keyboards/zvecr/split_blackpill/rules.mk index 151ed15d8..6feec7dd9 100644 --- a/keyboards/zvecr/split_blackpill/rules.mk +++ b/keyboards/zvecr/split_blackpill/rules.mk | |||
| @@ -31,6 +31,5 @@ FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | |||
| 31 | SPLIT_KEYBOARD = yes | 31 | SPLIT_KEYBOARD = yes |
| 32 | SERIAL_DRIVER = usart | 32 | SERIAL_DRIVER = usart |
| 33 | WS2812_DRIVER = pwm | 33 | WS2812_DRIVER = pwm |
| 34 | OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE | ||
| 35 | 34 | ||
| 36 | LAYOUTS = ortho_4x12 | 35 | LAYOUTS = ortho_4x12 |
diff --git a/keyboards/zvecr/zv48/rules.mk b/keyboards/zvecr/zv48/rules.mk index 41ec506e6..d725f9cb1 100644 --- a/keyboards/zvecr/zv48/rules.mk +++ b/keyboards/zvecr/zv48/rules.mk | |||
| @@ -22,7 +22,6 @@ FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | |||
| 22 | SPLIT_KEYBOARD = yes | 22 | SPLIT_KEYBOARD = yes |
| 23 | SERIAL_DRIVER = usart | 23 | SERIAL_DRIVER = usart |
| 24 | WS2812_DRIVER = pwm | 24 | WS2812_DRIVER = pwm |
| 25 | OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE | ||
| 26 | 25 | ||
| 27 | DEFAULT_FOLDER = zvecr/zv48/f401 | 26 | DEFAULT_FOLDER = zvecr/zv48/f401 |
| 28 | 27 | ||
