FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

31_LightScene.pm: correctly change state if followDevices and lightSceneRestoreOnlyIfChanged is set and no device is triggered.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7868 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-02-04 12:39:49 +00:00
parent 2b18f102cb
commit 0b0b1edfba
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/31_LightScene.pm
View File

@ -529,7 +529,7 @@ LightScene_RestoreDevice($$$)
{
my($state,undef,undef) = LightScene_SaveDevice($hash,$d);
return "" if( $state eq $cmd );
return ("",0) if( $state eq $cmd );
}
my $ret;
@ -539,7 +539,7 @@ LightScene_RestoreDevice($$$)
$ret = CommandSet(undef,"$d $cmd");
}
return $ret;
return ($ret,1);
}
sub
@ -594,7 +594,7 @@ LightScene_Set($@)
@devices = @{$hash->{devices}};
}
my $first = 1;
my $count = 0;
foreach my $d (@devices) {
next if(!$defs{$d});
if($defs{$d}{INSET}) {
@ -618,8 +618,6 @@ LightScene_Set($@)
$ret .= $d .": ". $state ."\n" if( defined($FW_webArgs{room}) && $FW_webArgs{room} eq "all" ); #only if telnet
} elsif ( $cmd eq "scene" ) {
readingsSingleUpdate($hash, "state", $scene, 1 ) if( $first && !$hash->{followDevices} );
next if( !defined($hash->{SCENES}{$scene}{$d}));
my $state = $hash->{SCENES}{$scene}{$d};
@ -629,19 +627,26 @@ LightScene_Set($@)
my $r = "";
foreach my $entry (@{$state}) {
$r .= "," if( $ret );
$r .= LightScene_RestoreDevice($hash,$d,$entry) // "";
my($rr,$switched) = LightScene_RestoreDevice($hash,$d,$entry);
$count += $switched;
$r .= $rr // "";
}
$ret .= " " if( $ret );
$ret .= $r;
} else {
$ret .= " " if( $ret );
$ret .= LightScene_RestoreDevice($hash,$d,$state) // "";
my($rr,$switched) = LightScene_RestoreDevice($hash,$d,$state);
$count += $switched;
$ret .= $rr // "";
}
} else {
$ret = "Unknown argument $cmd, choose one of save scene";
}
$first = 0;
}
if( $cmd eq "scene" ) {
readingsSingleUpdate($hash, "state", $scene, 1 ) if( !$hash->{followDevices} || $count == 0 );
}
delete($hash->{INSET});