mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-28 11:01:59 +00:00
22_HOMEMODE: v1.2.0 - remove clutter
git-svn-id: https://svn.fhem.de/fhem/trunk@15608 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
76aa0d4912
commit
49f01e07a3
@ -905,7 +905,6 @@ sub HOMEMODE_Set($@)
|
|||||||
my $time = HOMEMODE_hourMaker($value);
|
my $time = HOMEMODE_hourMaker($value);
|
||||||
CommandDelete(undef,$timer) if (IsDevice($timer));
|
CommandDelete(undef,$timer) if (IsDevice($timer));
|
||||||
CommandDefine(undef,"$timer at +$time set $name:FILTER=modeAlarm!=$amode modeAlarm $amode");
|
CommandDefine(undef,"$timer at +$time set $name:FILTER=modeAlarm!=$amode modeAlarm $amode");
|
||||||
CommandAttr(undef,"$timer room ".AttrVal($name,"HomeAtTmpRoom","")) if (AttrVal($name,"HomeAtTmpRoom",""));
|
|
||||||
CommandSet(undef,"$name:FILTER=modeAlarm!=$option modeAlarm $option");
|
CommandSet(undef,"$name:FILTER=modeAlarm!=$option modeAlarm $option");
|
||||||
}
|
}
|
||||||
elsif ($cmd eq "dnd-for-minutes")
|
elsif ($cmd eq "dnd-for-minutes")
|
||||||
@ -922,7 +921,6 @@ sub HOMEMODE_Set($@)
|
|||||||
my $time = HOMEMODE_hourMaker($option);
|
my $time = HOMEMODE_hourMaker($option);
|
||||||
CommandDelete(undef,$timer) if (IsDevice($timer));
|
CommandDelete(undef,$timer) if (IsDevice($timer));
|
||||||
CommandDefine(undef,"$timer at +$time set $name:FILTER=dnd!=off dnd off");
|
CommandDefine(undef,"$timer at +$time set $name:FILTER=dnd!=off dnd off");
|
||||||
CommandAttr(undef,"$timer room ".AttrVal($name,"HomeAtTmpRoom","")) if (AttrVal($name,"HomeAtTmpRoom",""));
|
|
||||||
CommandSet(undef,"$name:FILTER=dnd!=on dnd on");
|
CommandSet(undef,"$name:FILTER=dnd!=on dnd on");
|
||||||
}
|
}
|
||||||
elsif ($cmd eq "dnd")
|
elsif ($cmd eq "dnd")
|
||||||
@ -2794,7 +2792,6 @@ sub HOMEMODE_ContactOpenCheck($$;$$)
|
|||||||
if ($state =~ /^($opencmds|open)$/)
|
if ($state =~ /^($opencmds|open)$/)
|
||||||
{
|
{
|
||||||
CommandDefine(undef,"$timer at +$waittime $at") if ($at && !IsDevice($timer));
|
CommandDefine(undef,"$timer at +$waittime $at") if ($at && !IsDevice($timer));
|
||||||
CommandAttr(undef,"$timer room ".AttrVal($name,"HomeAtTmpRoom","")) if (AttrVal($name,"HomeAtTmpRoom","") && IsDevice($timer));
|
|
||||||
if ($retrigger > 1)
|
if ($retrigger > 1)
|
||||||
{
|
{
|
||||||
my @commands;
|
my @commands;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user