From d37a6b08e148f15eef0e363742d8c771a005e25f Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Tue, 8 Nov 2016 12:39:32 +0000 Subject: [PATCH] 31_LightScene.pm: added showDeviceCurrentState attribute git-svn-id: https://svn.fhem.de/fhem/trunk@12528 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/31_LightScene.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/31_LightScene.pm b/fhem/FHEM/31_LightScene.pm index 6477bdf60..51a86cf3f 100644 --- a/fhem/FHEM/31_LightScene.pm +++ b/fhem/FHEM/31_LightScene.pm @@ -29,7 +29,7 @@ sub LightScene_Initialize($) $hash->{SetFn} = "LightScene_Set"; $hash->{GetFn} = "LightScene_Get"; $hash->{AttrFn} = "LightScene_Attr"; - $hash->{AttrList} = "async_delay followDevices:1,2 lightSceneRestoreOnlyIfChanged:1,0 switchingOrder ". $readingFnAttributes; + $hash->{AttrList} = "async_delay followDevices:1,2 lightSceneRestoreOnlyIfChanged:1,0 showDeviceCurrentState:1,0 switchingOrder ". $readingFnAttributes; $hash->{FW_detailFn} = "LightScene_detailFn"; $data{FWEXT}{"/LightScene"}{FUNC} = "LightScene_CGI"; #mod @@ -113,8 +113,8 @@ LightScene_2html($) $ret .= "
".AttrVal($name, "alias", $name)."
" if( $show_heading ); $ret .= ""; - if( defined($FW_webArgs{detail}) ) { - $room = "&detail=$FW_webArgs{detail}"; + if( defined($FW_webArgs{detail}) || AttrVal($name,"showDeviceCurrentState",undef) ) { + $room = "&detail=$FW_webArgs{detail}" if( defined($FW_webArgs{detail}) ); $ret .= sprintf("", ($row&1)?"odd":"even"); #$row++; @@ -1070,6 +1070,8 @@ LightScene_editTable($) { 1 -> if no match is found state will be unchanged and a nomatch event will be triggered.
2 -> if no match is found state will be set to unknown. depending on the scene and devices state can toggle multiple times. use a watchdog if you want to handle this. +
  • showDeviceCurrentState
    + show the current state of member devices in weblink
  • switchingOrder
    space separated list of <scene>:<deviceList> items that will give a per scene order in which the devices should be switched.