mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-01 00:19:00 +00:00
98_Heating_Control, 98_WeekdayTimer: a bug fixed when starting a WDT or a HC an trying to switch in the past.
now being able to use on-till:13:30:30 as a parameter the parameter can now be a Perlcode git-svn-id: https://svn.fhem.de/fhem/trunk@12715 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dietmar63
parent
da0a86b95d
commit
76201682df
@ -211,7 +211,7 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()}
|
||||
The parameter $NAME and $EVENT will be interpreted.
|
||||
</ul>
|
||||
<p>
|
||||
<b>Example:</b>
|
||||
<b>Examples:</b>
|
||||
<ul>
|
||||
<code>define HCB Heating_Control Bad_Heizung 12345|05:20|21 12345|05:25|comfort 17:20|21 17:25|eco</code><br>
|
||||
Mo-Fr are setting the temperature at 05:20 to 21°C, and at 05:25 to <b>comfort</b>.
|
||||
@ -236,27 +236,79 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()}
|
||||
<code>define HeizStatus2 notify Heating:. * {Heating_Control_SetAllTemps()}</code>
|
||||
<br><p>
|
||||
Some definitions without comment:
|
||||
<code>
|
||||
<pre>
|
||||
define hc WeekdayTimer WDdevice de 7|23:35|veryHigh 34|23:30|low 23:30|high 23:15|off 8|23:45|down
|
||||
define hc WeekdayTimer WDdevice de fr,$we|23:35|veryHigh 34|23:30|low 23:30|high 23:15|off 12|23:45|down
|
||||
define hc WeekdayTimer WDdevice de 20:35|veryHigh 34|14:30|low 21:30|high 21:15|off 12|23:00|down
|
||||
|
||||
define hw WeekdayTimer WDdevice de mo-so, $we|{sunrise_abs_dat($date)}|on mo-so, $we|{sunset_abs_dat($date)}|off
|
||||
define ht WeekdayTimer WDdevice de mo-so,!$we|{sunrise_abs_dat($date)}|on mo-so,!$we|{sunset_abs_dat($date)}|off
|
||||
define hh WeekdayTimer WDdevice de {sunrise_abs_dat($date)}|on {sunset_abs_dat($date)}|off
|
||||
<code><pre>
|
||||
define hc Heating_Control HeizungKueche de 7|23:35|25 34|23:30|22 23:30|16 23:15|22 8|23:45|16
|
||||
define hc Heating_Control HeizungKueche de fr,$we|23:35|25 34|23:30|22 23:30|16 23:15|22 12|23:45|16
|
||||
define hc Heating_Control HeizungKueche de 20:35|25 34|14:30|22 21:30|16 21:15|22 12|23:00|16
|
||||
|
||||
define hx WeekdayTimer WDdevice de 22:35|hi 23:00|on
|
||||
define hw Heating_Control HeizungKueche de mo-so, $we|{sunrise_abs_dat($date)}|18 mo-so, $we|{sunset_abs_dat($date)}|22
|
||||
define ht Heating_Control HeizungKueche de mo-so,!$we|{sunrise_abs_dat($date)}|18 mo-so,!$we|{sunset_abs_dat($date)}|22
|
||||
|
||||
define hh Heating_Control HeizungKueche de {sunrise_abs_dat($date)}|19 {sunset_abs_dat($date)}|21
|
||||
define hx Heating_Control HeizungKueche de 22:35|25 23:00|16
|
||||
</code></pre>
|
||||
The daylist can be given globaly for the whole WeekdayTimer:<p>
|
||||
|
||||
the list of days can be set globaly for the whole Heating_Control:<p>
|
||||
|
||||
<code><pre>
|
||||
define WD_Wohnen_an WeekdayTimer WDdevice de !$we 09:00|an 19:00|aus (bedingung($NAME, $EVENT)
|
||||
define WD_Wohnen_an WeekdayTimer WDdevice de $we 09:00|an 19:00|aus (bedingung($NAME, $EVENT)
|
||||
define WD_Wohnen_an WeekdayTimer WDdevice de 78 09:00|an 19:00|aus (bedingung($NAME, $EVENT)
|
||||
define WD_Wohnen_an WeekdayTimer WDdevice de 57 09:00|an 19:00|aus (bedingung($NAME, $EVENT)
|
||||
define WD_Wohnen_an WeekdayTimer WDdevice de fr,$we 09:00|an 19:00|aus (bedingung($NAME, $EVENT)
|
||||
define HeizungWohnen_an_wt Heating_Control HeizungWohnen de !$we 09:00|19 (heizungAnAus("Ein"))
|
||||
define HeizungWohnen_an_we Heating_Control HeizungWohnen de $we 09:00|19 (heizungAnAus("Ein"))
|
||||
define HeizungWohnen_an_we Heating_Control HeizungWohnen de 78 09:00|19 (heizungAnAus("Ein"))
|
||||
define HeizungWohnen_an_we Heating_Control HeizungWohnen de 57 09:00|19 (heizungAnAus("Ein"))
|
||||
define HeizungWohnen_an_we Heating_Control HeizungWohnen de fr,$we 09:00|19 (heizungAnAus("Ein"))
|
||||
</code></pre>
|
||||
|
||||
An example to be able to temporarily boost the temperature for one hour:
|
||||
<code><pre>
|
||||
define hc Heating_Control HeatingBath de !$we|05:00|{HC_WithBoost(23,"HeatingBath")} $we|07:00|{HC_WithBoost(23,"HeatingBath")} 23:00|{HC_WithBoost(20,"HeatingBath")}
|
||||
</code></pre>
|
||||
and using a "HeatingBath_Boost" dummy variable:
|
||||
<code><pre>
|
||||
define HeatingBath_Boost dummy
|
||||
attr HeatingBath_Boost setList state:0,23,24,25
|
||||
attr HeatingBath_Boost webCmd state
|
||||
define di_ResetBoostBath DOIF ([HeatingBath_Boost] > 0)
|
||||
({Heating_Control_SetAllTemps()}, defmod di_ResetBoostBath_Reset at +01:00:00 set HeatingBath_Boost 0)
|
||||
DOELSE
|
||||
({Heating_Control_SetAllTemps()})
|
||||
attr di_ResetBoostBath do always
|
||||
</code></pre>
|
||||
and the perl subroutine in 99_myUtils.pm (or the like)
|
||||
<code><pre>
|
||||
sub HC_BathWithBoost {
|
||||
my $numParams = @_;
|
||||
my ($degree, $boostPrefix) = @_;
|
||||
if ($numParams > 1)
|
||||
{
|
||||
my $boost = ReadingsVal($boostPrefix . "_Boost", "state", "0");
|
||||
return $boost if ($boost =~ m/^\d+$/) && ($boost > 0); # boost?
|
||||
}
|
||||
return $degree; # otherwise return given temperature
|
||||
}
|
||||
</code></pre>
|
||||
Now you can set "HeatingBath_Boost" in the web interface for a one-hour boost of 3 degrees in the bath.
|
||||
(you can trigger that using the PRESENCE function using your girlfriend's device... grin).
|
||||
|
||||
Easy to extend this with a vacation timer using another dummy variable, here <code>VacationTemp</code>.<br>
|
||||
Then you can use the command
|
||||
<code>defmod defVacationEnd at 2016-12-30T00:00:00 set VacationTemp off, {Heating_Control_SetAllTemps()}</code>
|
||||
to stop the vacation temperature before you return in january 2017 and let the appartment heat up again.
|
||||
<code><pre>
|
||||
sub HC_BathWithBoost($) {
|
||||
my $vacation = ReadingsVal("VacationTemp", "state", "unfortunately not on vacation");
|
||||
return $vacation if $vacation =~ /^(\d+|eco)$/; # set vacation temperature if given
|
||||
|
||||
my $numParams = @_;
|
||||
my ($degree, $boostPrefix) = @_;
|
||||
if ($numParams > 1)
|
||||
{
|
||||
my $boost = ReadingsVal($boostPrefix . "_Boost", "state", "0");
|
||||
return $boost if ($boost =~ m/^\d+$/) && ($boost > 0); # boost?
|
||||
}
|
||||
}
|
||||
</code></pre>
|
||||
Pray that the device does not restart during your vacation, as the <code>define defVacationEnd ... at </code> is volatile and will be lost at restart!
|
||||
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
@ -391,7 +443,7 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()}
|
||||
Die Parameter $NAME und $EVENT werden interpretiert.
|
||||
</ul>
|
||||
<p>
|
||||
<b>Beispiel:</b>
|
||||
<b>Beispiele:</b>
|
||||
<ul>
|
||||
<code>define HCW Heating_Control Bad_Heizung 12345|05:20|21 12345|05:25|comfort 17:20|21 17:25|eco</code><br>
|
||||
Mo-Fr wird die Temperatur um 05:20Uhr auf 21°C, und um 05:25Uhr auf <b>comfort</b> gesetzt.
|
||||
@ -416,8 +468,7 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()}
|
||||
<code>define HeizStatus2 notify Heizung:.* {Heating_Control_SetAllTemps()}</code>
|
||||
<br><p>
|
||||
Einige Definitionen ohne weitere Erklärung:
|
||||
<code>
|
||||
<pre>
|
||||
<code><pre>
|
||||
define hc Heating_Control HeizungKueche de 7|23:35|25 34|23:30|22 23:30|16 23:15|22 8|23:45|16
|
||||
define hc Heating_Control HeizungKueche de fr,$we|23:35|25 34|23:30|22 23:30|16 23:15|22 12|23:45|16
|
||||
define hc Heating_Control HeizungKueche de 20:35|25 34|14:30|22 21:30|16 21:15|22 12|23:00|16
|
||||
@ -437,7 +488,12 @@ sub Heating_Control_SetAllTemps() { # {Heating_Control_SetAllTemps()}
|
||||
define HeizungWohnen_an_we Heating_Control HeizungWohnen de fr,$we 09:00|19 (heizungAnAus("Ein"))
|
||||
</code></pre>
|
||||
|
||||
<p>
|
||||
es ist möglich den Parameter als Perlcode zu spezifizieren:<p>
|
||||
<code><pre>
|
||||
... 7|23:35|{getParameter(13,"this")} 7|23:36|{getParameter(14,"that")}
|
||||
</code></pre>
|
||||
ein detailiertes Beispiel ist in Heating_Control(EN) beschrieben<p>
|
||||
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
|
||||
@ -590,13 +590,15 @@ sub WeekdayTimer_SetTimer($) {
|
||||
|
||||
my ($aktIdx,$aktTime,$aktParameter,$nextTime,$nextParameter) =
|
||||
WeekdayTimer_searchAktNext($hash, time()+5);
|
||||
if(!defined $aktTime) {
|
||||
Log3 $hash, 3, "[$name] can not compute past switching time";
|
||||
}
|
||||
|
||||
readingsSingleUpdate ($hash, "nextUpdate", FmtDateTime($nextTime), 1);
|
||||
readingsSingleUpdate ($hash, "nextValue", $nextParameter, 1);
|
||||
readingsSingleUpdate ($hash, "currValue", $aktParameter, 1); # HB
|
||||
|
||||
|
||||
if ($switchInThePast) {
|
||||
if ($switchInThePast && defined $aktTime) {
|
||||
# Fensterkontakte abfragen - wenn einer im Status closed, dann Schaltung um 60 Sekunden verzögern
|
||||
if (WeekdayTimer_FensterOffen($hash, $aktParameter, $aktIdx)) {
|
||||
return;
|
||||
@ -712,7 +714,7 @@ sub WeekdayTimer_Update($) {
|
||||
# Schaltparameter ermitteln
|
||||
my $tage = $hash->{profil}{$idx}{TAGE};
|
||||
my $time = $hash->{profil}{$idx}{TIME};
|
||||
my $newParam = $hash->{profil}{$idx}{PARA};
|
||||
my $newParam = WeekdayTimer_evalAndcleanupParam($hash,$time,$hash->{profil}{$idx}{PARA});
|
||||
|
||||
#Log3 $hash, 3, "[$name] $idx ". $time . " " . $newParam . " " . join("",@$tage);
|
||||
|
||||
@ -940,13 +942,45 @@ sub WeekdayTimer_FensterOffen ($$$) {
|
||||
delete $hash->{VERZOEGRUNG_IDX} if defined($hash->{VERZOEGRUNG_IDX});
|
||||
return 0;
|
||||
}
|
||||
|
||||
################################################################################
|
||||
sub WeekdayTimer_evalAndcleanupParam($$$) {
|
||||
my ($hash,$time,$param) = @_;
|
||||
|
||||
my $name = $hash->{DEVICE} ;
|
||||
my $wdName = $hash->{NAME};
|
||||
|
||||
my $newParam = $param;
|
||||
if ($param =~ m/^{.*}$/) {
|
||||
|
||||
Log3 $hash, 4, "[$wdName] calculating dynamic param before all: ....... $newParam";
|
||||
|
||||
$newParam =~ s/\$NAME/$hash->{DEVICE}/g;
|
||||
$newParam =~ s/\$TIME/$time/g;
|
||||
Log3 $hash, 4, "[$wdName] calculating dynamic param after substitutions: $newParam";
|
||||
|
||||
$newParam = eval $newParam;
|
||||
if ($@ || not defined $newParam) {
|
||||
Log3 $hash, 1, "[$wdName] problem calculating dynamic param: ........... $param";
|
||||
Log3 $hash, 1, "[$wdName] $@";
|
||||
} else {
|
||||
Log3 $hash, 4, "[$wdName] calculating dynamic param after eval: ........ $newParam";
|
||||
}
|
||||
|
||||
}elsif($param =~ m/^\d{1,3}$/){
|
||||
$newParam = sprintf("%.1f", $param);
|
||||
}
|
||||
return $newParam;
|
||||
}
|
||||
|
||||
################################################################################
|
||||
sub WeekdayTimer_Device_Schalten($$$) {
|
||||
my ($hash, $newParam, $tage) = @_;
|
||||
|
||||
my ($command, $condition, $tageAsHash) = "";
|
||||
my $name = $hash->{NAME}; ###
|
||||
|
||||
my $name = $hash->{NAME}; ###
|
||||
my $dummy = "";
|
||||
|
||||
my $now = time();
|
||||
#modifier des Zieldevices auswaehlen
|
||||
my $setModifier = WeekdayTimer_isHeizung($hash);
|
||||
@ -957,10 +991,9 @@ sub WeekdayTimer_Device_Schalten($$$) {
|
||||
my $activeTimer = 1;
|
||||
|
||||
my $isHeating = $setModifier gt "";
|
||||
my $aktParam = ReadingsVal($hash->{DEVICE}, $setModifier, "");
|
||||
$aktParam = sprintf("%.1f", $aktParam) if ($isHeating && $aktParam =~ m/^[0-9]{1,3}$/i);
|
||||
$newParam = sprintf("%.1f", $newParam) if ($isHeating && $newParam =~ m/^[0-9]{1,3}$/i);
|
||||
|
||||
my $aktParam = WeekdayTimer_evalAndcleanupParam($hash,$dummy,ReadingsVal($hash->{DEVICE}, $setModifier, ""));
|
||||
# newParam is already processed by evalAndcleanupParam()
|
||||
|
||||
my $disabled = AttrVal($hash->{NAME}, "disable", 0);
|
||||
my $disabled_txt = $disabled ? " " : " not";
|
||||
Log3 $hash, 4, "[$name] aktParam:$aktParam newParam:$newParam - is $disabled_txt disabled";
|
||||
@ -969,7 +1002,7 @@ sub WeekdayTimer_Device_Schalten($$$) {
|
||||
if ($command && !$disabled && $activeTimer
|
||||
&& $aktParam ne $newParam
|
||||
) {
|
||||
$newParam =~ s/:/ /g;
|
||||
$newParam =~ s/:/ /;
|
||||
|
||||
my %specials = ( "%NAME" => $hash->{DEVICE}, "%EVENT" => $newParam);
|
||||
$command= EvalSpecials($command, %specials);
|
||||
@ -1058,6 +1091,9 @@ sub WeekdayTimer_SetAllParms() { # {WeekdayTimer_SetAllParms()}
|
||||
1;
|
||||
|
||||
=pod
|
||||
=item device
|
||||
=item summary sends parameter to devices at defined times
|
||||
=item summary_DE sendet Parameter an devices zu einer Liste mit festen Zeiten
|
||||
=begin html
|
||||
|
||||
<a name="WeekdayTimer"></a>
|
||||
@ -1116,6 +1152,7 @@ sub WeekdayTimer_SetAllParms() { # {WeekdayTimer_SetAllParms()}
|
||||
It is possible to define $we or !$we in daylist to easily allow weekend an holiday. $we !$we are coded as 7 8, when using a numeric daylist.<br><br>
|
||||
<u>time:</u>define the time to switch, format: HH:MM:[SS](HH in 24 hour format) or a Perlfunction like {sunrise_abs()}. Within the {} you can use the variable $date(epoch) to get the exact switchingtimes of the week. Example: {sunrise_abs_dat($date)}<br><br>
|
||||
<u>parameter:</u>the parameter to be set, using any text value like <b>on</b>, <b>off</b>, <b>dim30%</b>, <b>eco</b> or <b>comfort</b> - whatever your device understands.<br>
|
||||
If the parameter is perl code (embraced in {}), it is evaluated automatically.<br>
|
||||
</ul>
|
||||
<p>
|
||||
<ul><b>command</b><br>
|
||||
@ -1138,7 +1175,7 @@ sub WeekdayTimer_SetAllParms() { # {WeekdayTimer_SetAllParms()}
|
||||
The parameters $NAME and $EVENT will be interpreted.
|
||||
</ul>
|
||||
<p>
|
||||
<b>Example:</b>
|
||||
<b>Examples:</b>
|
||||
<ul>
|
||||
<code>define shutter WeekdayTimer bath 12345|05:20|up 12345|20:30|down</code><br>
|
||||
Mo-Fr are setting the shutter at 05:20 to <b>up</b>, and at 20:30 <b>down</b>.<p>
|
||||
@ -1151,31 +1188,38 @@ sub WeekdayTimer_SetAllParms() { # {WeekdayTimer_SetAllParms()}
|
||||
The dimmer is only set to dimXX% if the dummy variable WeAreThere is "yes"(not a real live example).<p>
|
||||
|
||||
If you want to have set all WeekdayTimer their current value (after a temperature lowering phase holidays)
|
||||
you can call the function <b>WeekdayTimer_SetParm(<"WD-device">)</b> or <b>WeekdayTimer_SetAllParms()</b>.<br>
|
||||
you can call the function <b>WeekdayTimer_SetParm("WD-device")</b> or <b>WeekdayTimer_SetAllParms()</b>.<br>
|
||||
This call can be automatically coupled to a dummy by a notify:<br>
|
||||
<code>define dummyNotify notify Dummy:. * {WeekdayTimer_SetAllTemps()}</code>
|
||||
<br><p>
|
||||
Some definitions without comment:
|
||||
<code>
|
||||
<pre>
|
||||
define hc Heating_Control HeizungKueche de 7|23:35|25 34|23:30|22 23:30|16 23:15|22 8|23:45|16
|
||||
define hc Heating_Control HeizungKueche de fr,$we|23:35|25 34|23:30|22 23:30|16 23:15|22 12|23:45|16
|
||||
define hc Heating_Control HeizungKueche de 20:35|25 34|14:30|22 21:30|16 21:15|22 12|23:00|16
|
||||
|
||||
define hw Heating_Control HeizungKueche de mo-so, $we|{sunrise_abs_dat($date)}|18 mo-so, $we|{sunset_abs_dat($date)}|22
|
||||
define ht Heating_Control HeizungKueche de mo-so,!$we|{sunrise_abs_dat($date)}|18 mo-so,!$we|{sunset_abs_dat($date)}|22
|
||||
|
||||
define hh Heating_Control HeizungKueche de {sunrise_abs_dat($date)}|19 {sunset_abs_dat($date)}|21
|
||||
define hx Heating_Control HeizungKueche de 22:35|25 23:00|16
|
||||
define wd Weekdaytimer device de 7|23:35|25 34|23:30|22 23:30|16 23:15|22 8|23:45|16
|
||||
define wd Weekdaytimer device de fr,$we|23:35|25 34|23:30|22 23:30|16 23:15|22 12|23:45|16
|
||||
define wd Weekdaytimer device de 20:35|25 34|14:30|22 21:30|16 21:15|22 12|23:00|16
|
||||
|
||||
define wd Weekdaytimer device de mo-so, $we|{sunrise_abs_dat($date)}|on mo-so, $we|{sunset_abs_dat($date)}|off
|
||||
define wd Weekdaytimer device de mo-so,!$we|{sunrise_abs_dat($date)}|aus mo-so,!$we|{sunset_abs_dat($date)}|aus
|
||||
|
||||
define wd Weekdaytimer device de {sunrise_abs_dat($date)}|19 {sunset_abs_dat($date)}|21
|
||||
define wd Weekdaytimer device de 22:35|25 23:00|16
|
||||
</code></pre>
|
||||
The daylist can be given globaly for the whole Heating_Control:<p>
|
||||
The daylist can be given globaly for the whole Weekdaytimer:<p>
|
||||
<code><pre>
|
||||
define HeizungWohnen_an_wt Heating_Control HeizungWohnen de !$we 09:00|19 (heizungAnAus("Ein"))
|
||||
define HeizungWohnen_an_we Heating_Control HeizungWohnen de $we 09:00|19 (heizungAnAus("Ein"))
|
||||
define HeizungWohnen_an_we Heating_Control HeizungWohnen de 78 09:00|19 (heizungAnAus("Ein"))
|
||||
define HeizungWohnen_an_we Heating_Control HeizungWohnen de 57 09:00|19 (heizungAnAus("Ein"))
|
||||
define HeizungWohnen_an_we Heating_Control HeizungWohnen de fr,$we 09:00|19 (heizungAnAus("Ein"))
|
||||
define wd Weekdaytimer device de !$we 09:00|19 (function("Ein"))
|
||||
define wd Weekdaytimer device de $we 09:00|19 (function("Ein"))
|
||||
define wd Weekdaytimer device de 78 09:00|19 (function("exit"))
|
||||
define wd Weekdaytimer device de 57 09:00|19 (function("exit"))
|
||||
define wd Weekdaytimer device de fr,$we 09:00|19 (function("exit"))
|
||||
</code></pre>
|
||||
|
||||
it is possible to construct the parameter as Perlcode:<p>
|
||||
<code><pre>
|
||||
... 7|23:35|{getParameter(13,"this")} 7|23:36|{getParameter(14,"that")}
|
||||
</code></pre>
|
||||
A detailed examle can be found in Heating_Control<p>
|
||||
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
@ -1239,4 +1283,4 @@ sub WeekdayTimer_SetAllParms() { # {WeekdayTimer_SetAllParms()}
|
||||
|
||||
=end html
|
||||
|
||||
=cut
|
||||
=cut
|
||||
Loading…
x
Reference in New Issue
Block a user