mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-04 05:16:45 +00:00
98_Heating_Control: last change is not workung under al circumstances - rollback
git-svn-id: https://svn.fhem.de/fhem/trunk@9401 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
a3518cb78a
commit
0adc985f25
@ -590,21 +590,21 @@ sub WeekdayTimer_Update($) {
|
|||||||
my $idx = $myHash->{MODIFIER};
|
my $idx = $myHash->{MODIFIER};
|
||||||
my $now = time();
|
my $now = time();
|
||||||
|
|
||||||
#Log3 $hash, 3, "WeekdayTimer_Update-->[$name] $idx ";
|
my $sollZeit = $myHash->{TIME};
|
||||||
|
|
||||||
# Schaltparameter ermitteln
|
# Schaltparameter ermitteln
|
||||||
my $tage = $hash->{profil}{$idx}{TAGE};
|
my $tage = $hash->{profil}{$idx}{TAGE};
|
||||||
my $time = $hash->{profil}{$idx}{TIME};
|
my $time = $hash->{profil}{$idx}{TIME};
|
||||||
my $epoch = $hash->{profil}{$idx}{EPOCH};
|
|
||||||
my $newParam = $hash->{profil}{$idx}{PARA};
|
my $newParam = $hash->{profil}{$idx}{PARA};
|
||||||
|
|
||||||
#Log3 $hash, 3, "[$name] $idx ".FmtDateTime($epoch) . " " . $newParam . " " . join("",@$tage);
|
#Log3 $hash, 3, "[$name] $idx ".FmtDateTime($epoch) . " " . $newParam . " " . join("",@$tage);
|
||||||
|
|
||||||
if ($hash->{STILLDONETIME} > $epoch ) {
|
if ($hash->{STILLDONETIME} <= $sollZeit ) {
|
||||||
|
$hash->{STILLDONETIME} = $sollZeit;
|
||||||
|
} else {
|
||||||
Log3 $hash, 3, "[$name] Timer $time overwritten by " . FmtDateTime($hash->{STILLDONETIME});
|
Log3 $hash, 3, "[$name] Timer $time overwritten by " . FmtDateTime($hash->{STILLDONETIME});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$hash->{STILLDONETIME} = $epoch;
|
|
||||||
|
|
||||||
# Fenserkontakte abfragen - wenn einer im Status closed, dann Schaltung um 60 Sekunden verzögern
|
# Fenserkontakte abfragen - wenn einer im Status closed, dann Schaltung um 60 Sekunden verzögern
|
||||||
if (WeekdayTimer_FensterOffen($hash, $newParam, $idx)) {
|
if (WeekdayTimer_FensterOffen($hash, $newParam, $idx)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user