FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

RandomTimer

Browse Source 
state is now on,  when  the active time is running

git-svn-id: https://svn.fhem.de/fhem/trunk@6187 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dietmar63 2014-06-30 21:15:20 +00:00
parent 4c00c292b3
commit 2bf5aadc24
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fhem/FHEM/98_RandomTimer.pm
View File

@ -34,6 +34,7 @@ use Time::Local 'timelocal_nocheck';
sub RandomTimer_stopTimeReached($);
sub schaltZeitenErmitteln ($$);
sub RandomTimer_setState($);
sub RandomTimer_Initialize($)
{
@ -126,6 +127,7 @@ sub RandomTimer_SetTimer($)
$hash->{active} = 0;
schaltZeitenErmitteln($hash, $now);
RandomTimer_setState($hash);
Log3 $hash, 4, "[".$hash->{NAME}."]" . " timings for RandomTimer on $hash->{DEVICE}: "
. strftime("%H:%M:%S(%d)",localtime($hash->{startTime})) . " - "
@ -146,7 +148,7 @@ sub RandomTimer_SetTimer($)
########################################################################
sub RandomTimer_Exec($) {
my ($myHash) = @_;
#my $hash = $myHash->{HASH};
my $hash = myGetHashIndirekt($myHash, (caller(0))[3]);
return if (!defined($hash));
@ -155,13 +157,14 @@ sub RandomTimer_Exec($) {
my $disabled = RandomTimer_isDisabled($hash);
my $stopTimeReached = RandomTimer_stopTimeReached($hash);
$hash->{active} = 0;
if ($active) {
# wenn temporär ausgeschaltet
if ($disabled) {
Log3 $hash, 3, "[".$hash->{NAME}. "] RandomTimer for $hash->{DEVICE} going down";
RandomTimer_down($hash);
$hash->{active} = 0;
$hash->{STATE} = "disabled";
RandomTimer_setState($hash);
return;
}
# Wenn aktiv und Abschaltzeit erreicht, dann Gerät ausschalten, Meldung ausgeben und Timer schließen
@ -174,16 +177,18 @@ sub RandomTimer_Exec($) {
Log 3, "[".$hash->{NAME}. "]" ."runonceMode";
fhem ("delete $hash->{NAME}") ;
}
RandomTimer_setState($hash);
return;
}
} else { # !active
if ($disabled) {
Log3 $hash, 4, "[".$hash->{NAME}. "] RandomTimer on $hash->{DEVICE} timer disabled - no start";
$hash->{STATE} = "disabled";
RandomTimer_setState($hash);
return;
}
if ($stopTimeReached) {
Log3 $hash, 3, "[".$hash->{NAME}."] defintion after stopTime";
RandomTimer_setState($hash);
return;
}
Log3 $hash, 3, "[".$hash->{NAME}."]"." starting RandomTimer on $hash->{DEVICE}: "
@ -192,6 +197,7 @@ sub RandomTimer_Exec($) {
}
$hash->{active} = 1;
RandomTimer_setState($hash);
RandomTimer_device_toggle($hash);
@ -216,7 +222,6 @@ sub RandomTimer_down($) {
my ($hash) = @_;
$hash->{COMMAND} = AttrVal($hash->{NAME}, "keepDeviceAlive", 0) ? "on" : "off";
$hash->{STATE} = "down";
fhem ("set $hash->{DEVICE} $hash->{COMMAND}");
}
########################################################################
@ -224,13 +229,23 @@ sub RandomTimer_device_off($) {
my ($hash) = @_;
$hash->{COMMAND} = AttrVal($hash->{NAME}, "keepDeviceAlive", 0) ? "on" : "off";
$hash->{STATE} = "off";
}
########################################################################
sub RandomTimer_setState($) {
my ($hash) = @_;
if (RandomTimer_isDisabled($hash)) {
$hash->{STATE} = "disabled";
} else {
$hash->{STATE} = $hash->{active} ? "on" : "off";
}
}
########################################################################
sub RandomTimer_Attr($$$) {
my ($cmd, $name, $attrName, $attrVal) = @_;
if( $attrName eq "disable" || $attrName eq "disableCmd" ) {
if( $attrName eq "disable" || $attrName eq "disableCond" ) {
my $hash = $defs{$name};
myRemoveInternalTimer("SetTimer", $hash);
@ -257,8 +272,6 @@ sub schaltZeitenErmitteln ($$) {
startZeitErmitteln($hash, $now);
stopZeitErmitteln ($hash, $now);
$hash->{STATE} = strftime("%H:%M:%S",localtime($hash->{startTime}));
}
########################################################################
sub zeitBerechnen ($$$$) {
@ -380,7 +393,6 @@ sub RandomTimer_device_toggle ($)
my $ret = AnalyzeCommandChain(undef, $command);
Log3 ($hash, 3, $ret) if($ret);
}
$hash->{STATE} = $hash->{COMMAND};
}
########################################################################
sub get_switchmode ($) {