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

50_HP1000: fix cross-use for dewpoint functions

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12793 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-12-17 13:58:53 +00:00
parent 5fa1644048
commit 1ecc608883
1 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fhem/FHEM/50_HP1000.pm
View File

@ -35,7 +35,7 @@ use Encode qw(encode_utf8 decode_utf8);
use Unit; use Unit;
use Time::Local; use Time::Local;
use List::Util qw(sum); use List::Util qw(sum);
use FHEM::98_dewpoint; use Scalar::Util qw(looks_like_number);
use Data::Dumper; use Data::Dumper;
######################### #########################
@ -65,6 +65,13 @@ sub HP1000_Initialize($) {
Log3 $hash, 5, "HP1000_Initialize: Entering"; Log3 $hash, 5, "HP1000_Initialize: Entering";
if ( !$modules{dewpoint}{LOADED}
&& -f "$attr{global}{modpath}/FHEM/98_dewpoint.pm" )
{
my $ret = CommandReload( undef, "98_dewpoint" );
Log3 undef, 1, $ret if ($ret);
}
$hash->{GetFn} = "HP1000_Get"; $hash->{GetFn} = "HP1000_Get";
$hash->{DefFn} = "HP1000_Define"; $hash->{DefFn} = "HP1000_Define";
$hash->{UndefFn} = "HP1000_Undefine"; $hash->{UndefFn} = "HP1000_Undefine";
@ -861,12 +868,16 @@ sub HP1000_CGI() {
} }
# indoorDewpoint in Celsius # indoorDewpoint in Celsius
if ( defined( $webArgs->{intemp} ) && defined( $webArgs->{inhumi} ) ) { if ( defined( $webArgs->{intemp} )
&& defined( $webArgs->{inhumi} )
&& exists &dewpoint_dewpoint )
{
my $h = ( my $h = (
$webArgs->{inhumi} > 110 $webArgs->{inhumi} > 110
? 110 ? 110
: ( $webArgs->{inhumi} <= 0 ? 0.01 : $webArgs->{inhumi} ) : ( $webArgs->{inhumi} <= 0 ? 0.01 : $webArgs->{inhumi} )
); );
$webArgs->{indewpoint} = $webArgs->{indewpoint} =
round( dewpoint_dewpoint( $webArgs->{intemp}, $h ), 1 ); round( dewpoint_dewpoint( $webArgs->{intemp}, $h ), 1 );
readingsBulkUpdate( $hash, "indoorDewpoint", $webArgs->{indewpoint} ); readingsBulkUpdate( $hash, "indoorDewpoint", $webArgs->{indewpoint} );
@ -874,7 +885,8 @@ sub HP1000_CGI() {
# indoorDewpoint in Fahrenheit # indoorDewpoint in Fahrenheit
if ( defined( $webArgs->{indoortempf} ) if ( defined( $webArgs->{indoortempf} )
&& defined( $webArgs->{indoorhumidity} ) ) && defined( $webArgs->{indoorhumidity} )
&& exists &dewpoint_dewpoint )
{ {
my $h = ( my $h = (
$webArgs->{indoorhumidity} > 110 ? 110 $webArgs->{indoorhumidity} > 110 ? 110
@ -883,14 +895,20 @@ sub HP1000_CGI() {
: $webArgs->{indoorhumidity} : $webArgs->{indoorhumidity}
) )
); );
$webArgs->{indoordewpointf} = $webArgs->{indoordewpointf} =
round( dewpoint_dewpoint( $webArgs->{indoortempf}, $h ), 1 ); round( dewpoint_dewpoint( $webArgs->{indoortempf}, $h ), 1 );
readingsBulkUpdate( $hash, "indoorDewpoint_f", readingsBulkUpdate( $hash, "indoorDewpoint_f",
$webArgs->{indoordewpointf} ); $webArgs->{indoordewpointf} );
} }
# humidityAbs / humidityAbs_f # humidityAbs
if ( defined( $webArgs->{outtemp} ) && defined( $webArgs->{outhumi} ) ) { if ( defined( $webArgs->{outtemp} )
&& defined( $webArgs->{outhumi} )
&& looks_like_number( $webArgs->{outtemp} )
&& looks_like_number( $webArgs->{outhumi} )
&& exists &dewpoint_absFeuchte )
{
my $h = ( my $h = (
$webArgs->{outhumi} > 110 $webArgs->{outhumi} > 110
? 110 ? 110
@ -899,14 +917,32 @@ sub HP1000_CGI() {
$webArgs->{outhumiabs} = $webArgs->{outhumiabs} =
round( dewpoint_absFeuchte( $webArgs->{outtemp}, $h ), 1 ); round( dewpoint_absFeuchte( $webArgs->{outtemp}, $h ), 1 );
readingsBulkUpdate( $hash, "humidityAbs", $webArgs->{outhumiabs} ); readingsBulkUpdate( $hash, "humidityAbs", $webArgs->{outhumiabs} );
}
# humidityAbs_f
if ( defined( $webArgs->{outtempf} )
&& defined( $webArgs->{outhumi} )
&& looks_like_number( $webArgs->{outtempf} )
&& looks_like_number( $webArgs->{outhumi} )
&& exists &dewpoint_absFeuchte )
{
my $h = (
$webArgs->{outhumi} > 110
? 110
: ( $webArgs->{outhumi} <= 0 ? 0.01 : $webArgs->{outhumi} )
);
$webArgs->{outhumiabsf} = $webArgs->{outhumiabsf} =
round( dewpoint_absFeuchte( $webArgs->{outtempf}, $h ), 1 ); round( dewpoint_absFeuchte( $webArgs->{outtempf}, $h ), 1 );
readingsBulkUpdate( $hash, "humidityAbs_f", $webArgs->{outhumiabsf} ); readingsBulkUpdate( $hash, "humidityAbs_f", $webArgs->{outhumiabsf} );
} }
# indoorHumidityAbs # indoorHumidityAbs
if ( defined( $webArgs->{intemp} ) && defined( $webArgs->{inhumi} ) ) { if ( defined( $webArgs->{intemp} )
&& defined( $webArgs->{inhumi} )
&& looks_like_number( $webArgs->{intemp} )
&& looks_like_number( $webArgs->{inhumi} )
&& exists &dewpoint_absFeuchte )
{
my $h = ( my $h = (
$webArgs->{inhumi} > 110 $webArgs->{inhumi} > 110
? 110 ? 110
@ -919,7 +955,10 @@ sub HP1000_CGI() {
# indoorHumidityAbs_f # indoorHumidityAbs_f
if ( defined( $webArgs->{indoortempf} ) if ( defined( $webArgs->{indoortempf} )
&& defined( $webArgs->{indoorhumidity} ) ) && defined( $webArgs->{indoorhumidity} )
&& looks_like_number( $webArgs->{indoortempf} )
&& looks_like_number( $webArgs->{indoorhumidity} )
&& exists &dewpoint_absFeuchte )
{ {
my $h = ( my $h = (
$webArgs->{indoorhumidity} > 110 ? 110 $webArgs->{indoorhumidity} > 110 ? 110