Skip to content

Added Wizard Support for more Yeelight products, and workaround for music-mode reset by some of them. (Fixes: #748) #750

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

Merged
awawa-dev merged 8 commits into from
Feb 5, 2024
Merged

Added Wizard Support for more Yeelight products, and workaround for music-mode reset by some of them. (Fixes: #748) #750

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4829a30
Update LedDeviceYeelight.cpp
ratawhisk Jan 26, 2024
05d96e5
Update LedDeviceYeelight.cpp
ratawhisk Jan 26, 2024
ead4d5b
Update LedDeviceYeelight.h
ratawhisk Jan 26, 2024
8d07324
Update wizard.js
ratawhisk Jan 26, 2024
fdbf930
Update wizard.js
ratawhisk Jan 27, 2024
24ed9f1
Revert before merge
ratawhisk Jan 28, 2024
f13b3e1
Fix Yeelight
ratawhisk Jan 27, 2024
0de3c31
Add autoresume for Yeelight
ratawhisk Jan 28, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Yeelight
  • Loading branch information
@ratawhisk @awawa-dev
ratawhisk authored and awawa-dev committed Jan 28, 2024
commit f13b3e17e490469fe1930e288c157fb036d29234
23 changes: 18 additions & 5 deletions sources/leddevice/dev_net/LedDeviceYeelight.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ bool YeelightLight::setPower(bool on, YeelightLight::API_EFFECT effect, int dura
static_cast<int>(_isOn), static_cast<int>(_isInMusicMode));

// Disable music mode to get power-off command executed
setMusicMode(false);
if (!on && _isInMusicMode)
{
if (_tcpStreamSocket != nullptr)
Expand All @@ -709,7 +710,7 @@ bool YeelightLight::setPower(bool on, YeelightLight::API_EFFECT effect, int dura
}
log(2,
"setPower() rc",
"%d, isON[%d], isInMusicMode[)%d]",
"%d, isON[%d], isInMusicMode[%d]",
static_cast<int>(rc), static_cast<int>(_isOn), static_cast<int>(_isInMusicMode));

return rc;
Expand Down Expand Up @@ -928,12 +929,24 @@ bool YeelightLight::setMusicMode(bool on, const QHostAddress& hostAddress, int p
if (on)
{
paramlist << hostAddress.toString() << port;

// Music Mode is only on, if write did not fail nor quota was exceeded
if ( writeCommand( getCommand( API_METHOD_MUSIC_MODE, paramlist ) ) > -1 )
{
_isInMusicMode = on;
rc = true;
}
}

// Music Mode is only on, if write did not fail nor quota was exceeded
if (writeCommand(getCommand(API_METHOD_MUSIC_MODE, paramlist)) > -1)
else
{
_isInMusicMode = on;
auto wasInError = _isInError;
writeCommand( getCommand( API_METHOD_MUSIC_MODE, paramlist ));
if (_isInError && !wasInError)
{
Warning(_log, "Ignoring Yeelight error when turning off music mode");
_isInError = false;
}
_isInMusicMode = false;
rc = true;
}

Expand Down
2 changes: 1 addition & 1 deletion www/js/wizard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,7 @@ async function discover_yeelight_lights()

function assign_yeelight_lights()
{
var models = ['color', 'color1', 'color2', 'color4', 'stripe', 'strip1'];
var models = ['color', 'color1', 'YLDP02YL', 'YLDP02YL', 'color2', 'YLDP06YL', 'color4', 'YLDP13YL', 'color6', 'YLDP13AYL', 'colorc', "YLDP004-A", 'stripe', 'YLDD04YL', 'strip1', 'YLDD01YL', 'YLDD02YL', 'strip4', 'YLDD05YL', 'strip6', 'YLDD05YL'];

// If records are left for configuration
if (Object.keys(lights).length > 0)
Expand Down