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

98_WeekdayTimer, 98_Heating_Control:

Browse Source 
windowSensors checked in startphase

git-svn-id: https://svn.fhem.de/fhem/trunk@8538 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dietmar63 2015-05-06 21:39:07 +00:00
parent 2593467222
commit 66efd47ddf
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fhem/FHEM/98_WeekdayTimer.pm
View File

@ -154,7 +154,7 @@ sub WeekdayTimer_Define($$) {
$hash->{NAME} = $name; $hash->{NAME} = $name;
$hash->{DEVICE} = $device; $hash->{DEVICE} = $device;
$hash->{SWITCHINGTIMES} = \@switchingtimes; $hash->{SWITCHINGTIMES} = \@switchingtimes;
$attr{$name}{verbose} = 4 if ($name =~ m/^tst.*/ ); $attr{$name}{verbose} = 4 if (!defined $attr{$name}{verbose} && $name =~ m/^tst.*/ );
#$attr{$name}{verbose} = 4; #$attr{$name}{verbose} = 4;
$modules{$hash->{TYPE}}{defptr}{$hash->{NAME}} = $hash; $modules{$hash->{TYPE}}{defptr}{$hash->{NAME}} = $hash;
@ -454,7 +454,6 @@ sub WeekdayTimer_SetTimerOfDay($) {
WeekdayTimer_SetTimerForMidnightUpdate( { HASH => $hash} ); WeekdayTimer_SetTimerForMidnightUpdate( { HASH => $hash} );
} }
################################################################################ ################################################################################
sub WeekdayTimer_SetTimer($) { sub WeekdayTimer_SetTimer($) {
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@ -495,11 +494,16 @@ sub WeekdayTimer_SetTimer($) {
} }
} }
my ($aktTime,$aktParameter,$nextTime,$nextParameter) = WeekdayTimer_searchAktNext($hash, time()+5); my ($idx, $aktTime,$aktParameter,$nextTime,$nextParameter) =
WeekdayTimer_searchAktNext($hash, time()+5);
readingsSingleUpdate ($hash, "nextUpdate", FmtDateTime($nextTime), 1); readingsSingleUpdate ($hash, "nextUpdate", FmtDateTime($nextTime), 1);
readingsSingleUpdate ($hash, "nextValue", $nextParameter, 1); readingsSingleUpdate ($hash, "nextValue", $nextParameter, 1);
if ($switchInThePast) { if ($switchInThePast) {
# Fenserkontakte abfragen - wenn einer im Status closed, dann Schaltung um 60 Sekunden verzögern
if (WeekdayTimer_FensterOffen($hash, $aktParameter, $idx)) {
return;
}
WeekdayTimer_Device_Schalten($hash, $aktParameter, [7,8]); WeekdayTimer_Device_Schalten($hash, $aktParameter, [7,8]);
my $active = 1; my $active = 1;
if (defined $hash->{CONDITION}) { if (defined $hash->{CONDITION}) {
@ -529,9 +533,10 @@ sub WeekdayTimer_searchAktNext($$) {
my $relWday = $realativeWdays[$i]; my $relWday = $realativeWdays[$i];
#Log3 $hash, 3, "[$name] $i relWday $relWday $relativeDay"; #Log3 $hash, 3, "[$name] $i relWday $relWday $relativeDay";
my $idx=0;
foreach my $time (sort keys %{$hash->{helper}{SWITCHINGTIME}{$relWday}}) { foreach my $time (sort keys %{$hash->{helper}{SWITCHINGTIME}{$relWday}}) {
$idx++;
my ($stunde, $minute, $sekunde) = split (":",$time); my ($stunde, $minute, $sekunde) = split (":",$time);
my $epoch = WeekdayTimer_zeitErmitteln ($now, $stunde, $minute, $sekunde, $relativeDay); my $epoch = WeekdayTimer_zeitErmitteln ($now, $stunde, $minute, $sekunde, $relativeDay);
@ -543,7 +548,7 @@ sub WeekdayTimer_searchAktNext($$) {
$nextParameter = $hash->{helper}{SWITCHINGTIME}{$relWday}{$time}; $nextParameter = $hash->{helper}{SWITCHINGTIME}{$relWday}{$time};
Log3 $hash, 4, "[$name] akt: ".FmtDateTime($aktTime) ."(".$hash->{shortDays}{$language}[$aktTag]. ") -->> $aktParameter"; Log3 $hash, 4, "[$name] akt: ".FmtDateTime($aktTime) ."(".$hash->{shortDays}{$language}[$aktTag]. ") -->> $aktParameter";
Log3 $hash, 4, "[$name] next: ".FmtDateTime($nextTime)."(".$hash->{shortDays}{$language}[$nextTag].") -->> $nextParameter"; Log3 $hash, 4, "[$name] next: ".FmtDateTime($nextTime)."(".$hash->{shortDays}{$language}[$nextTag].") -->> $nextParameter";
return ($aktTime, $aktParameter, $nextTime, $nextParameter); return ($idx, $aktTime, $aktParameter, $nextTime, $nextParameter);
} }
$aktTag = $relWday; $aktTag = $relWday;
$aktTime = $epoch; $aktTime = $epoch;
@ -564,15 +569,16 @@ sub WeekdayTimer_Update($) {
return if (!defined($hash)); return if (!defined($hash));
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $time = $myHash->{MODIFIER}; my $idx = $myHash->{MODIFIER};
my $now = time(); my $now = time();
# Schaltparameter ermitteln # Schaltparameter ermitteln
my $tage = $hash->{profil}{$time}{TAGE}; my $tage = $hash->{profil}{$idx}{TAGE};
my $newParam = $hash->{profil}{$time}{PARA}; my $time = $hash->{profil}{$idx}{TIME};
my $newParam = $hash->{profil}{$idx}{PARA};
# 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, $time)) { if (WeekdayTimer_FensterOffen($hash, $newParam, $idx)) {
return; return;
} }