Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unit: fix rname2rtype

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14006 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-04-16 19:01:58 +00:00
parent da05991280
commit a77ee2c923
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FHEM/Unit.pm
View File

@ -1,15 +1,15 @@
###############################################################################
# $Id$ # $Id$
package main;
use strict; use strict;
use warnings; use warnings;
use Scalar::Util qw(looks_like_number);
use UConv;
use Data::Dumper; use Data::Dumper;
use utf8; use utf8;
use Encode qw(encode_utf8 decode_utf8); use Encode qw(encode_utf8 decode_utf8);
sub Unit_Initialize() { use UConv;
}
sub Unit_Initialize() { }
# scale helper for metric numbers # scale helper for metric numbers
my $scales_m = { my $scales_m = {
@ -1298,10 +1298,11 @@ my $rtypes = {
ref_base => 900, ref_base => 900,
txt => { txt => {
de => [ 'trocken', 'niedrig', 'optimal', 'hoch', 'feucht' ], de => [ 'trocken', 'niedrig', 'optimal', 'hoch', 'feucht' ],
en => [ 'dry', 'low', 'optimal', 'high', 'wet' ], en => [ 'dry', 'low', 'ideal', 'high', 'wet' ],
}, },
scope => [ scope => [
'^(dry|0)$', '^(low|1)$', '^(optimal|2)$', '^(high|3)$', '^(dry|0)$', '^(low|1)$',
'^(ideal|optimal|2)$', '^(high|3)$',
'^(wet|4)$' '^(wet|4)$'
], ],
rtype_description => { rtype_description => {
@ -1688,7 +1689,7 @@ my $rtypes = {
inhg => { inhg => {
ref_base => 12, ref_base => 12,
suffix => 'inHg', suffix => 'inHg',
format => '%.2f', format => '%.2f',
txt => { txt => {
de => 'Zoll Quecksilbersäule', de => 'Zoll Quecksilbersäule',
en => 'Inches of Mercury', en => 'Inches of Mercury',
@ -2856,9 +2857,9 @@ sub rname2rtype ($$@) {
# remove some prefix or other values to # remove some prefix or other values to
# flatten reading name # flatten reading name
$r =~ s/^fc\d+_//i; $r =~ s/^fc\d+_//i;
$r =~ s/_(min|max|avg|sum|cum|avg\d+m|sum\d+m|cum\d+m)_/_/i; $r =~ s/_(min|max|avg|sum|cum|min\d+m|max\d+m|avg\d+m|sum\d+m|cum\d+m)_/_/i;
$r =~ s/^(min|max|avg|sum|cum|avg\d+m|sum\d+m|cum\d+m)_//i; $r =~ s/^(min|max|avg|sum|cum|min\d+m|max\d+m|avg\d+m|sum\d+m|cum\d+m)_//i;
$r =~ s/_(min|max|avg|sum|cum|avg\d+m|sum\d+m|cum\d+m)$//i; $r =~ s/_(min|max|avg|sum|cum|min\d+m|max\d+m|avg\d+m|sum\d+m|cum\d+m)$//i;
$r =~ s/.*[-_](temp)$/$1/i; $r =~ s/.*[-_](temp)$/$1/i;
# rename capital letter containing readings # rename capital letter containing readings
@ -4398,7 +4399,9 @@ sub Unit_DbLog_split($$) {
} }
# exclude sum/cum and avg events # exclude sum/cum and avg events
elsif ( $event =~ /^.*(min|max|avg|sum|cum|avg\d+m|sum\d+m|cum\d+m): +.*/ ) elsif ( $event =~
/^.*(min|max|avg|sum|cum|min\d+m|max\d+m|avg\d+m|sum\d+m|cum\d+m): +.*/
)
{ {
Log3 $name, 5, "Unit_DbLog_split $name: Ignoring sum/avg event $event"; Log3 $name, 5, "Unit_DbLog_split $name: Ignoring sum/avg event $event";
return undef; return undef;