From e8cbc625ef78b94779ec17cd576990e2680c1b2d Mon Sep 17 00:00:00 2001 From: Eike Ahmels Date: Sat, 17 Jun 2023 12:36:10 +0200 Subject: [PATCH 1/2] fix led strip for h7 (#12890) * fix led strip for h7 * account for cloud build custom defines * remove unused code --- src/main/drivers/light_ws2811strip.c | 2 -- src/main/target/common_pre.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/drivers/light_ws2811strip.c b/src/main/drivers/light_ws2811strip.c index 77fa985157e..e3d5308d97d 100644 --- a/src/main/drivers/light_ws2811strip.c +++ b/src/main/drivers/light_ws2811strip.c @@ -59,8 +59,6 @@ DMA_RW_AXI __attribute__((aligned(32))) uint32_t ledStripDMABuffer[WS2811_DMA_BU #else #if defined(STM32F7) FAST_DATA_ZERO_INIT uint32_t ledStripDMABuffer[WS2811_DMA_BUFFER_SIZE]; -#elif defined(STM32H7) -DMA_RAM uint32_t ledStripDMABuffer[WS2811_DMA_BUFFER_SIZE]; #else uint32_t ledStripDMABuffer[WS2811_DMA_BUFFER_SIZE]; #endif diff --git a/src/main/target/common_pre.h b/src/main/target/common_pre.h index 801504944c5..ac38017150c 100644 --- a/src/main/target/common_pre.h +++ b/src/main/target/common_pre.h @@ -429,6 +429,9 @@ extern uint8_t _dmaram_end__; #endif // # !defined(LED_MAX_STRIP_LENGTH) #if defined(USE_LED_STRIP) +#if defined(STM32H7) && !defined(USE_LEDSTRIP_CACHE_MGMT) +#define USE_LEDSTRIP_CACHE_MGMT +#endif #define USE_LED_STRIP_STATUS_MODE #endif From 53d73b69f00a122d42859ead1cca6dd45cd4b6b8 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 26 Jul 2023 21:09:26 +0200 Subject: [PATCH 2/2] Fix per review --- src/main/target/STM32H723/target.h | 5 ++++- src/main/target/STM32H730/target.h | 4 ++++ src/main/target/STM32H750/target.h | 4 ++++ src/main/target/common_pre.h | 3 --- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/target/STM32H723/target.h b/src/main/target/STM32H723/target.h index 3283a66969f..47ae65e39a9 100644 --- a/src/main/target/STM32H723/target.h +++ b/src/main/target/STM32H723/target.h @@ -78,7 +78,6 @@ #define USE_SDCARD_SDIO #endif - #define USE_VCP #define USE_SOFTSERIAL1 @@ -92,6 +91,10 @@ #define USE_ADC +#if defined(USE_LED_STRIP) && !defined(USE_LEDSTRIP_CACHE_MGMT) +#define USE_LEDSTRIP_CACHE_MGMT +#endif + #if !defined(USE_EXST) #define USE_CUSTOM_DEFAULTS #endif diff --git a/src/main/target/STM32H730/target.h b/src/main/target/STM32H730/target.h index 8d54f3b26b7..80f43e04ac7 100644 --- a/src/main/target/STM32H730/target.h +++ b/src/main/target/STM32H730/target.h @@ -103,6 +103,10 @@ #define USE_ADC +#if defined(USE_LED_STRIP) && !defined(USE_LEDSTRIP_CACHE_MGMT) +#define USE_LEDSTRIP_CACHE_MGMT +#endif + // Provide a default so that this target builds on the build server. #if !defined(CONFIG_IN_RAM) && !defined(CONFIG_IN_SDCARD) && !defined(CONFIG_IN_EXTERNAL_FLASH) #define CONFIG_IN_RAM diff --git a/src/main/target/STM32H750/target.h b/src/main/target/STM32H750/target.h index ca656b9b2de..bc74503aaaf 100644 --- a/src/main/target/STM32H750/target.h +++ b/src/main/target/STM32H750/target.h @@ -110,6 +110,10 @@ #define USE_ADC +#if defined(USE_LED_STRIP) && !defined(USE_LEDSTRIP_CACHE_MGMT) +#define USE_LEDSTRIP_CACHE_MGMT +#endif + // Provide a default so that this target builds on the build server. #if !defined(CONFIG_IN_RAM) && !defined(CONFIG_IN_SDCARD) && !defined(CONFIG_IN_EXTERNAL_FLASH) #define CONFIG_IN_RAM diff --git a/src/main/target/common_pre.h b/src/main/target/common_pre.h index ac38017150c..801504944c5 100644 --- a/src/main/target/common_pre.h +++ b/src/main/target/common_pre.h @@ -429,9 +429,6 @@ extern uint8_t _dmaram_end__; #endif // # !defined(LED_MAX_STRIP_LENGTH) #if defined(USE_LED_STRIP) -#if defined(STM32H7) && !defined(USE_LEDSTRIP_CACHE_MGMT) -#define USE_LEDSTRIP_CACHE_MGMT -#endif #define USE_LED_STRIP_STATUS_MODE #endif