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

38_netatmo: removed event-on-change default, min HOME interval

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11931 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markus-m 2016-08-09 18:03:57 +00:00
parent fd0ab24251
commit c683de4aa6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# 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.
- 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: usage of "insert" changed, pls. refer to commandref
- changed: 93_DbRep: function "insert" added, check of numeric value type - changed: 93_DbRep: function "insert" added, check of numeric value type
in functions maxvalue, diffvalue in functions maxvalue, diffvalue

7
fhem/FHEM/38_netatmo.pm
View File

@ -131,7 +131,7 @@ netatmo_Define($$)
$attr{$name}{stateFormat} = $state_format if( !defined($attr{$name}{stateFormat}) && defined($state_format) ); $attr{$name}{stateFormat} = $state_format if( !defined($attr{$name}{stateFormat}) && defined($state_format) );
$attr{$name}{room} = "netatmo" if( !defined($attr{$name}{room})); $attr{$name}{room} = "netatmo" if( !defined($attr{$name}{room}));
$attr{$name}{devStateIcon} = ".*:no-icon" if( !defined($attr{$name}{devStateIcon})); $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} ); $hash->{INTERVAL} = 60*30 if( !$hash->{INTERVAL} );
$attr{$name}{room} = "netatmo" if( !defined($attr{$name}{room})); $attr{$name}{room} = "netatmo" if( !defined($attr{$name}{room}));
$attr{$name}{devStateIcon} = ".*:no-icon" if( !defined($attr{$name}{devStateIcon})); $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 ) ) { } elsif( ($a[2] eq "MODULE" && @a == 5 ) ) {
$subtype = "MODULE"; $subtype = "MODULE";
@ -4205,11 +4205,12 @@ sub netatmo_Attr($$$)
my $orig = $attrVal; my $orig = $attrVal;
$attrVal = int($attrVal) if($attrName eq "interval" || $attrName eq "setpoint_duration"); $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); $attrVal = 15 if($attrName eq "setpoint_duration" && $attrVal < 15 && $attrVal != 0);
if( $attrName eq "interval" ) { if( $attrName eq "interval" ) {
my $hash = $defs{$name}; 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"); #\$attrVal = 2700 if(($attrVal < 2700 && ($hash->{SUBTYPE} eq "ACCOUNT" || $hash->{SUBTYPE} eq "FORECAST");
$hash->{INTERVAL} = $attrVal if($attrVal); $hash->{INTERVAL} = $attrVal if($attrVal);
$hash->{INTERVAL} = 60*30 if( !$hash->{INTERVAL} ); $hash->{INTERVAL} = 60*30 if( !$hash->{INTERVAL} );