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

98_DOIF.pm: new time variables $md $ymd

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13414 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2017-02-14 20:37:20 +00:00
parent 50c3bbaac5
commit 520d5358f3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/98_DOIF.pm
View File

@ -1004,9 +1004,13 @@ DOIF_CheckCond($$)
my $err=""; my $err="";
my ($seconds, $microseconds) = gettimeofday(); my ($seconds, $microseconds) = gettimeofday();
my ($sec,$min,$hour,$mday,$month,$year,$wday,$yday,$isdst) = localtime($seconds); my ($sec,$min,$hour,$mday,$month,$year,$wday,$yday,$isdst) = localtime($seconds);
$month++;
$year+=1900;
my $week=strftime ('%W', localtime($seconds)); my $week=strftime ('%W', localtime($seconds));
my $hms = sprintf("%02d:%02d:%02d", $hour, $min, $sec); my $hms = sprintf("%02d:%02d:%02d", $hour, $min, $sec);
my $hm = sprintf("%02d:%02d", $hour, $min); my $hm = sprintf("%02d:%02d", $hour, $min);
my $ymd = sprintf("%02d-%02d-%02d", $year, $month,$mday);
my $md = sprintf("%02d-%02d",$month,$mday);
my $dev; my $dev;
my $reading; my $reading;
my $internal; my $internal;
@ -1019,8 +1023,6 @@ DOIF_CheckCond($$)
if ($eventa) { if ($eventa) {
$events=join(",",@{$eventa}); $events=join(",",@{$eventa});
} }
$month++;
$year+=1900;
if (defined ($hash->{readings}{$condition})) { if (defined ($hash->{readings}{$condition})) {
foreach my $devReading (split(/ /,$hash->{readings}{$condition})) { foreach my $devReading (split(/ /,$hash->{readings}{$condition})) {
$devReading=~ s/\$DEVICE/$hash->{helper}{triggerDev}/g if ($devReading); $devReading=~ s/\$DEVICE/$hash->{helper}{triggerDev}/g if ($devReading);
@ -3405,7 +3407,7 @@ Hier passiert das nicht mehr, da die ursprünglichen Zustände cmd_1 und cmd_2 j
<dd>Perl-Variablen mit der Bedeutung [$SELF:cmd]</dd> <dd>Perl-Variablen mit der Bedeutung [$SELF:cmd]</dd>
</br> </br>
<dt>&lt;Perl-Zeitvariablen&gt;</dt> <dt>&lt;Perl-Zeitvariablen&gt;</dt>
<dd>Variablen f&uuml;r Zeit- und Datumsangaben, $sec, $min, $hour, $mday, $month, $year, $wday, $yday, $isdst, $week, $hms, $hm</dd> <dd>Variablen f&uuml;r Zeit- und Datumsangaben, $sec, $min, $hour, $mday, $month, $year, $wday, $yday, $isdst, $week, $hms, $hm, $md, $ymd</dd>
</dl> </dl>
</br> </br>
</ul> </ul>