From fad6f4456f289c3109ce3cb7bc20f1ae846673da Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 13 Jul 2024 07:25:50 +0200 Subject: [PATCH] chore: ws2812 support to comply with #5232 style (#5276) --- radio/src/boards/generic_stm32/CMakeLists.txt | 1 + radio/src/targets/horus/CMakeLists.txt | 1 + radio/src/targets/nv14/CMakeLists.txt | 1 + radio/src/targets/pl18/CMakeLists.txt | 1 - radio/src/targets/taranis/CMakeLists.txt | 11 +---------- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/radio/src/boards/generic_stm32/CMakeLists.txt b/radio/src/boards/generic_stm32/CMakeLists.txt index dccc90585..baa94c66a 100644 --- a/radio/src/boards/generic_stm32/CMakeLists.txt +++ b/radio/src/boards/generic_stm32/CMakeLists.txt @@ -31,6 +31,7 @@ set(BOARD_LIB_SRC boards/generic_stm32/analog_inputs.cpp boards/generic_stm32/switches.cpp boards/generic_stm32/bor_level.cpp + boards/generic_stm32/rgb_leds.cpp ) add_library(minimal_board_lib OBJECT EXCLUDE_FROM_ALL ${MINIMAL_BOARD_LIB_SRC}) diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index 8d7054af3..c96d83a31 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -294,6 +294,7 @@ add_library(board OBJECT EXCLUDE_FROM_ALL targets/common/arm/stm32/stm32_softserial_driver.cpp targets/common/arm/stm32/stm32_switch_driver.cpp targets/common/arm/stm32/trainer_driver.cpp + targets/common/arm/stm32/stm32_ws2812.cpp ) set(FIRMWARE_SRC ${FIRMWARE_SRC} $) diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt index ddf9e906f..cad71d028 100644 --- a/radio/src/targets/nv14/CMakeLists.txt +++ b/radio/src/targets/nv14/CMakeLists.txt @@ -135,6 +135,7 @@ add_library(board OBJECT EXCLUDE_FROM_ALL targets/common/arm/stm32/stm32_switch_driver.cpp targets/common/arm/stm32/trainer_driver.cpp targets/common/arm/stm32/vs1053b.cpp + targets/common/arm/stm32/stm32_ws2812.cpp ) set(FIRMWARE_SRC ${FIRMWARE_SRC} $) diff --git a/radio/src/targets/pl18/CMakeLists.txt b/radio/src/targets/pl18/CMakeLists.txt index 776542b38..2778bcba3 100644 --- a/radio/src/targets/pl18/CMakeLists.txt +++ b/radio/src/targets/pl18/CMakeLists.txt @@ -145,7 +145,6 @@ add_library(board OBJECT EXCLUDE_FROM_ALL targets/common/arm/stm32/trainer_driver.cpp targets/common/arm/stm32/spi_flash.cpp targets/common/arm/stm32/diskio_spi_flash.cpp - boards/generic_stm32/rgb_leds.cpp drivers/frftl.cpp ) set(FIRMWARE_SRC ${FIRMWARE_SRC} $) diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 0fb193320..fdd3ba0b6 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -7,7 +7,6 @@ option(INTERNAL_MODULE_PPM "Support for PPM internal module" OFF) option(AUTOUPDATE "Auto update internal chips from SD" OFF) option(BIND_KEY "Enable bind button" OFF) option(BLUETOOTH "FrSky BT module support" OFF) -option(WS2812 "Support for ws2812 RGB leds" OFF) set(USE_RTC_CLOCK YES) set(HARDWARE_EXTERNAL_MODULE YES) @@ -148,7 +147,6 @@ elseif(PCB STREQUAL X7) set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module") set(INTERNAL_MODULE_SERIAL YES) set(MODULE_SIZE_SML YES) - set(WS2812 YES) set(FLAVOUR t14) set(ROTARY_ENCODER YES) set(CPU_TYPE_FULL STM32F407xG) @@ -262,7 +260,6 @@ elseif(PCB STREQUAL X7) set(CPU_TYPE_FULL STM32F407xG) set(ROTARY_ENCODER YES) set(BLUETOOTH NO) - set(WS2812 YES) set(USB_CHARGER YES) set(HELI NO) add_definitions(-DRADIO_MT12) @@ -573,6 +570,7 @@ add_library(board OBJECT EXCLUDE_FROM_ALL targets/common/arm/stm32/stm32_softserial_driver.cpp targets/common/arm/stm32/stm32_switch_driver.cpp targets/common/arm/stm32/trainer_driver.cpp + targets/common/arm/stm32/stm32_ws2812.cpp ) set(FIRMWARE_SRC ${FIRMWARE_SRC} $) @@ -626,13 +624,6 @@ if(PCB STREQUAL XLITE OR PCB STREQUAL XLITES OR PCBREV STREQUAL COMMANDO8) targets/common/arm/stm32/sticks_pwm_driver.cpp) endif() -if(WS2812) - set(FIRMWARE_SRC - ${FIRMWARE_SRC} - targets/common/arm/stm32/stm32_ws2812.cpp - boards/generic_stm32/rgb_leds.cpp) -endif() - set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/common/arm/loadboot.cpp