FHEM/mod-TeslaPowerwall2AC
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

change attribut handling for run timer in notify Fn

Browse Source
This commit is contained in:
Marko Oldenburg 2017-10-17 14:59:11 +02:00
parent 319ee09e98
commit d095a21046
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
46_TeslaPowerwall2AC.pm
View File

@ -66,7 +66,7 @@ use HttpUtils;
eval "use JSON;1" or $missingModul .= "JSON "; eval "use JSON;1" or $missingModul .= "JSON ";
my $version = "0.1.15"; my $version = "0.1.23";
@ -142,7 +142,7 @@ sub TeslaPowerwall2AC_Define($$) {
$hash->{actionQueue} = []; $hash->{actionQueue} = [];
$attr{$name}{room} = "Tesla" if( !defined( $attr{$name}{room} ) ); $attr{$name}{room} = "Tesla" if( !defined( $attr{$name}{room} ) );
Log3 $name, 3, "TeslaPowerwall2AC ($name) - defined SmartPi Device with Host $host, Port $hash->{PORT} and Interval $hash->{INTERVAL}"; Log3 $name, 3, "TeslaPowerwall2AC ($name) - defined SmartPi Device with Host $host, Port $hash->{PORT} and Interval $hash->{INTERVAL}";
@ -177,9 +177,7 @@ sub TeslaPowerwall2AC_Attr(@) {
Log3 $name, 3, "TeslaPowerwall2AC ($name) - disabled"; Log3 $name, 3, "TeslaPowerwall2AC ($name) - disabled";
} elsif( $cmd eq "del" ) { } elsif( $cmd eq "del" ) {
readingsSingleUpdate ( $hash, "state", "active", 1 );
Log3 $name, 3, "TeslaPowerwall2AC ($name) - enabled"; Log3 $name, 3, "TeslaPowerwall2AC ($name) - enabled";
TeslaPowerwall2AC_Timer_GetData($hash);
} }
} }
@ -191,8 +189,8 @@ sub TeslaPowerwall2AC_Attr(@) {
readingsSingleUpdate ( $hash, "state", "disabled for Intervals", 1 ); readingsSingleUpdate ( $hash, "state", "disabled for Intervals", 1 );
} elsif( $cmd eq "del" ) { } elsif( $cmd eq "del" ) {
readingsSingleUpdate ( $hash, "state", "active", 1 );
Log3 $name, 3, "TeslaPowerwall2AC ($name) - enabled"; Log3 $name, 3, "TeslaPowerwall2AC ($name) - enabled";
readingsSingleUpdate( $hash, "state", "active", 1 );
} }
} }
@ -203,11 +201,13 @@ sub TeslaPowerwall2AC_Attr(@) {
return "interval too small, please use something >= 30 (sec), default is 300 (sec)"; return "interval too small, please use something >= 30 (sec), default is 300 (sec)";
} else { } else {
RemoveInternalTimer($hash);
$hash->{INTERVAL} = $attrVal; $hash->{INTERVAL} = $attrVal;
Log3 $name, 3, "TeslaPowerwall2AC ($name) - set interval to $attrVal"; Log3 $name, 3, "TeslaPowerwall2AC ($name) - set interval to $attrVal";
TeslaPowerwall2AC_Timer_GetData($hash) if($init_done); TeslaPowerwall2AC_Timer_GetData($hash);
} }
} elsif( $cmd eq "del" ) { } elsif( $cmd eq "del" ) {
RemoveInternalTimer($hash);
$hash->{INTERVAL} = 300; $hash->{INTERVAL} = 300;
Log3 $name, 3, "TeslaPowerwall2AC ($name) - set interval to default"; Log3 $name, 3, "TeslaPowerwall2AC ($name) - set interval to default";
TeslaPowerwall2AC_Timer_GetData($hash); TeslaPowerwall2AC_Timer_GetData($hash);
@ -229,7 +229,8 @@ sub TeslaPowerwall2AC_Notify($$) {
return if (!$events); return if (!$events);
TeslaPowerwall2AC_Timer_GetData($hash) if( grep /^INITIALIZED$/,@{$events} ); TeslaPowerwall2AC_Timer_GetData($hash) if( grep /^INITIALIZED$/,@{$events}
or grep /^DELETEATTR.$name.disable$/,@{$events} );
return; return;
} }
@ -287,11 +288,9 @@ sub TeslaPowerwall2AC_Timer_GetData($) {
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
RemoveInternalTimer($hash);
if( $init_done and defined($hash->{actionQueue}) and scalar(@{$hash->{actionQueue}}) == 0 ) {
if( defined($hash->{actionQueue}) and scalar(@{$hash->{actionQueue}}) == 0 ) {
if( not IsDisabled($name) ) { if( not IsDisabled($name) ) {
while( my $obj = each %paths ) { while( my $obj = each %paths ) {
unshift( @{$hash->{actionQueue}}, $obj ); unshift( @{$hash->{actionQueue}}, $obj );