From c683de4aa6dd5f23a0289b4d5ffa443e1753fc92 Mon Sep 17 00:00:00 2001 From: markus-m <> Date: Tue, 9 Aug 2016 18:03:57 +0000 Subject: [PATCH] 38_netatmo: removed event-on-change default, min HOME interval git-svn-id: https://svn.fhem.de/fhem/trunk@11931 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/38_netatmo.pm | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index f934533a5..8d100852d 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - changed: 38_netatmo: removed event-on-change default, min HOME interval - changed: 93_DbRep: usage of "insert" changed, pls. refer to commandref - changed: 93_DbRep: function "insert" added, check of numeric value type in functions maxvalue, diffvalue diff --git a/fhem/FHEM/38_netatmo.pm b/fhem/FHEM/38_netatmo.pm index 0693eb282..2874d9712 100644 --- a/fhem/FHEM/38_netatmo.pm +++ b/fhem/FHEM/38_netatmo.pm @@ -131,7 +131,7 @@ netatmo_Define($$) $attr{$name}{stateFormat} = $state_format if( !defined($attr{$name}{stateFormat}) && defined($state_format) ); $attr{$name}{room} = "netatmo" if( !defined($attr{$name}{room})); $attr{$name}{devStateIcon} = ".*:no-icon" if( !defined($attr{$name}{devStateIcon})); - $attr{$name}{'event-on-change-reading'} = ".*" if( !defined($attr{$name}{'event-on-change-reading'})); + #$attr{$name}{'event-on-change-reading'} = ".*" if( !defined($attr{$name}{'event-on-change-reading'})); } @@ -185,7 +185,7 @@ netatmo_Define($$) $hash->{INTERVAL} = 60*30 if( !$hash->{INTERVAL} ); $attr{$name}{room} = "netatmo" if( !defined($attr{$name}{room})); $attr{$name}{devStateIcon} = ".*:no-icon" if( !defined($attr{$name}{devStateIcon})); - $attr{$name}{'event-on-change-reading'} = ".*" if( !defined($attr{$name}{'event-on-change-reading'})); + #$attr{$name}{'event-on-change-reading'} = ".*" if( !defined($attr{$name}{'event-on-change-reading'})); } elsif( ($a[2] eq "MODULE" && @a == 5 ) ) { $subtype = "MODULE"; @@ -4205,11 +4205,12 @@ sub netatmo_Attr($$$) my $orig = $attrVal; $attrVal = int($attrVal) if($attrName eq "interval" || $attrName eq "setpoint_duration"); - $attrVal = 60*5 if($attrName eq "interval" && $attrVal < 60*5 && $attrVal != 0); $attrVal = 15 if($attrName eq "setpoint_duration" && $attrVal < 15 && $attrVal != 0); if( $attrName eq "interval" ) { my $hash = $defs{$name}; + $attrVal = 60*5 if($hash->{SUBTYPE} ne "HOME" && $attrVal < 60*5 && $attrVal != 0); + #\$attrVal = 2700 if(($attrVal < 2700 && ($hash->{SUBTYPE} eq "ACCOUNT" || $hash->{SUBTYPE} eq "FORECAST"); $hash->{INTERVAL} = $attrVal if($attrVal); $hash->{INTERVAL} = 60*30 if( !$hash->{INTERVAL} );