FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

some cleanups

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6267 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2014-07-16 22:33:40 +00:00
parent 7067e323bf
commit 445d76cc04
1 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
fhem/FHEM/38_netatmo.pm
View File

@ -578,6 +578,35 @@ netatmo_parseDeviceList($$)
netatmo_autocreate($hash) if( $do_autocreate );
}
sub
netatmo_updateReadings($$)
{
my($hash, $readings) = @_;
my ($seconds) = gettimeofday();
my $latest = 0;
if( @{$readings} ) {
readingsBeginUpdate($hash);
my $i = 0;
foreach my $reading (sort { $a->[0] <=> $b->[0] } @{$readings}) {
$hash->{".updateTimestamp"} = FmtDateTime($reading->[0]);
$hash->{CHANGETIME}[$i++] = FmtDateTime($reading->[0]);
readingsBulkUpdate( $hash, $reading->[1], $reading->[2] );
$latest = $reading->[0] if( $reading->[0] > $latest );
}
#$hash->{helper}{update_count} = int(@{$readings});
#$seconds = $latest + 1 if( $latest );
readingsBulkUpdate( $hash, ".lastupdate", $seconds, 0 );
readingsEndUpdate($hash,1);
delete $hash->{CHANGETIME};
}
return ($seconds,$latest);
}
sub
netatmo_parseReadings($$)
{
@ -609,28 +638,8 @@ netatmo_parseReadings($$)
}
}
my $latest = 0;
if( @readings ) {
readingsBeginUpdate($hash);
my $i = 0;
foreach my $reading (sort { $a->[0] <=> $b->[0] } @readings) {
$hash->{".updateTimestamp"} = FmtDateTime($reading->[0]);
$hash->{CHANGETIME}[$i++] = FmtDateTime($reading->[0]);
readingsBulkUpdate( $hash, $reading->[1], $reading->[2], 1 );
$latest = $reading->[0] if( $reading->[0] > $latest );
}
#$hash->{helper}{update_count} = int(@readings);
my ($seconds) = gettimeofday();
my ($seconds,undef) = netatmo_updateReadings( $hash, \@readings );
$hash->{LAST_POLL} = FmtDateTime( $seconds );
#$seconds = $latest + 1 if( $latest );
readingsBulkUpdate( $hash, ".lastupdate", $seconds, 0 );
readingsEndUpdate($hash,1);
delete $hash->{CHANGETIME};
}
}
}
}
@ -646,9 +655,8 @@ netatmo_parsePublic($$)
$hash->{status} = $json->{error}{message} if( $json->{error} );
if( $hash->{status} eq "ok" ) {
if( $hash->{Lat} ) {
my $ii = 0;
readingsBeginUpdate($hash);
my $found = 0;
my @readings = ();
my $devices = $json->{body};
if( ref($devices) eq "ARRAY" ) {
foreach my $device (@{$devices}) {
@ -658,14 +666,12 @@ netatmo_parsePublic($$)
foreach my $module ( keys %{$device->{measures}}) {
next if( ref($device->{measures}->{$module}->{res}) ne "HASH" );
foreach my $timestamp ( keys %{$device->{measures}->{$module}->{res}} ) {
next if( $hash->{LAST_POLL} && $hash->{LAST_POLL} > $timestamp );
next if( $hash->{LAST_POLL} && $timestamp <= $hash->{LAST_POLL} );
my $i = 0;
foreach my $value ( @{$device->{measures}->{$module}->{res}->{$timestamp}} ) {
my $type = $device->{measures}->{$module}->{type}[$i];
$hash->{".updateTimestamp"} = FmtDateTime($timestamp);
$hash->{CHANGETIME}[$ii++] = FmtDateTime($timestamp);
readingsBulkUpdate( $hash, $type, $value, 1 );
push(@readings, [$timestamp, lc($type), $value]);
++$i;
}
@ -676,13 +682,11 @@ netatmo_parsePublic($$)
last;
}
}
($hash->{LAST_POLL}) = gettimeofday();
delete $hash->{CHANGETIME};
if( !$found ) {
$hash->{STATE} = "Error: device not found";
}
readingsEndUpdate($hash,1);
my (undef,$latest) = netatmo_updateReadings( $hash, \@readings );
$hash->{LAST_POLL} = $latest if( @readings );
$hash->{STATE} = "Error: device not found" if( !$found );
} else {
return $json->{body};
}