mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

98_MSwitch.pm:Update -> V3.02 small fix selftrigger

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21264 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Byte09
2020-02-24 04:44:59 +00:00
parent 6a84165d0c
commit b43d99b8de
1 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
fhem/FHEM/98_MSwitch.pm
View File

@@ -1189,22 +1189,7 @@ sub MSwitch_Set($@) {
return if $return eq "exit"; return if $return eq "exit";
} }
# nur bei funktionen in setlist !!!!
if ( AttrVal( $name, "MSwitch_Selftrigger_always", 0 ) eq "1" and $cmd ne "?" )
{
# && defined $setlist{$cmd}
my $atts = AttrVal( $name, 'setList', "" );
my @testarray = split( " ", $atts );
my %setlist;
foreach (@testarray)
{
my ($arg1,$arg2) = split( ":", $_ );
if (!defined $arg2 or $arg2 eq "") {$arg2 = "noArg"}
$setlist{$arg1} = $arg2;
}
MSwitch_Check_Event( $hash, "MSwitch_self:".$cmd.":".$args[0] ) if defined $setlist{$cmd};
}
########################## ##########################
@@ -1233,6 +1218,10 @@ sub MSwitch_Set($@) {
push @arraydynsetlist, $reading; push @arraydynsetlist, $reading;
$dynlist =join( ',', @found_devices ); $dynlist =join( ',', @found_devices );
$dynsetlist=$dynsetlist.$reading.":".$dynlist." "; $dynsetlist=$dynsetlist.$reading.":".$dynlist." ";
} }
if ($3 ne "") if ($3 ne "")
@@ -1255,6 +1244,45 @@ sub MSwitch_Set($@) {
} }
########################### ###########################
# nur bei funktionen in setlist !!!!
if ( AttrVal( $name, "MSwitch_Selftrigger_always", 0 ) eq "1" and $cmd ne "?" )
{
# && defined $setlist{$cmd}
my $atts = AttrVal( $name, 'setList', "" );
my @testarray = split( " ", $atts );
my %setlist;
foreach (@testarray)
{
my ($arg1,$arg2) = split( ":", $_ );
if (!defined $arg2 or $arg2 eq "") {$arg2 = "noArg"}
$setlist{$arg1} = $arg2;
}
MSwitch_Check_Event( $hash, "MSwitch_self:".$cmd.":".$args[0] ) if defined $setlist{$cmd};
}
if ( AttrVal( $name, "MSwitch_Selftrigger_always", 0 ) eq "1" and $cmd ne "?" )
{
# && defined $setlist{$cmd}
my %setlist;
foreach (@arraydynsetlist)
{
my ($arg1,$arg2) = split( ":", $_ );
if (!defined $arg2 or $arg2 eq "") {$arg2 = "noArg"}
$setlist{$arg1} = $arg2;
}
MSwitch_Check_Event( $hash, "MSwitch_self:".$cmd.":".$args[0] ) if defined $setlist{$cmd};
}
my %setlist; my %setlist;
if ( !defined $args[0] ) { $args[0] = ''; } if ( !defined $args[0] ) { $args[0] = ''; }