FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-06 06:36:36 +00:00
Code Issues Releases Wiki Activity

50_HP1000.pm: fix humidity for wunderground

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12355 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-10-16 22:24:33 +00:00
parent bd6b611e9f
commit 72d03ea905
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fhem/FHEM/50_HP1000.pm
View File

@ -235,6 +235,18 @@ sub HP1000_CGI() {
if ( defined( $webArgs->{indoorhumidity} ) if ( defined( $webArgs->{indoorhumidity} )
&& !defined( $webArgs->{inhumi} ) ); && !defined( $webArgs->{inhumi} ) );
$webArgs->{indoorhumidity} = $webArgs->{inhumi}
if ( defined( $webArgs->{inhumi} )
&& !defined( $webArgs->{indoorhumidity} ) );
$webArgs->{outhumi} = $webArgs->{humidity}
if ( defined( $webArgs->{humidity} )
&& !defined( $webArgs->{outhumi} ) );
$webArgs->{humidity} = $webArgs->{outhumi}
if ( defined( $webArgs->{outhumi} )
&& !defined( $webArgs->{humidity} ) );
# dewpoint in Celsius (convert from dewptf) # dewpoint in Celsius (convert from dewptf)
if ( defined( $webArgs->{dewptf} ) if ( defined( $webArgs->{dewptf} )
&& $webArgs->{dewptf} ne "" && $webArgs->{dewptf} ne ""
@ -473,14 +485,15 @@ sub HP1000_CGI() {
|| $p eq "action" || $p eq "action"
|| $p eq "softwaretype" || $p eq "softwaretype"
|| $p eq "realtime" || $p eq "realtime"
|| $p eq "rtfreq" ); || $p eq "rtfreq"
|| $p eq "humidity"
|| $p eq "indoorhumidity" );
$p = "_" . $p; $p = "_" . $p;
# name translation for general readings # name translation for general readings
$p = "humidity" if ( $p eq "_outhumi" ); $p = "humidity" if ( $p eq "_outhumi" );
$p = "humidityIndoor" if ( $p eq "_inhumi" ); $p = "humidityIndoor" if ( $p eq "_inhumi" );
$p = "humidityIndoor" if ( $p eq "_indoorhumidity" );
$p = "luminosity" if ( $p eq "_light" ); $p = "luminosity" if ( $p eq "_light" );
$p = "uv" if ( $p eq "_UV" ); $p = "uv" if ( $p eq "_UV" );
$p = "windDir" if ( $p eq "_winddir" ); $p = "windDir" if ( $p eq "_winddir" );
@ -604,16 +617,16 @@ sub HP1000_CGI() {
if ( defined( $webArgs->{UVI} ) ) { if ( defined( $webArgs->{UVI} ) ) {
my $condition = "low"; my $condition = "low";
if ($webArgs->{UVI} > 11) { if ( $webArgs->{UVI} > 11 ) {
$condition = "extreme"; $condition = "extreme";
} }
elsif ($webArgs->{UVI} > 8) { elsif ( $webArgs->{UVI} > 8 ) {
$condition = "veryhigh"; $condition = "veryhigh";
} }
elsif ($webArgs->{UVI} > 6) { elsif ( $webArgs->{UVI} > 6 ) {
$condition = "high"; $condition = "high";
} }
elsif ($webArgs->{UVI} > 3) { elsif ( $webArgs->{UVI} > 3 ) {
$condition = "moderate"; $condition = "moderate";
} }
@ -1173,7 +1186,8 @@ sub HP1000_DbLog_split($$) {
my $hash = $defs{$device}; my $hash = $defs{$device};
if ( $event =~ if ( $event =~
/^(windCompasspoint.*|.*_sum10m|.*_avg2m|uvCondition):\s([\w\.,]+)\s*(.*)/ ) /^(windCompasspoint.*|.*_sum10m|.*_avg2m|uvCondition):\s([\w\.,]+)\s*(.*)/
)
{ {
return undef; return undef;
} }