Skip to content

FastLED based output #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 14 commits into
base: mdev
Choose a base branch
from
Draft

FastLED based output #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2ec9d24
AutoPlaylist - prevent swapping playlist after silence ended when Sus…
netmindz Apr 17, 2024
c3503f7
Start adding FastLED output
netmindz May 2, 2024
86acbec
Start adding FastLED output
netmindz May 8, 2024
fe86b60
Start adding FastLED output
netmindz May 8, 2024
47b267b
Borrow FastLED.addLeds from StartModLEDs
netmindz May 27, 2024
ea7bddc
WiP on FastLED output
netmindz May 27, 2024
9448f16
Call FastLED.show once for all buses
netmindz May 29, 2024
0653727
Fix saving of pin config for FastLED
netmindz May 29, 2024
7154aee
Multiple pin FastLED
netmindz May 29, 2024
e3a3d58
Merge branch 'mdev' into pr/134
softhack007 Jun 5, 2024
454a7d2
fastLED integration improvements
softhack007 Jun 5, 2024
acc7c2e
move fastled include into busmanager.cpp
softhack007 Jun 6, 2024
c2f27a8
fix for preview when using FastLED
softhack007 Jun 6, 2024
ac51274
make brightness limiter work with fastLED
softhack007 Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions wled00/FX_fcn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1870,6 +1870,7 @@ void WS2812FX::estimateCurrentAndLimitBri() {
return;
}

bool isFastLED = busses.hasFastLED; // if one bus is FastLED, then we can't have any NeoPixel busses (RMT driver conflict)
uint16_t pLen = getLengthPhysical();
uint32_t puPerMilliamp = 195075 / actualMilliampsPerLed;
uint32_t powerBudget = (ablMilliampsMax - MA_FOR_ESP) * puPerMilliamp; //100mA for ESP power
Expand All @@ -1889,6 +1890,12 @@ void WS2812FX::estimateCurrentAndLimitBri() {
for (uint_fast16_t i = 0; i < len; i++) { //sum up the usage of each LED
uint32_t c = bus->getPixelColor(i);
byte r = R(c), g = G(c), b = B(c), w = W(c);
if (isFastLED) {
r = scale8(r, _brightness);
g = scale8(g, _brightness);
b = scale8(b, _brightness);
w = 0;
}

if(useWackyWS2815PowerModel) { //ignore white component on WS2815 power calculation
busPowerSum += (max(max(r,g),b)) * 3; // WLEDMM use native min/max
Expand Down
Loading