frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
LordGrey 2019-07-18 22:10:05 +02:00
commit 4603d65b4f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/webconfig/js/wizard.js
View File

@ -26,6 +26,7 @@
if(withKodi) if(withKodi)
sendToKodi("stop"); sendToKodi("stop");
step = 0; step = 0;
location.reload();
} }
//rgb byte order wizard //rgb byte order wizard
@ -658,7 +659,7 @@
function getHueIPs(){ function getHueIPs(){
$('#wiz_hue_ipstate').html($.i18n('wiz_hue_searchb')); $('#wiz_hue_ipstate').html($.i18n('wiz_hue_searchb'));
$.ajax({ $.ajax({
url: 'https://www.meethue.com/api/nupnp', url: 'https://discovery.meethue.com',
crossDomain: true, crossDomain: true,
type: 'GET', type: 'GET',
timeout: 3000 timeout: 3000
@ -697,7 +698,7 @@
} }
$('#retry_bridge').off().on('click', function(){ $('#retry_bridge').off().on('click', function(){
hueIPs[0].internalipaddress = $('#ip').val(); hueIPs.push({internalipaddress : $('#ip').val()});
hueIPsinc = 0; hueIPsinc = 0;
checkHueBridge(checkBridgeResult); checkHueBridge(checkBridgeResult);
}); });

6
libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
View File

@ -446,10 +446,10 @@ int LedDevicePhilipsHue::write(const std::vector<ColorRgb> & ledValues)
else else
{ {
light.setOn(true); light.setOn(true);
// Write color if color has been changed.
light.setTransitionTime(transitionTime);
light.setColor(xy, brightnessFactor);
} }
// Write color if color has been changed.
light.setTransitionTime(transitionTime);
light.setColor(xy, brightnessFactor);
idx++; idx++;
} }