From 0bb4c1fd4ce3a85c2809b6f9e54b6863ac39c827 Mon Sep 17 00:00:00 2001 From: justme1968 Date: Sun, 26 Jan 2014 12:28:32 +0000 Subject: [PATCH] use DoTrigger directly instead of CommandTrigger git-svn-id: https://svn.fhem.de/fhem/trunk@4745 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/31_LightScene.pm | 3 ++- fhem/FHEM/33_readingsGroup.pm | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/31_LightScene.pm b/fhem/FHEM/31_LightScene.pm index 391d74f94..d097025d0 100644 --- a/fhem/FHEM/31_LightScene.pm +++ b/fhem/FHEM/31_LightScene.pm @@ -287,7 +287,8 @@ LightScene_Notify($$) my %extPage = (); (undef, undef, $value) = FW_devState($dev->{NAME}, $room, \%extPage); - CommandTrigger( "", "$name $dev->{NAME}.$reading: $value" ); + DoTrigger( "$name", "$dev->{NAME}.$reading: $value" ); + #CommandTrigger( "", "$name $dev->{NAME}.$reading: $value" ); } } diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm index 080ff2322..eb7c5b2d8 100644 --- a/fhem/FHEM/33_readingsGroup.pm +++ b/fhem/FHEM/33_readingsGroup.pm @@ -685,7 +685,8 @@ readingsGroup_Notify($$) ($txt,undef) = readingsGroup_makeLink($txt,undef,$cmd); } - CommandTrigger( "", "$name $n.i$item.item: $txt" ); + DoTrigger( "$name", "$n.i$item.item: $txt" ); + #CommandTrigger( "", "$name $n.i$item.item: $txt" ); } next; @@ -729,7 +730,8 @@ readingsGroup_Notify($$) if( $devStateIcon ) { (undef,$devStateIcon) = readingsGroup_makeLink(undef,$devStateIcon,$cmd); - CommandTrigger( "", "$name $n.$reading: $devStateIcon" ); + DoTrigger( "$name", "$n.$reading: $devStateIcon" ); + #CommandTrigger( "", "$name $n.$reading: $devStateIcon" ); next; } } @@ -739,7 +741,8 @@ readingsGroup_Notify($$) $value = "
$value
" if( $value_style ); - CommandTrigger( "", "$name $n.$reading: $value" ); + DoTrigger( "$name", "$n.$reading: $value" ); + #CommandTrigger( "", "$name $n.$reading: $value" ); } } }