Fw1906 Support (based on 0-15) #3810

deece · 2024-03-11T03:12:22Z

This PR contains the work within #3298 by @Robert-github-com

All the hard work has been done by him, I have just rebased and squashed it.

The work-in-progress commits have been squashed to make the changes easier to review, and the patchset has been rebased on top of 0-15.

I have successfully built this and confirmed that it can drive the LED strip, and that both RGB animations & CCT control works.

blazoncek · 2024-03-11T10:26:41Z

When you have successfully tested my updates and confirm that it is working, we can proceed merging.

mathojojo · 2024-03-12T21:15:19Z

I'm trying to compile, but it fails :

`wled00/wled_server.cpp:3:10: fatal error: html_ui.h: No such file or directory

Looking for html_ui.h dependency? Check our library registry!
CLI > platformio lib search "header:html_ui.h"
Web > https://registry.platformio.org/search?q=header:html_ui.h

#include "html_ui.h"
^~~~~~~~~~~
compilation terminated.
Retrieved .pio/build/lolin_s2_mini/lib5f0/SPI/SPI.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRac.cpp.o' from cache
Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRrecv.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRsend.cpp.o' from cache
Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRtimer.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Airton.cpp.o' from cache
Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Airwell.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRutils.cpp.o' from cache
Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRtext.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Amcor.cpp.o' from cache
Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Argo.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Arris.cpp.o' from cache
Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Aiwa.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Bose.cpp.o' from cache
Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Carrier.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Coolix.cpp.o' from cache
Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Corona.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Daikin.cpp.o' from cache
Retrieved `.pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Delonghi.cpp.o' from cache
Compiling .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Denon.cpp.o
*** [.pio/build/lolin_s2_mini/src/wled_server.cpp.o] Error 1
Compiling .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Dish.cpp.o
===================================================================================================================== [FAILED] Took 2.68 seconds =====================================================================================================================

Environment Status Duration

lolin_s2_mini FAILED 00:00:02.675`

Is there something I miss ?

Thank you for your help, I would appreciate to test the FW1906 support.

deece · 2024-03-12T21:29:35Z

I'm trying to compile, but it fails :

`wled00/wled_server.cpp:3:10: fatal error: html_ui.h: No such file or directory
* Looking for html_ui.h dependency? Check our library registry!

* CLI  > platformio lib search "header:html_ui.h"

* Web  > https://registry.platformio.org/search?q=header:html_ui.h
#include "html_ui.h" ^~~~~~~~~~~ compilation terminated. Retrieved .pio/build/lolin_s2_mini/lib5f0/SPI/SPI.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRac.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRrecv.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRsend.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRtimer.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Airton.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Airwell.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRutils.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/IRtext.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Amcor.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Argo.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Arris.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Aiwa.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Bose.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Carrier.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Coolix.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Corona.cpp.o' from cache Retrieved .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Daikin.cpp.o' from cache Retrieved `.pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Delonghi.cpp.o' from cache Compiling .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Denon.cpp.o *** [.pio/build/lolin_s2_mini/src/wled_server.cpp.o] Error 1 Compiling .pio/build/lolin_s2_mini/lib0cf/IRremoteESP8266/ir_Dish.cpp.o ===================================================================================================================== [FAILED] Took 2.68 seconds =====================================================================================================================

Environment Status Duration

lolin_s2_mini FAILED 00:00:02.675`

Is there something I miss ?

Thank you for your help, I would appreciate to test the FW1906 support.

You need to build the encoded HTML first, heres how I build:

npm run build
pio run

mathojojo · 2024-03-12T21:37:44Z

You need to build the encoded HTML first, heres how I build:
npm run build
pio run

Oh, so cool.... compiled and writen into my Wemos S2 Mini !!!

Thous commands are not listed in the Compile wiki... I couldn't guess it.

Thank you @deece

mathojojo · 2024-03-12T22:03:37Z

No FW1906 listed for the Led Output settings... Is it normal? or hidden ?

version installed : WLED 0.15.0-b1 (build 2403100)

deece · 2024-03-12T22:07:02Z

No FW1906 listed for the Led Output settings... Is it normal? or hidden ?

version installed : WLED 0.15.0-b1 (build 2403100)

Please show the output of git branch; git remote -v

mathojojo · 2024-03-12T22:25:54Z

No FW1906 listed for the Led Output settings... Is it normal? or hidden ?
version installed : WLED 0.15.0-b1 (build 2403100)

Please show the output of git branch; git remote -v

In fact, I was still on Aircoookie git, 0_15 branch.
So now I removed it, and cloned your git 👍
`mathojojo@mathojojo-pc:~/GIT/WLED$ git branch

fw1906_0_15
main
mathojojo@mathojojo-pc:~/GIT/WLED$ git remote
origin
`
But now, another probelm is that 'Package version 2.1.0+sha.6bf93e9 doesn't satisfy requirements ~2.0.7 based on PackageMetadata'

deece · 2024-03-12T22:42:00Z

No FW1906 listed for the Led Output settings... Is it normal? or hidden ?
version installed : WLED 0.15.0-b1 (build 2403100)

Please show the output of git branch; git remote -v

In fact, I was still on Aircoookie git, 0_15 branch. So now I removed it, and cloned your git 👍 `mathojojo@mathojojo-pc:~/GIT/WLED$ git branch
* fw1906_0_15
  main
  mathojojo@mathojojo-pc:~/GIT/WLED$ git remote
  origin
  `
  But now, another probelm is that 'Package version 2.1.0+sha.6bf93e9 doesn't satisfy requirements ~2.0.7 based on PackageMetadata'

I just pushed a fix for that

mathojojo · 2024-03-12T22:59:20Z

Perfect, I could compile and install again. FW1906 is now in the list.
Thank you for your help @deece, I will probably start to test it tomorrow

deece · 2024-03-12T23:42:35Z

@blazoncek It kinda works, RGB is fine, but when I switch to the white channel, both WW & CW are lit, and the controls don't shift between them.

blazoncek · 2024-03-13T06:16:15Z

I just pushed a fix for that

Next time pull upstream. The fix is incorrect and will break future updates.

when I switch to the white channel, both WW & CW are lit, and the controls don't shift between them.

Please elaborate on this. Switch? How?

deece · 2024-03-13T09:20:05Z

. Switch? How?

Sorry, on the Solid effect, I turned the Value/Brightness slider down to 0, then turned the White Channel slider to the maximum.

The expected behaviour when manipulating the White Balance slider is to shift the output between the WW & CW emitters, but they instead remain constant regardless of position.

This enable it to other bus types.

Aircoookie#3298 (comment)

blazoncek · 2024-03-13T10:10:07Z

Do not force push!

mathojojo · 2024-03-13T15:25:41Z

Hello @deece, I'm actually trying to drive my FW1906 RGB+CTT strip led.

Considering that first cursor is RGB channel brightness, second cursor is White channel brightness, third cursor is White balance.
Is it expected and normal that you can have white cursor and RGB cursor both different of 0 at the same time ??

1/ Only RGB (White Channel brightness at 0)
-> Everything seems to work as expected

2/ Only White (RGB channel brigtness at 0)
-> The brightness cursor has the expected effect.
-> The White Balance doesn't work at all. I can move this cursor from extreme left to extreme right (WW to CW)... both white leds are always at the same level.

Could it be because of my Led settings ?

deece · 2024-03-14T05:18:00Z

@

Hello @deece, I'm actually trying to drive my FW1906 RGB+CTT strip led.

Considering that first cursor is RGB channel brightness, second cursor is White channel brightness, third cursor is White balance. Is it expected and normal that you can have white cursor and RGB cursor both different of 0 at the same time ??

1/ Only RGB (White Channel brightness at 0) -> Everything seems to work as expected

2/ Only White (RGB channel brigtness at 0) -> The brightness cursor has the expected effect. -> The White Balance doesn't work at all. I can move this cursor from extreme left to extreme right (WW to CW)... both white leds are always at the same level.

Could it be because of my Led settings ?

@mathojojo Could you please git checkout c74db95c1430e2998eae99996c01f8b2de5dca9a, rebuild and test from that commit? I've seen the same issue, but I've got a bunch of debug in my codebase and I'm starting to doubt my memory.

blazoncek · 2024-03-14T09:31:16Z

@deece the issue might be in this statement: PolyBus::setPixelColor(_busPtr, _iType, pix, c, co, (cctCW<<8) | cctWW);

Try rewriting it into:

PolyBus::setPixelColor(_busPtr, _iType, pix, c, co, ((uint16_t)cctCW<<8) | (uint16_t)cctWW);

deece · 2024-03-14T10:02:26Z

@deece the issue might be in this statement: PolyBus::setPixelColor(_busPtr, _iType, pix, c, co, (cctCW<<8) | cctWW);

Try rewriting it into:
PolyBus::setPixelColor(_busPtr, _iType, pix, c, co, ((uint16_t)cctCW<<8) | (uint16_t)cctWW);

Thanks, unfortunately, that didn't work.

I added some debug to calculateCCT:

    static void calculateCCT(uint32_t c, uint8_t &ww, uint8_t &cw) {
      uint8_t cct = 0; //0 - full warm white, 255 - full cold white
      uint8_t w = byte(c >> 24);1

      DEBUG_PRINT(F("calculateCCT _cct="));
      DEBUG_PRINT((int)_cct);
      DEBUG_PRINT(F(" w="));
      DEBUG_PRINTLN((int)w);

      if (_cct > -1) {
        if (_cct >= 1900)    cct = (_cct - 1900) >> 5;
        else if (_cct < 256) cct = _cct;
      } else {
        cct = (approximateKelvinFromRGB(c) - 1900) >> 5;
      }

      DEBUG_PRINT(F("revised cct="));
      DEBUG_PRINTLN((int)cct);

      #ifdef WLED_USE_IC_CCT
      ww = w;
      cw = cct;
      #else
      //0 - linear (CCT 127 = 50% warm, 50% cold), 127 - additive CCT blending (CCT 127 = 100% warm, 100% cold)
      if (cct       < _cctBlend) ww = 255;
      else ww = ((255-cct) * 255) / (255 - _cctBlend);

      if ((255-cct) < _cctBlend) cw = 255;
      else                       cw = (cct * 255) / (255 - _cctBlend);


      DEBUG_PRINT(F("Prescale ww="));
      DEBUG_PRINT((int)ww);
      DEBUG_PRINT(F(" cw="));
      DEBUG_PRINTLN((int)cw);

      ww = (w * ww) / 255; //brightness scaling
      cw = (w * cw) / 255;

      DEBUG_PRINT(F("ww="));
      DEBUG_PRINT((int)ww);
      DEBUG_PRINT(F(" cw="));
      DEBUG_PRINTLN((int)cw);
      #endif
    }

Here are the values when varying the white balance slider:
White balance in the middle:

calculateCCT _cct=-1 w=255
revised cct=145
Prescale ww=110 cw=145
ww=110 cw=145

Max warm white:

calculateCCT _cct=-1 w=255
revised cct=145
Prescale ww=110 cw=145
ww=110 cw=145

Max Cool white:

calculateCCT _cct=-1 w=255
revised cct=145
Prescale ww=110 cw=145
ww=110 cw=145

I then enabled "Calculate CCT from RGB" in the LED settings, and it behaves as expected.

Should it be forced on for RGBCCT devices?

blazoncek · 2024-03-14T10:58:42Z

No. That means that CCT value is not taken from the UI.
After you change the CCT slider in UI, _cct should reflect that (i.e. be in range of 0-255).

blazoncek · 2024-03-14T11:13:15Z

I think I found the issue. If you are using ESP32 disable double buffer and test again.

mathojojo · 2024-03-14T19:46:55Z

I will test again as soon as the issue is patched (double buffer disabled) :)

And i was curious about versions of NeoPixelBus :

2.7.6 -> New Feature to support RGB with warmer white AND cooler white LEDs (RgbwwColor & GrbcwxFeature)
2.7.7 -> Rgbww80Color (16 bits per color element, RGB with Warmer White and Cooler White)
2.7.8 (last release) -> Rgbwww support

What version of NPB is wled FW1906_0_15 relying on ? And what is RGBwww ?

Thank you for the hard work, it's cool to see the live progress here !

blazoncek · 2024-03-14T20:30:33Z

I will test again as soon as the issue is patched (double buffer disabled) :)

Patched? There is no need to patch to test.

deece · 2024-03-14T20:30:42Z

I think I found the issue. If you are using ESP32 disable double buffer and test again.

@blazoncek Good sleuthing. I disabled "Use global LED buffer:" in the config, and the strip behaves as expected, with "Calculate CCT from RGB" disabled.

deece · 2024-03-14T20:32:12Z

I will test again as soon as the issue is patched (double buffer disabled) :)

And i was curious about versions of NeoPixelBus :
* 2.7.6 -> New Feature to support RGB with warmer white AND cooler white LEDs (RgbwwColor & GrbcwxFeature)

* 2.7.7 -> Rgbww80Color (16 bits per color element, RGB with Warmer White and Cooler White)

* 2.7.8 (last release) -> Rgbwww support
What version of NPB is wled FW1906_0_15 relying on ? And what is RGBwww ?

Thank you for the hard work, it's cool to see the live progress here !

From the original PR, the required patch is Makuna/NeoPixelBus@978b62f

blazoncek · 2024-03-14T20:35:12Z

@blazoncek Good sleuthing. I disabled "Use global LED buffer:" in the config, and the strip behaves as expected, with "Calculate CCT from RGB" disabled.

The problem is that in line 1218 of FX_fcn.cpp a call BusManager::setSegmentCCT(-1); is made before show() is called.
Unfortunately that breaks CCT as the CCT value is not stored in double buffer. I'll need to revise that.

If you'd move the offending line after the show() you'd still loose per segment CCT (which was @Aircoookie 's invention).

blazoncek · 2024-03-14T20:37:25Z

In short: until double buffer can handle CCT this will remain in POC state (draft).

deece · 2024-03-14T20:38:45Z

ok, would you like me to work on that?

blazoncek · 2024-03-14T20:40:53Z

ok, would you like me to work on that?

If you feel comfortable, go ahead. I think it shouldn't be too difficult, but I may be wrong as it's been a while since I did buses.

blazoncek · 2024-03-14T20:50:51Z

Yes, it's easy. I already have it done.
Will push tomorrow after a test.

blazoncek · 2024-03-15T07:50:37Z

It is a bit more involved than I first thought.
But I think I have it sorted out.
Unfortunately since I do not have FW1906 I cannot properly test.

deece · 2024-03-15T08:06:19Z

I'm happy to test, just push or point me at a repo :)

blazoncek · 2024-03-15T10:39:36Z

While I push modifications later in the evening, try this until then:

set ABL to a rather low amperage
create 2 segments (must not overlap)
set one segment to WW and the other to CW
maximize brightness to force ABL to kick in
observe strip output. does it preserve selected CCT on segments?

mathojojo · 2024-03-16T10:17:42Z

Hello, I just removed all my WLED directory, and git cloned deece's fork again (fw1906_0_15).
I could compile without any problem.

But I don't see any difference with my previuous tests. RGB is OK, but not CCT. Moving the white channel cursor makes the leds brightness increase or decrease as expected. But moving the White Balance cursor doesn't have any effect. Both White Leds are always staying at 50%-50%.

Or should I have switched to another branch ?

- additional fix in hasWhite() & setCCT() & hasCCT()

blazoncek · 2024-03-16T11:42:48Z

@deece here you go. It took a bit more time.
I also added a few more comments to explain what's happening.

mathojojo · 2024-03-16T15:15:24Z

Ok, don't pay any attention to my last message.... I recloned again, but this time using
git checkout c74db95c1430e2998eae99996c01f8b2de5dca9a
whitch is FW1906 and not FW1906_0_15 if I understand well.

And now, I can confirm that WW and CW seems to behave as expected.

deece · 2024-03-18T11:12:05Z

@blazoncek With the latest changes, if the white balance slider is altered, no change is visible on the strip, and the slider jumps back to the middle when the mouse button is released.

This should be observable without a strip connected ;)

blazoncek · 2024-03-18T19:29:08Z

Slider fixed.

Suxsem · 2024-03-18T19:40:13Z

Just here to says that I'm very grateful for your work. My entire living room is equipped with this type of strip and it will be only for you if I will be able to use it properly. Long live WLED and its contributors!

blazoncek · 2024-03-18T19:43:15Z

You can show support/appreciation by buying me a beer. 😉

deece · 2024-03-18T21:13:46Z

Slider fixed.

Awesome, I've tested that and confirmed it works as expected, both with & without "global LED buffer".

I've verified that RGB effects work independently of the white channel, so an effect that leaves some LEDs off still shows the white channel at it's selected colour temperature.

Is there anything else you would like me to test?

blazoncek · 2024-03-19T05:16:58Z

@Robert-github-com do you have anything to add or can you test as well?

@deece you could add PWM CCT and test it alongside FW1906.

deece · 2024-03-19T05:26:44Z

@Robert-github-com do you have anything to add or can you test as well?

@deece you could add PWM CCT and test it alongside FW1906.

Ha! I just ordered these a couple of days ago: https://a.aliexpress.com/_mLlqKbc

It will take a couple of weeks though. I think I have an H801 controller floating around somewhere...

deece · 2024-03-20T03:31:36Z

@blazoncek I put a tester together on a breadboard and confirmed that PWM RGB+CCT, as well as RGBW works as expected, both with & without "global LED buffer".

deece mentioned this pull request Mar 11, 2024

Support for Fw1906 #3298

Closed

Robert and others added 3 commits March 13, 2024 20:26

Move CTT calculation from BusPwm to Bus class.

af3f27f

This enable it to other bus types.

Add FW1906 support

c74db95

Some fixes & implement recommendation from @Aircoookie

505768d

Aircoookie#3298 (comment)

deece force-pushed the fw1906_0_15 branch from 89acce6 to 505768d Compare March 13, 2024 09:46

blazoncek marked this pull request as draft March 14, 2024 20:37

Modify Bus & BusManager to accommodate digital CCT

0dcb56e

- additional fix in hasWhite() & setCCT() & hasCCT()

Fix.

7a9eff7

blazoncek added this to the 0.15.0-alpha candidate milestone Mar 19, 2024

blazoncek linked an issue Mar 19, 2024 that may be closed by this pull request

Add support for FW1906 (introduced in NeoPixelBus 2.7.6) #3277

Closed

blazoncek marked this pull request as ready for review March 19, 2024 05:17

blazoncek mentioned this pull request Mar 19, 2024

RGBW+WW support (WS2805) #3608

Closed

Merge branch '0_15' into fw1906_0_15

7809680

blazoncek merged commit dab4dc3 into Aircoookie:0_15 Mar 20, 2024
3 of 17 checks passed

deece mentioned this pull request Mar 23, 2024

Move CTT calculation from BusPwm to Bus class. #3293

Closed

Fw1906 Support (based on 0-15) #3810

Fw1906 Support (based on 0-15) #3810

Conversation

deece commented Mar 11, 2024 • edited Loading

blazoncek commented Mar 11, 2024

mathojojo commented Mar 12, 2024

deece commented Mar 12, 2024

mathojojo commented Mar 12, 2024

mathojojo commented Mar 12, 2024

deece commented Mar 12, 2024

mathojojo commented Mar 12, 2024

deece commented Mar 12, 2024

mathojojo commented Mar 12, 2024

deece commented Mar 12, 2024

blazoncek commented Mar 13, 2024

deece commented Mar 13, 2024

blazoncek commented Mar 13, 2024

mathojojo commented Mar 13, 2024

deece commented Mar 14, 2024

blazoncek commented Mar 14, 2024

deece commented Mar 14, 2024

blazoncek commented Mar 14, 2024

blazoncek commented Mar 14, 2024

mathojojo commented Mar 14, 2024

blazoncek commented Mar 14, 2024

deece commented Mar 14, 2024

deece commented Mar 14, 2024

blazoncek commented Mar 14, 2024

blazoncek commented Mar 14, 2024

deece commented Mar 14, 2024

blazoncek commented Mar 14, 2024

blazoncek commented Mar 14, 2024 • edited Loading

blazoncek commented Mar 15, 2024

deece commented Mar 15, 2024

blazoncek commented Mar 15, 2024 • edited Loading

mathojojo commented Mar 16, 2024

blazoncek commented Mar 16, 2024

mathojojo commented Mar 16, 2024

deece commented Mar 18, 2024

blazoncek commented Mar 18, 2024

Suxsem commented Mar 18, 2024

blazoncek commented Mar 18, 2024

deece commented Mar 18, 2024

blazoncek commented Mar 19, 2024

deece commented Mar 19, 2024

deece commented Mar 20, 2024

deece commented Mar 11, 2024 •

edited

Loading

blazoncek commented Mar 14, 2024 •

edited

Loading

blazoncek commented Mar 15, 2024 •

edited

Loading