FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

98_WeekdayTimer, 98_Heating_Control: a bug in the functions WeekdayTimer_SetAllParams () and Heating_Control_SetAllTemps () repaired. Now the devices are switched even if they are a heating.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7168 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dietmar63 2014-12-08 00:03:37 +00:00
parent 3375fe22f6
commit d771413c00
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/98_Heating_Control.pm
View File

@ -558,15 +558,14 @@ sub Heating_Control_Device_Schalten($$$$) {
Log3 $hash, 5, $mod."no switch of device in PERLTIMEUPDATEMODE at 00:10 o'clock";
return;
}
my $setAllTempMode = defined ($hash->{setAllTempMode});
if (defined $hash->{helper}{COMMAND} || ($nowSwitch gt "" && $aktParam ne $newParam )) {
if (!$setModifier && $secondsSinceSwitch < -60) {
if (!$setAllTempMode && !$setModifier && $secondsSinceSwitch < -60) {
Log3 $hash, 5, $mod."no switch in the yesterdays because of the devices type($hash->{DEVICE} is not a heating).";
} else {
if ($command && !$disabled) {
$newParam =~ s/:/ /g;
#$command =~ s/@/$hash->{DEVICE}/g; # übernimmt EvalSpecials()
#$command =~ s/%/$newParam/g; #
$command = SemicolonEscape($command);
my %specials= (
@ -650,7 +649,9 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()}
}
my $myHash->{HASH}=$hash;
$hash->{setAllTempMode} = 1;
Heating_Control_Update($myHash);
delete $hash->{setAllTempMode};
Log3 undef, 3, "Heating_Control_Update() for $hash->{NAME} done!";
}
Log3 undef, 3, "Heating_Control_SetAllTemps() done!";

2
fhem/FHEM/98_WeekdayTimer.pm
View File

@ -114,7 +114,9 @@ sub WeekdayTimer_SetAllParms() { # {WeekdayTimer_SetAllParms()}
}
}
my $myHash->{HASH}=$hash;
$hash->{setAllTempMode} = 1;
WeekdayTimer_Update($myHash);
delete $hash->{setAllTempMode};
Log3 undef, 3, "WeekdayTimer_Update() for $hash->{NAME} done!";
}
Log3 undef, 3, "WeekdayTimer_SetAllParms() done!";