Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

22_HOMEMODE: prevent to execute empty HomeCMDs, fix blocking IP check if no internet connection is available, add missing name for logging 'executed CMDs'

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20495 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2019-11-11 20:04:13 +00:00
parent 19551a9be1
commit f5f26c21b5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
FHEM/22_HOMEMODE.pm
View File

@ -16,7 +16,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use vars qw{%attr %defs %modules $FW_CSRF}; use vars qw{%attr %defs %modules $FW_CSRF};
my $HOMEMODE_version = "1.5.1"; my $HOMEMODE_version = "1.5.2";
my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night"; my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night";
my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter"; my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter";
my $HOMEMODE_UserModes = "gotosleep,awoken,asleep"; my $HOMEMODE_UserModes = "gotosleep,awoken,asleep";
@ -2355,7 +2355,7 @@ sub HOMEMODE_serializeCMD($@)
} }
$cmd = join(" ",@newcmd); $cmd = join(" ",@newcmd);
Log3 $name,5,"$name: cmdnew: $cmd"; Log3 $name,5,"$name: cmdnew: $cmd";
push @newcmds,SemicolonEscape($cmd); push @newcmds,SemicolonEscape($cmd) if ($cmd !~ /^[\t\s]*$/);
} }
my $cmd = join(";",@newcmds); my $cmd = join(";",@newcmds);
$cmd =~ s/\}\s{0,1};\s{0,1}\{/\};;\{/g; $cmd =~ s/\}\s{0,1};\s{0,1}\{/\};;\{/g;
@ -2510,7 +2510,7 @@ sub HOMEMODE_execCMDs($$;$)
Log3 $name,3,"$name: error in command: $cmd"; Log3 $name,3,"$name: error in command: $cmd";
readingsSingleUpdate($hash,"lastCMDerror","error: >$err< in CMD: $cmd",1); readingsSingleUpdate($hash,"lastCMDerror","error: >$err< in CMD: $cmd",1);
} }
Log3 $name,4,"executed CMDs: $cmd"; Log3 $name,4,"$name: executed CMDs: $cmd";
return; return;
} }
@ -3474,13 +3474,13 @@ sub HOMEMODE_setIP($)
push @commands,AttrVal($name,"HomeCMDpublic-ip-change","") if (AttrVal($name,"HomeCMDpublic-ip-change",undef)); push @commands,AttrVal($name,"HomeCMDpublic-ip-change","") if (AttrVal($name,"HomeCMDpublic-ip-change",undef));
HOMEMODE_execCMDs($hash,HOMEMODE_serializeCMD($hash,@commands)) if (@commands); HOMEMODE_execCMDs($hash,HOMEMODE_serializeCMD($hash,@commands)) if (@commands);
} }
}
if (AttrNum($name,"HomePublicIpCheckInterval",0)) if (AttrNum($name,"HomePublicIpCheckInterval",0))
{ {
my $timer = gettimeofday() + 60 * AttrNum($name,"HomePublicIpCheckInterval",0); my $timer = gettimeofday() + 60 * AttrNum($name,"HomePublicIpCheckInterval",0);
$hash->{".IP_TRIGGERTIME_NEXT"} = $timer; $hash->{".IP_TRIGGERTIME_NEXT"} = $timer;
} }
} }
}
sub HOMEMODE_ToggleDevice($$) sub HOMEMODE_ToggleDevice($$)
{ {