Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_RandomTimer: add optional disableCondCmd

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20546 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Beta-User 2019-11-20 09:50:24 +00:00
parent 49b322663e
commit 86f95c3ebd
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# 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.
- feature: 98_RandomTimer: add option to change behavior
when disable cond. ends (forum #14010, msg. 970714)
- change: 70_ONKYO_AVR: deleting attribute 'model' - change: 70_ONKYO_AVR: deleting attribute 'model'
- bugfix: 98_weekprofile: time calculation for HM - bugfix: 98_weekprofile: time calculation for HM
- bugfix: 49_SSCam: FHEM crash when sending data by telegramBot Forum:#105486 - bugfix: 49_SSCam: FHEM crash when sending data by telegramBot Forum:#105486

35
fhem/FHEM/98_RandomTimer.pm
View File

@ -41,6 +41,7 @@ sub RandomTimer_Attr($$$);
sub RandomTimer_addDays ($$); sub RandomTimer_addDays ($$);
sub RandomTimer_device_switch ($); sub RandomTimer_device_switch ($);
sub RandomTimer_device_toggle ($); sub RandomTimer_device_toggle ($);
sub RandomTimer_disableDown($);
sub RandomTimer_down($); sub RandomTimer_down($);
sub RandomTimer_Exec($); sub RandomTimer_Exec($);
sub RandomTimer_getSecsToNextAbschaltTest($); sub RandomTimer_getSecsToNextAbschaltTest($);
@ -64,7 +65,7 @@ sub RandomTimer_Initialize($) {
$hash->{DefFn} = "RandomTimer_Define"; $hash->{DefFn} = "RandomTimer_Define";
$hash->{UndefFn} = "RandomTimer_Undef"; $hash->{UndefFn} = "RandomTimer_Undef";
$hash->{AttrFn} = "RandomTimer_Attr"; $hash->{AttrFn} = "RandomTimer_Attr";
$hash->{AttrList} = "onCmd offCmd switchmode disable:0,1 disableCond ". $hash->{AttrList} = "onCmd offCmd switchmode disable:0,1 disableCond disableCondCmd:none,offCmd,onCmd ".
"runonce:0,1 keepDeviceAlive:0,1 forceStoptimeSameDay:0,1 ". "runonce:0,1 keepDeviceAlive:0,1 forceStoptimeSameDay:0,1 ".
$readingFnAttributes; $readingFnAttributes;
} }
@ -203,13 +204,27 @@ sub RandomTimer_device_toggle ($) {
} }
} }
sub RandomTimer_disableDown($) {
my ($hash) = @_;
my $disableCondCmd = AttrVal($hash->{NAME}, "disableCondCmd", 0);
if ($disableCondCmd ne "none") {
Log3 $hash, 4, "[".$hash->{NAME}."]"." setting requested disableCondCmd on $hash->{DEVICE}: ";
$hash->{COMMAND} = AttrVal($hash->{NAME}, "disableCondCmd", 0) eq "onCmd" ? "on" : "off";
RandomTimer_device_switch($hash);
} else {
Log3 $hash, 4, "[".$hash->{NAME}."]"." no action requested on $hash->{DEVICE}: ";
}
}
sub RandomTimer_down($) { sub RandomTimer_down($) {
my ($hash) = @_; my ($hash) = @_;
Log3 $hash, 4, "[".$hash->{NAME}."]"." setting requested keepDeviceAlive on $hash->{DEVICE}: ";
$hash->{COMMAND} = AttrVal($hash->{NAME}, "keepDeviceAlive", 0) ? "on" : "off"; $hash->{COMMAND} = AttrVal($hash->{NAME}, "keepDeviceAlive", 0) ? "on" : "off";
RandomTimer_device_switch($hash); RandomTimer_device_switch($hash);
} }
sub RandomTimer_Exec($) { sub RandomTimer_Exec($) {
my ($myHash) = @_; my ($myHash) = @_;
@ -226,16 +241,16 @@ sub RandomTimer_Exec($) {
if ($active) { if ($active) {
# wenn temporär ausgeschaltet # wenn temporär ausgeschaltet
if ($disabled) { if ($disabled) {
Log3 $hash, 3, "[".$hash->{NAME}."]"." ending RandomTimer on $hash->{DEVICE}: " Log3 $hash, 3, "[".$hash->{NAME}."]"." disabled before stop-time , ending RandomTimer on $hash->{DEVICE}: "
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{startTime})) . " - " . strftime("%H:%M:%S(%d)",localtime($hash->{helper}{startTime})) . " - "
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{stopTime})); . strftime("%H:%M:%S(%d)",localtime($hash->{helper}{stopTime}));
RandomTimer_down($hash); RandomTimer_disableDown($hash);
RandomTimer_setActive($hash,0); RandomTimer_setActive($hash,0);
RandomTimer_setState ($hash); RandomTimer_setState ($hash);
} }
# Wenn aktiv und Abschaltzeit erreicht, dann Gerät ausschalten, Meldung ausgeben und Timer schließen # Wenn aktiv und Abschaltzeit erreicht, dann Gerät ausschalten, Meldung ausgeben und Timer schließen
if ($stopTimeReached) { if ($stopTimeReached) {
Log3 $hash, 3, "[".$hash->{NAME}."]"." ending RandomTimer on $hash->{DEVICE}: " Log3 $hash, 3, "[".$hash->{NAME}."]"." stop-time reached, ending RandomTimer on $hash->{DEVICE}: "
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{startTime})) . " - " . strftime("%H:%M:%S(%d)",localtime($hash->{helper}{startTime})) . " - "
. strftime("%H:%M:%S(%d)",localtime($hash->{helper}{stopTime})); . strftime("%H:%M:%S(%d)",localtime($hash->{helper}{stopTime}));
RandomTimer_down($hash); RandomTimer_down($hash);
@ -620,6 +635,16 @@ sub RandomTimer_GetHashIndirekt ($$) {
<ul> <ul>
<li><code>attr ZufallsTimerZ keepDeviceAlive</code></li> <li><code>attr ZufallsTimerZ keepDeviceAlive</code></li>
</ul> </ul>
</li>
<br>
<li>
<code>disableCondCmd</code><br>
In case the disable condition becomes true while a RandomTimer is already <b>running</b>, by default the same action is executed as when stoptime is reached (see keepDeviceAlive attribute). Setting the <b>disableCondCmd</b> attribute changes this as follows: "none" will lead to no action, "offCmd" means "use off command", "onCmd" will lead to execution of the "on command". Delete the attribute to get back to default behaviour.<br>
<br>
<b>Examples</b>
<ul>
<li><code>attr ZufallsTimerZ disableCondCmd offCmd</code></li>
</ul>
</li> </li>
<br> <br>
<li> <li>