Partially revert some WB32 specific changes (qmk#18038)

nolanseaton · Jan 23, 2023 · 798adb1 · 798adb1
1 parent 9085db9
commit 798adb1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
@@ -17,25 +17,13 @@
 #    define WS2812_PWM_CHANNEL 2 // Channel
 #endif
 #ifndef WS2812_PWM_PAL_MODE
-#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define WS2812_PWM_PAL_MODE 1 // DI Pin's alternate function value
-#    else
-#        define WS2812_PWM_PAL_MODE 2 // DI Pin's alternate function value
-#    endif
+#    define WS2812_PWM_PAL_MODE 2 // DI Pin's alternate function value
 #endif
 #ifndef WS2812_DMA_STREAM
-#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define WS2812_DMA_STREAM WB32_DMA1_STREAM1 // DMA Stream for TIMx_UP
-#    else
-#        define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP
-#    endif
+#    define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP
 #endif
 #ifndef WS2812_DMA_CHANNEL
-#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define WS2812_DMA_CHANNEL WB32_DMAC_HWHIF_TIM2_UP // DMA Channel for TIM2_UP
-#    else
-#        define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP
-#    endif
+#    define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP
 #endif
 #if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_DMAMUX_ID)
 #    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM?_UP"

diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
@@ -5,11 +5,7 @@
 
 // Define the spi your LEDs are plugged to here
 #ifndef WS2812_SPI
-#    if defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define WS2812_SPI SPIDQ
-#    else
-#        define WS2812_SPI SPID1
-#    endif
+#    define WS2812_SPI SPID1
 #endif
 
 #ifndef WS2812_SPI_MOSI_PAL_MODE
@@ -20,6 +16,10 @@
 #    define WS2812_SPI_SCK_PAL_MODE 5
 #endif
 
+#ifndef WS2812_SPI_DIVISOR
+#    define WS2812_SPI_DIVISOR 16
+#endif
+
 // Push Pull or Open Drain Configuration
 // Default Push Pull
 #ifndef WS2812_EXTERNAL_PULLUP
@@ -46,7 +46,7 @@
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_0)
 #elif WS2812_SPI_DIVISOR == 8
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1)
-#elif WS2812_SPI_DIVISOR == 16 // same as default
+#elif WS2812_SPI_DIVISOR == 16 // default
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1 | SPI_CR1_BR_0)
 #elif WS2812_SPI_DIVISOR == 32
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_2)
@@ -57,8 +57,7 @@
 #elif WS2812_SPI_DIVISOR == 256
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_BR_0)
 #else
-#    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1 | SPI_CR1_BR_0) // default
-#    define WS2812_SPI_DIVISOR 16
+#    error "Configured WS2812_SPI_DIVISOR value is not supported at this time."
 #endif
 
 // Use SPI circular buffer