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

changed formating

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6566 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2014-09-17 16:42:06 +00:00
parent 7bf831c9e7
commit 52cfc28b78
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fhem/FHEM/38_netatmo.pm
View File

@ -938,29 +938,21 @@ netatmo_Get($$@)
$ret .= sprintf( "%s\t%.8f\t%.8f\t%i", $device->{_id}, $ret .= sprintf( "%s\t%.8f\t%.8f\t%i", $device->{_id},
$device->{place}->{location}->[0], $device->{place}->{location}->[1], $device->{place}->{location}->[0], $device->{place}->{location}->[1],
$device->{place}->{altitude} ); $device->{place}->{altitude} );
$ret .= "\t";
my $addr .= netatmo_getAddress( $hash, 1, $device->{place}->{location}->[0], $device->{place}->{location}->[1] ); my $addr .= netatmo_getAddress( $hash, 1, $device->{place}->{location}->[0], $device->{place}->{location}->[1] );
next if( ref($device->{measures}) ne "HASH" ); next if( ref($device->{measures}) ne "HASH" );
my $ext;
foreach my $module ( keys %{$device->{measures}}) {
#next if( ref($device->{measures}->{$module}->{res}) ne "HASH" );
if( ref($device->{measures}->{$module}->{res}) ne "HASH" ) {
my $value = $device->{measures}->{$module}->{rain_60min};
if( defined($value) ) {
$ext .= "$module ";
$ext .= join(',', "rain");
$ext .= " ";
$ret .= sprintf( "\t%i mm", $value ) if( defined($value) );
}
next; my $ext;
} foreach my $module ( sort keys %{$device->{measures}}) {
next if( ref($device->{measures}->{$module}->{res}) ne "HASH" );
$ext .= "$module "; $ext .= "$module ";
$ext .= join(',', @{$device->{measures}->{$module}->{type}}); $ext .= join(',', @{$device->{measures}->{$module}->{type}});
$ext .= " "; $ext .= " ";
foreach my $timestamp ( keys %{$device->{measures}->{$module}->{res}} ) { foreach my $timestamp ( keys %{$device->{measures}->{$module}->{res}} ) {
my $i = 0; my $i = 0;
$ret .= "\t";
foreach my $value ( @{$device->{measures}->{$module}->{res}->{$timestamp}} ) { foreach my $value ( @{$device->{measures}->{$module}->{res}->{$timestamp}} ) {
my $type = $device->{measures}->{$module}->{type}[$i]; my $type = $device->{measures}->{$module}->{type}[$i];
@ -979,8 +971,21 @@ netatmo_Get($$@)
last; last;
} }
} }
my $got_rain = 0;
foreach my $module ( keys %{$device->{measures}}) {
my $value = $device->{measures}->{$module}->{rain_60min};
if( defined($value) ) {
$got_rain = 1;
$ext .= "$module ";
$ext .= join(',', "rain");
$ext .= " ";
$ret .= sprintf( "\t%i mm", $value ) if( defined($value) );
}
}
$ret .= "\t" if( !$got_rain );
#$ret .= "\n\t\t";
$ret .= "\t$addr"; $ret .= "\t$addr";
$ret .= "\n\tdefine netatmo_P$device->{_id} netatmo PUBLIC $device->{_id} $ext" if( $station ); $ret .= "\n\tdefine netatmo_P$device->{_id} netatmo PUBLIC $device->{_id} $ext" if( $station );