FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

98_DOIFtools.pm: add DOIF's weekday 9 to next timer

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18036 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Ellert 2018-12-23 12:36:52 +00:00
parent db35f2d999
commit 5b1ea59d7a
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- change: DOIFtools: add DOIF's weekday 9 to next timer
- feature: 34_ESPEasy: improved deepsleep support - feature: 34_ESPEasy: improved deepsleep support
- feature: 73_AutoShuttersControl: add maxBrightness for morning open - feature: 73_AutoShuttersControl: add maxBrightness for morning open
- feature: 73_AutoShuttersControl: support for shading, fix bugs - feature: 73_AutoShuttersControl: support for shading, fix bugs

23
fhem/FHEM/98_DOIFtools.pm
View File

@ -46,7 +46,7 @@ sub DOIFtools_logWrapper($);
sub DOIFtoolsCounterReset($); sub DOIFtoolsCounterReset($);
sub DOIFtoolsDeleteStatReadings; sub DOIFtoolsDeleteStatReadings;
my @DOIFtools_we = (0,0,0,0,0,0,0,0); my @DOIFtools_we = (0,0,0,0,0,0,0,0,0);
my $DOIFtoolsJSfuncEM = <<'EOF'; my $DOIFtoolsJSfuncEM = <<'EOF';
<script type="text/javascript"> <script type="text/javascript">
//functions //functions
@ -579,12 +579,12 @@ sub DOIFtools_Notify($$) {
return if( !$events ); return if( !$events );
# \@DOIFtools_we aktualisieren # \@DOIFtools_we aktualisieren
if ((",".AttrVal("global","holiday2we","").",") =~ /\,$sn\,/) { if ((",".AttrVal("global","holiday2we","").",") =~ /\,$sn\,/) {
@DOIFtools_we = (0,0,0,0,0,0,0,0); @DOIFtools_we = (0,0,0,0,0,0,0,0,0);
foreach my $item (split(",",AttrVal("global","holiday2we",""))) { foreach my $item (split(",",AttrVal("global","holiday2we",""))) {
my $val; my $val;
my $a; my $a;
my $b; my $b;
for (my $i = 0; $i < 8; $i++) { for (my $i = 0; $i < 9; $i++) {
$val = CommandGet(undef,"$item days $i"); $val = CommandGet(undef,"$item days $i");
if($val) { if($val) {
($a, $b) = ReplaceEventMap($item, [$item, $val], 0); ($a, $b) = ReplaceEventMap($item, [$item, $val], 0);
@ -789,17 +789,24 @@ sub DOIFtoolsNextTimer {
} }
my $tdays = ""; my $tdays = "";
$tdays = $tn ? DOIF_weekdays($defs{$tn},$weekd) : $weekd; $tdays = $tn ? DOIF_weekdays($defs{$tn},$weekd) : $weekd;
$tdays =~/([0-8])/; Log 1, "$tn $tdays";
Log 1, "$tn ".join("",@DOIFtools_we);
$tdays =~/([0-9])/;
return $tstr if (length($1) == 0); return $tstr if (length($1) == 0);
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($timer); my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($timer);
my $ilook = 0; my $ilook = 0;
my $we; my $we;
my $twe;
for (my $iday = $wday; $iday < 7; $iday++) { for (my $iday = $wday; $iday < 7; $iday++) {
$we = (($iday==0 || $iday==6) ? 1 : 0); $we = (($iday==0 || $iday==6) ? 1 : 0);
if(!$we) { if(!$we) {
$we = $DOIFtools_we[$ilook + 1]; $we = $DOIFtools_we[$ilook + 1];
} }
if ($tdays =~ /$iday/ or ($tdays =~ /7/ and $we) or ($tdays =~ /8/ and !$we)) { $twe = (($iday==5 || $iday==6) ? 1 : 0);
if(!$twe) {
$twe = $DOIFtools_we[$ilook + 2];
}
if ($tdays =~ /$iday/ or ($tdays =~ /7/ and $we) or ($tdays =~ /8/ and !$we) or ($tdays =~ /9/ and $twe)) {
return strftime("%d.%m.%Y %H:%M:%S",localtime($timer + $ilook * 86400)); return strftime("%d.%m.%Y %H:%M:%S",localtime($timer + $ilook * 86400));
} }
$ilook++; $ilook++;
@ -809,7 +816,11 @@ sub DOIFtoolsNextTimer {
if(!$we) { if(!$we) {
$we = $DOIFtools_we[$ilook + 1]; $we = $DOIFtools_we[$ilook + 1];
} }
if ($tdays =~ /$iday/ or ($tdays =~ /7/ and $we) or ($tdays =~ /8/ and !$we)) { $twe = (($iday==5 || $iday==6) ? 1 : 0);
if(!$twe) {
$twe = $DOIFtools_we[$ilook + 2];
}
if ($tdays =~ /$iday/ or ($tdays =~ /7/ and $we) or ($tdays =~ /8/ and !$we) or ($tdays =~ /9/ and $twe)) {
return strftime("%d.%m.%Y %H:%M:%S",localtime($timer + $ilook * 86400)); return strftime("%d.%m.%Y %H:%M:%S",localtime($timer + $ilook * 86400));
} }
$ilook++; $ilook++;