fix led strip for h7 #12890

freasy · 2023-06-16T15:44:19Z

This fixes LED STRIP function for H7

github-actions · 2023-06-16T15:44:31Z

Do you want to test this code? You can flash it directly from Betaflight Configurator:

Simply put #12890 (this pull request number) in the Select commit field of the Configurator firmware flasher tab (you need to Enable expert mode, Show release candidates and Development).

WARNING: It may be unstable. Use only for testing!

src/main/target/common_pre.h

haslinghuis

Logic needs update here also:

If we add USE_LEDSTRIP_CACHE_MGMT for H7 unconditional this code needs to be revised as the condition on line 62 will be unreachable.

betaflight/src/main/drivers/light_ws2811strip.c

Lines 50 to 67 in 70b9c7f

    
           #ifdef USE_LEDSTRIP_CACHE_MGMT 
        
           // WS2811_DMA_BUFFER_SIZE is multiples of uint32_t 
        
           // Number of bytes required for buffer 
        
           #define WS2811_DMA_BUF_BYTES              (WS2811_DMA_BUFFER_SIZE * sizeof(uint32_t)) 
        
           // Number of bytes required to cache align buffer 
        
           #define WS2811_DMA_BUF_CACHE_ALIGN_BYTES  ((WS2811_DMA_BUF_BYTES + 0x20) & ~0x1f) 
        
           // Size of array to create a cache aligned buffer 
        
           #define WS2811_DMA_BUF_CACHE_ALIGN_LENGTH (WS2811_DMA_BUF_CACHE_ALIGN_BYTES / sizeof(uint32_t)) 
        
           DMA_RW_AXI __attribute__((aligned(32))) uint32_t ledStripDMABuffer[WS2811_DMA_BUF_CACHE_ALIGN_LENGTH]; 
        
           #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 
        
           #endif

SteveCEvans

Good spot.

SteveCEvans · 2023-06-16T16:33:35Z

Tested on MATEKH743 with 24 LEDs.

freasy · 2023-06-16T17:03:58Z

Logic needs update here also:

If we add USE_LEDSTRIP_CACHE_MGMT for H7 unconditional this code needs to be revised as the condition on line 62 will be unreachable.

betaflight/src/main/drivers/light_ws2811strip.c

Lines 50 to 67 in 70b9c7f

#ifdef USE_LEDSTRIP_CACHE_MGMT

// WS2811_DMA_BUFFER_SIZE is multiples of uint32_t

// Number of bytes required for buffer

#define WS2811_DMA_BUF_BYTES (WS2811_DMA_BUFFER_SIZE * sizeof(uint32_t))

// Number of bytes required to cache align buffer

#define WS2811_DMA_BUF_CACHE_ALIGN_BYTES ((WS2811_DMA_BUF_BYTES + 0x20) & ~0x1f)

// Size of array to create a cache aligned buffer

#define WS2811_DMA_BUF_CACHE_ALIGN_LENGTH (WS2811_DMA_BUF_CACHE_ALIGN_BYTES / sizeof(uint32_t))

DMA_RW_AXI __attribute__((aligned(32))) uint32_t ledStripDMABuffer[WS2811_DMA_BUF_CACHE_ALIGN_LENGTH];

#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

#endif

What do you mean?

haslinghuis · 2023-06-16T17:09:05Z

Guess these line are no longer used:

freasy · 2023-06-16T17:18:14Z

Guess these line are no longer used:

That's true, i don't know if there is a way, this can be a error, when removed.

haslinghuis · 2023-06-16T17:28:17Z

You could check the change - or leave a note / TODO for later

freasy · 2023-06-16T17:42:51Z

You could check the change - or leave a note / TODO for later

I will test it later and/or leave a Todo.

Good find 👍

blckmn · 2023-06-16T19:17:21Z

AUTOMERGE: (FAIL)

github identifies PR as mergeable -> FAIL
assigned to a milestone -> PASS
cooling off period lapsed -> FAIL
commit count less or equal to three -> PASS
Don't merge label NOT found -> PASS
at least one RN: label found -> PASS
Tested label found -> FAIL
assigned to an approver -> FAIL
approver count at least three -> PASS

BMSThomas · 2023-06-16T23:25:16Z

G'day, no idea if I'm using GitHub correctly but @ctzsnooze reccomended I go here so here I am! Just loaded this commit to try get LEDs going on my Foxeer H743 & still having some troubles, but its working much more then it was before (before was totally random, now there some consistency). If I set the colour red, I get no LED colour. If I set green, I get a pulse of random colours, a pulse of green & then nothing. If I set Green with larson scanner I get an RGB smooth colour changing effect! It's not optimal but its consistent at least.

Also thanks so much for working on this swiftly!! Need LEDs for MultiGP IO, so really really appreciate the work!!

sugaarK · 2023-06-16T23:45:08Z

I’ll run a bunch of combos tonight.
@BMSThomas are you using the latest nightly configurator? I think that’s also part of it

freasy · 2023-06-17T06:57:53Z

G'day, no idea if I'm using GitHub correctly but @ctzsnooze reccomended I go here so here I am! Just loaded this commit to try get LEDs going on my Foxeer H743 & still having some troubles, but its working much more then it was before (before was totally random, now there some consistency). If I set the colour red, I get no LED colour. If I set green, I get a pulse of random colours, a pulse of green & then nothing. If I set Green with larson scanner I get an RGB smooth colour changing effect! It's not optimal but its consistent at least.

Also thanks so much for working on this swiftly!! Need LEDs for MultiGP IO, so really really appreciate the work!!

Which configurator version are you using?
Please try with the latest nightly again.

Also, how many LEDs are installed? Maybe too much for just USB power? Try with a lipo as well please.

sugaarK

Test on 2 setups using foxeer h7 mini.. they work as they should if you have the right configurator.. is there any reason not to resolve the contention and merge this

sugaarK · 2023-06-17T10:23:33Z

Logic needs update here also:

If we add USE_LEDSTRIP_CACHE_MGMT for H7 unconditional this code needs to be revised as the condition on line 62 will be unreachable.

betaflight/src/main/drivers/light_ws2811strip.c

Lines 50 to 67 in 70b9c7f

#ifdef USE_LEDSTRIP_CACHE_MGMT

// WS2811_DMA_BUFFER_SIZE is multiples of uint32_t

// Number of bytes required for buffer

#define WS2811_DMA_BUF_BYTES (WS2811_DMA_BUFFER_SIZE * sizeof(uint32_t))

// Number of bytes required to cache align buffer

#define WS2811_DMA_BUF_CACHE_ALIGN_BYTES ((WS2811_DMA_BUF_BYTES + 0x20) & ~0x1f)

// Size of array to create a cache aligned buffer

#define WS2811_DMA_BUF_CACHE_ALIGN_LENGTH (WS2811_DMA_BUF_CACHE_ALIGN_BYTES / sizeof(uint32_t))

DMA_RW_AXI __attribute__((aligned(32))) uint32_t ledStripDMABuffer[WS2811_DMA_BUF_CACHE_ALIGN_LENGTH];

#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

#endif

Has this been resolved? Or does it meed another PR ?

BMSThomas · 2023-06-17T22:54:49Z

Hey Guys!! Just tried Nightly build and its working perfectly now!! Thank you so much for getting this together on such short notice!! Going to finish configuring the rest of the fleet now! Cheers!!

ctzsnooze · 2023-06-17T23:34:43Z

Thanks @freasy !!

* fix led strip for h7 * account for cloud build custom defines * remove unused code

* fix led strip for h7 (#12890) * fix led strip for h7 * account for cloud build custom defines * remove unused code * Fix per review --------- Co-authored-by: Eike Ahmels <eike.ahmels@tu-dortmund.de>

* fix led strip for h7 * account for cloud build custom defines * remove unused code

fix led strip for h7

8dc9409

KarateBrot approved these changes Jun 16, 2023

View reviewed changes

KarateBrot assigned freasy Jun 16, 2023

KarateBrot added the RN: BUGFIX label Jun 16, 2023

KarateBrot added this to the 4.5 milestone Jun 16, 2023

blckmn requested changes Jun 16, 2023

View reviewed changes

src/main/target/common_pre.h Outdated Show resolved Hide resolved

haslinghuis requested changes Jun 16, 2023

View reviewed changes

SteveCEvans approved these changes Jun 16, 2023

View reviewed changes

account for cloud build custom defines

b0d50bc

blckmn approved these changes Jun 16, 2023

View reviewed changes

remove unused code

d433c7a

sugaarK approved these changes Jun 17, 2023

View reviewed changes

haslinghuis approved these changes Jun 17, 2023

View reviewed changes

haslinghuis merged commit ac84115 into betaflight:master Jun 17, 2023
20 checks passed

SteveCEvans mentioned this pull request Jul 20, 2023

STMH7 ledstrip bug #12973

Closed

haslinghuis pushed a commit to haslinghuis/betaflight that referenced this pull request Jul 20, 2023

fix led strip for h7 (betaflight#12890)

e8cbc62

* fix led strip for h7 * account for cloud build custom defines * remove unused code

haslinghuis mentioned this pull request Jul 20, 2023

fix led strip for h7 (#12890) #12976

Merged

davidbitton pushed a commit to davidbitton/betaflight that referenced this pull request Feb 5, 2024

fix led strip for h7 (betaflight#12890)

ad25902

* fix led strip for h7 * account for cloud build custom defines * remove unused code

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix led strip for h7 #12890

fix led strip for h7 #12890

freasy commented Jun 16, 2023

github-actions bot commented Jun 16, 2023

haslinghuis left a comment •

edited

SteveCEvans left a comment

SteveCEvans commented Jun 16, 2023

freasy commented Jun 16, 2023

haslinghuis commented Jun 16, 2023

freasy commented Jun 16, 2023 •

edited

haslinghuis commented Jun 16, 2023

freasy commented Jun 16, 2023

blckmn commented Jun 16, 2023

BMSThomas commented Jun 16, 2023 •

edited

sugaarK commented Jun 16, 2023

freasy commented Jun 17, 2023 •

edited

sugaarK left a comment

sugaarK commented Jun 17, 2023

BMSThomas commented Jun 17, 2023

ctzsnooze commented Jun 17, 2023

	#ifdef USE_LEDSTRIP_CACHE_MGMT
	// WS2811_DMA_BUFFER_SIZE is multiples of uint32_t
	// Number of bytes required for buffer
	#define WS2811_DMA_BUF_BYTES (WS2811_DMA_BUFFER_SIZE * sizeof(uint32_t))
	// Number of bytes required to cache align buffer
	#define WS2811_DMA_BUF_CACHE_ALIGN_BYTES ((WS2811_DMA_BUF_BYTES + 0x20) & ~0x1f)
	// Size of array to create a cache aligned buffer
	#define WS2811_DMA_BUF_CACHE_ALIGN_LENGTH (WS2811_DMA_BUF_CACHE_ALIGN_BYTES / sizeof(uint32_t))
	DMA_RW_AXI __attribute__((aligned(32))) uint32_t ledStripDMABuffer[WS2811_DMA_BUF_CACHE_ALIGN_LENGTH];
	#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
	#endif

fix led strip for h7 #12890

fix led strip for h7 #12890

Conversation

freasy commented Jun 16, 2023

github-actions bot commented Jun 16, 2023

haslinghuis left a comment • edited

Choose a reason for hiding this comment

SteveCEvans left a comment

Choose a reason for hiding this comment

SteveCEvans commented Jun 16, 2023

freasy commented Jun 16, 2023

haslinghuis commented Jun 16, 2023

freasy commented Jun 16, 2023 • edited

haslinghuis commented Jun 16, 2023

freasy commented Jun 16, 2023

blckmn commented Jun 16, 2023

BMSThomas commented Jun 16, 2023 • edited

sugaarK commented Jun 16, 2023

freasy commented Jun 17, 2023 • edited

sugaarK left a comment

Choose a reason for hiding this comment

sugaarK commented Jun 17, 2023

BMSThomas commented Jun 17, 2023

ctzsnooze commented Jun 17, 2023

haslinghuis left a comment •

edited

freasy commented Jun 16, 2023 •

edited

BMSThomas commented Jun 16, 2023 •

edited

freasy commented Jun 17, 2023 •

edited