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

50_HP1000: correct some DbLog units

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12430 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-10-25 23:18:11 +00:00
parent ab2a7575df
commit a0bd1a5a88
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fhem/FHEM/50_HP1000.pm
View File

@ -669,7 +669,7 @@ sub HP1000_CGI() {
if ( defined( $webArgs->{light} ) && $webArgs->{light} > 50 );
readingsBulkUpdateIfChanged( $hash, "daylight", $daylight );
# weatherCondition
# condition
if ( defined( $webArgs->{light} ) ) {
my $condition = "clear";
@ -683,7 +683,7 @@ sub HP1000_CGI() {
$condition = "cloudy";
}
readingsBulkUpdateIfChanged( $hash, "weatherCondition", $condition );
readingsBulkUpdateIfChanged( $hash, "condition", $condition );
}
# humidityCondition
@ -1349,6 +1349,15 @@ sub HP1000_DbLog_split($$) {
$value = $2;
$unit = "W/m2";
}
elsif ( $event =~ /^(pressureTrend):\s([\w\.,]+)\s*(.*)/ ) {
$reading = $1;
$value = "";
$value = "0" if ( $2 eq "=" );
$value = "1" if ( $2 eq "+" );
$value = "2" if ( $2 eq "-" );
return undef if ( $value eq "" );
$unit = "";
}
elsif ( $event =~ /^(pressure|pressureAbs):\s([\w\.,]+)\s*(.*)/ ) {
$reading = $1;
$value = $2;
@ -1369,7 +1378,7 @@ sub HP1000_DbLog_split($$) {
$value = $2;
$unit = "mm/h";
}
elsif ( $event =~ /^(rainin):\s([\w\.,]+)\s*(.*)/ ) {
elsif ( $event =~ /^(rainIn):\s([\w\.,]+)\s*(.*)/ ) {
$reading = $1;
$value = $2;
$unit = "in/h";
@ -1403,12 +1412,17 @@ sub HP1000_DbLog_split($$) {
$value = $2;
$unit = "°";
}
elsif ( $event =~ /^(windGust|windSpeed):\s([\w\.,]+)\s*(.*)/ ) {
elsif ( $event =~ /^(windGust.*|windSpeed.*):\s([\w\.,]+)\s*(.*)/ ) {
$reading = $1;
$value = $2;
$unit = "km/h";
}
elsif ( $event =~ /^(windGustBft|windSpeedBft):\s([\w\.,]+)\s*(.*)/ ) {
elsif ( $event =~ /^(windGustMph.*|windSpeedMph.*):\s([\w\.,]+)\s*(.*)/ ) {
$reading = $1;
$value = $2;
$unit = "mph";
}
elsif ( $event =~ /^(windGustBft.*|windSpeedBft.*):\s([\w\.,]+)\s*(.*)/ ) {
$reading = $1;
$value = $2;
$unit = "Bft";
@ -1435,7 +1449,7 @@ sub HP1000_DbLog_split($$) {
$value = "0" if ( $2 eq "dead" );
$unit = "";
}
elsif ( $event =~ /^(weatherCondition):\s([\w\.,]+)\s*(.*)/ ) {
elsif ( $event =~ /^(condition):\s([\w\.,]+)\s*(.*)/ ) {
$reading = $1;
$value = "";
$value = "0" if ( $2 eq "clear" );