FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 12:58:13 +00:00
Code Issues Releases Wiki Activity

SetExternsions.pm: fix toggle when eventMap is used.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16568 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-04-08 09:44:42 +00:00
parent 48324ab564
commit 165ade23ef
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/SetExtensions.pm
View File

@ -60,8 +60,9 @@ SetExtensions($$@)
my $hasOn = ($list =~ m/(^| )on\b/); my $hasOn = ($list =~ m/(^| )on\b/);
my $hasOff = ($list =~ m/(^| )off\b/); my $hasOff = ($list =~ m/(^| )off\b/);
my $eventMap = AttrVal($name, "eventMap", undef);
if((!$hasOn || !$hasOff) && AttrVal($name, "eventMap", undef)) { if((!$hasOn || !$hasOff) && $eventMap) {
if(!$hasOn) { if(!$hasOn) {
my (undef,$value) = ReplaceEventMap($name, [$name, "on"], 0); my (undef,$value) = ReplaceEventMap($name, [$name, "on"], 0);
$hasOn = ($value ne "on"); $hasOn = ($value ne "on");
@ -169,6 +170,8 @@ SetExtensions($$@)
} elsif($cmd eq "toggle") { } elsif($cmd eq "toggle") {
my $value = Value($name); my $value = Value($name);
(undef,$value) = ReplaceEventMap($name, [$name, $value], 0) if($eventMap);
$value = ($1==0 ? "off" : "on") if($value =~ m/dim (\d+)/); # Forum #49391 $value = ($1==0 ? "off" : "on") if($value =~ m/dim (\d+)/); # Forum #49391
SE_DoSet($name, $value =~ m/^on/ ? "off" : "on"); SE_DoSet($name, $value =~ m/^on/ ? "off" : "on");