Skip to content

Commit 6cc5aec

Browse files
committed
Latest FastLED fixing audio bands + I2S Clockless LED Driver 1.4
Both milestone updates 🥳
1 parent 5611c7f commit 6cc5aec

3 files changed

Lines changed: 17 additions & 12 deletions

File tree

platformio.ini

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ build_flags =
5757
-D BUILD_TARGET=\"$PIOENV\"
5858
-D APP_NAME=\"MoonLight\" ; 🌙 Must only contain characters from [a-zA-Z0-9-_] as this is converted into a filename
5959
-D APP_VERSION=\"0.9.1\" ; semver compatible version string
60-
-D APP_DATE=\"20260404\" ; 🌙
60+
-D APP_DATE=\"20260406\" ; 🌙
6161

6262
-D PLATFORM_VERSION=\"pioarduino-55.03.37\" ; 🌙 make sure it matches with above plaftform
6363

@@ -224,11 +224,12 @@ build_flags =
224224
-D DRIVERS_STACK_SIZE=6144 ; psramFound() ? 4 * 1024 : 3 * 1024, 4096 is sufficient for now. Update: due to FastLED audio I had to increase to 6144 (might want to move audio to a separate task)
225225

226226
; -D FASTLED_TESTING ; causes duplicate definition of initSpiHardware(); - workaround: removed implementation in spi_hw_manager_esp32.cpp.hpp
227-
-D FASTLED_BUILD=\"20260331\"
227+
-D FASTLED_BUILD=\"20260406\"
228228
lib_deps =
229+
https://github.com/FastLED/FastLED#335a142c54124cf7e87e17db13c4a8e70bcc7dcd ; 20260406 band[0] fixed
229230
; https://github.com/FastLED/FastLED#f72b5b6a0725368f2bccd0e58c8c911e74c439a1 ; 20260405 'FL_LOGE' was not declared in this scope; did you mean 'FL_E'?
230231
; https://github.com/FastLED/FastLED#eca4af576737353e703866fa54d4c897cebb9208 ; 20260404 third party Yves link errors
231-
https://github.com/FastLED/FastLED#682179f8c6c4697c36c11c9c764f9a326ad758ce ; 20260331 ✅
232+
; https://github.com/FastLED/FastLED#682179f8c6c4697c36c11c9c764f9a326ad758ce ; 20260331 ✅
232233
; https://github.com/FastLED/FastLED#a8b45adae2becc22beb287449c89eb1ad9a3df04 ; 20260328
233234
; https://github.com/FastLED/FastLED#d80b75717af8d430e5b17fda36825661d8d4acad ; 20260327
234235
; https://github.com/ewowi/FastLED#8138a6355972c1bbfcd3a7f91219dc73a4f3e14e ; 20260319
@@ -330,7 +331,11 @@ lib_deps =
330331
; https://github.com/hpwit/I2SClocklessLedDriver.git#4548eee0ada619679216793452af730c06107a1f ; dev 20260307: setGamma arguments in rgb order, sem wait log to 500ms, small fixes
331332
; https://github.com/hpwit/I2SClocklessLedDriver.git#a411023b3f7bfad727e5b2835719af39e56f3de1 ; dev 20260318: add RGBCCT
332333
; https://github.com/hpwit/I2SClocklessLedDriver.git#01f67930a1fee95a2b33e79ec108f3fbd28f3825 ; dev 20260318: add RGBCCT + mem mgmt
333-
https://github.com/hpwit/I2SClocklessLedDriver.git#0996b637b1770e8f8efc15d01c55f512e7d36033 ; dev 20260319: add RGBCCT + mem mgmt + fixes
334+
; https://github.com/hpwit/I2SClocklessLedDriver.git#0996b637b1770e8f8efc15d01c55f512e7d36033 ; dev 20260319: add RGBCCT + mem mgmt + fixes
335+
; https://github.com/hpwit/I2SClocklessLedDriver.git#54db938cce6943f149791fb0558fecd12682959a ; dev 20260406: linting applied
336+
https://github.com/hpwit/I2SClocklessLedDriver.git#a736f5ecb1d71056521f8054295a8326908550d4 ; dev 20260406: release 1.4
337+
; https://github.com/hpwit/I2SClocklessLedDriver.git@1.4
338+
; hpwit/I2SClocklessLedDriver@1.4
334339

335340
[HP_VIRTUAL_DRIVER]
336341
build_flags =

src/MoonBase/DriverNode.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,12 @@ void DriverNode::rgbwBufferMapping(uint8_t* packetRGBChannel, uint8_t* lightsRGB
288288
green -= white;
289289
blue -= white;
290290
}
291-
packetRGBChannel[layerP.lights.header.offsetWhite] = ledsDriver.__white_map[white];
291+
packetRGBChannel[layerP.lights.header.offsetWhite] = ledsDriver.whiteMap[white];
292292
}
293293

294-
packetRGBChannel[layerP.lights.header.offsetRed] = ledsDriver.__red_map[red];
295-
packetRGBChannel[layerP.lights.header.offsetGreen] = ledsDriver.__green_map[green];
296-
packetRGBChannel[layerP.lights.header.offsetBlue] = ledsDriver.__blue_map[blue];
294+
packetRGBChannel[layerP.lights.header.offsetRed] = ledsDriver.redMap[red];
295+
packetRGBChannel[layerP.lights.header.offsetGreen] = ledsDriver.greenMap[green];
296+
packetRGBChannel[layerP.lights.header.offsetBlue] = ledsDriver.blueMap[blue];
297297
}
298298

299299
#endif // FT_MOONLIGHT

src/MoonLight/Nodes/Drivers/D_ParallelLEDDriver.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ParallelLEDDriver : public DriverNode {
5454
DriverNode::loop(); // This populates the LUT tables when needed
5555

5656
#ifndef CONFIG_IDF_TARGET_ESP32P4
57-
if (ledsDriver.total_leds > 0) ledsDriver.showPixels(WAIT);
57+
if (ledsDriver.totalLeds > 0) ledsDriver.showPixels(WAIT);
5858
#else
5959
uint8_t nrOfPins = MIN(layerP.nrOfLedPins, layerP.nrOfAssignedPins);
6060
// LUTs are accessed directly within show_parlio via extern ledsDriver
@@ -116,9 +116,9 @@ class ParallelLEDDriver : public DriverNode {
116116
#ifndef CONFIG_IDF_TARGET_ESP32P4 // Non P4: Yves driver
117117

118118
if (!initDone) {
119-
__NB_DMA_BUFFER = dmaBuffer; // __NB_DMA_BUFFER is a variable
119+
ledsDriver.nbDmaBuffer = dmaBuffer;
120120

121-
uint8_t savedBrightness = ledsDriver._brightness; //(initLed sets it to 255 and thats not what we want)
121+
uint8_t savedBrightness = ledsDriver.brightness; //(initLed sets it to 255 and thats not what we want)
122122

123123
EXT_LOGD(ML_TAG, "init Parallel LED Driver %d %d %d %d %d", layerP.lights.header.channelsPerLight, layerP.lights.header.offsetRGBW + layerP.lights.header.offsetRed, layerP.lights.header.offsetRGBW + layerP.lights.header.offsetGreen, layerP.lights.header.offsetRGBW + layerP.lights.header.offsetBlue, layerP.lights.header.offsetRGBW + layerP.lights.header.offsetWhite);
124124
ledsDriver.initled(layerP.lights.channelsD, pins, layerP.ledsPerPin, nrOfPins, layerP.lights.header.channelsPerLight, layerP.lights.header.offsetRGBW + layerP.lights.header.offsetRed, layerP.lights.header.offsetRGBW + layerP.lights.header.offsetGreen, layerP.lights.header.offsetRGBW + layerP.lights.header.offsetBlue, layerP.lights.header.offsetRGBW + layerP.lights.header.offsetWhite, layerP.lights.header.offsetRGBW + layerP.lights.header.offsetWhite2, true); // 🌙 offsetWhite2 for RGBCCT warm white
@@ -183,7 +183,7 @@ class ParallelLEDDriver : public DriverNode {
183183

184184
~ParallelLEDDriver() override {
185185
#if HP_ALL_DRIVERS
186-
EXT_LOGD(ML_TAG, "Destroy %d + 1 dma buffers", __NB_DMA_BUFFER);
186+
EXT_LOGD(ML_TAG, "Destroy %d + 1 dma buffers", dmaBuffer);
187187

188188
ledsDriver.deleteDriver();
189189

0 commit comments

Comments
 (0)