FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 01:46:08 +00:00
Code Issues Releases Wiki Activity

PROPLANTA: Current values

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6841 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2014-10-31 18:52:23 +00:00
parent 3a99755757
commit 34bdf6b9b1
1 changed files with 62 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
fhem/FHEM/59_PROPLANTA.pm
View File

@ -27,6 +27,14 @@ my $curReadingType = 0;
,"stark" => 3 ,"stark" => 3
); );
my @knownNoneIDs = ( ["Temperatur", "temperature"]
,["relative Feuchte", "humidity"]
,["Sichtweite", "visibility"]
,["Windgeschwindigkeit", "wind"]
,["Luftdruck", "pressure"]
,["Taupunkt", "dewpoint"]
);
# 1 = Tag-ID, 2 = readingName, 3 = Tag-Type # 1 = Tag-ID, 2 = readingName, 3 = Tag-Type
# Tag-Types: 1 = Number Col 2, 2 = Number Col 2-5, 3 = Number Col 2|4|6|8, 4 = Intensity-Text Col 2-5 # Tag-Types: 1 = Number Col 2, 2 = Number Col 2-5, 3 = Number Col 2|4|6|8, 4 = Intensity-Text Col 2-5
my @knownIDs = ( ["GS", "rad", 3] my @knownIDs = ( ["GS", "rad", 3]
@ -53,16 +61,48 @@ sub text
my $readingName; my $readingName;
if ( $curTag =~ $lookupTag ) if ( $curTag =~ $lookupTag )
{ {
$curTextPos++;
$text =~ s/^\s+//; # trim string $text =~ s/^\s+//; # trim string
$text =~ s/\s+$//; $text =~ s/\s+$//;
# Tag-Type 1 = Number Col 2, 2 = Number Col 2-5, 3 = Number Col 2|4|6|8, 4 = Intensity-Text Col 2-5 # Tag-Type 0 = Check for readings without tag-ID
if ($curReadingType == 0)
{
if ($curCol == 1 && $curTextPos == 1)
{
foreach my $r (@knownNoneIDs)
{
if ( $$r[0] eq $text )
{
$curReadingName = $$r[1];
$curReadingType = 1;
last;
}
}
}
}
# Tag-Type 1 = Number Col 2
elsif ($curReadingType == 1)
{
if ( $curCol == 3 )
{
$readingName = $curReadingName;
if ( $text =~ m/([-,\+]?\d+[,\.]?\d*)/ )
{
$text = $1;
$text =~ tr/,/./; # komma durch punkt ersetzen
}
push( @texte, $readingName."|".$text );
$curReadingType = 0;
}
}
# Tag-Type 2 = Number Col 2-5 # Tag-Type 2 = Number Col 2-5
if ($curReadingType == 2) { elsif ($curReadingType == 2)
{
if ( 1 < $curCol && $curCol <= 5 ) if ( 1 < $curCol && $curCol <= 5 )
{ {
$readingName = "fc".($curCol-1)."_".$curReadingName; $readingName = "fc".($curCol-1)."_".$curReadingName;
if ( $text =~ m/([-,\+]?\d+\.?\d*)/ ) if ( $text =~ m/([-,\+]?\d+[,\.]?\d*)/ )
{ {
$text = $1; $text = $1;
$text =~ tr/,/./; # komma durch punkt ersetzen $text =~ tr/,/./; # komma durch punkt ersetzen
@ -71,8 +111,8 @@ sub text
} }
} }
# Tag-Type 3 = Number Col 2|4|6|8 # Tag-Type 3 = Number Col 2|4|6|8
elsif ($curReadingType == 3) { elsif ($curReadingType == 3)
$curTextPos++; {
if ( 1 < $curCol && $curCol <= 5 ) if ( 1 < $curCol && $curCol <= 5 )
{ {
if ( $curTextPos % 2 == 1 ) if ( $curTextPos % 2 == 1 )
@ -98,21 +138,25 @@ sub start
{ {
my ( $self, $tagname, $attr, $attrseq, $origtext ) = @_; my ( $self, $tagname, $attr, $attrseq, $origtext ) = @_;
$curTag = $tagname; $curTag = $tagname;
if ( $tagname eq "tr" && defined( $attr->{id} ) ) if ( $tagname eq "tr" )
{ {
foreach my $r (@knownIDs) $curReadingType = 0;
$curCol = 0;
$curTextPos = 0;
if ( defined( $attr->{id} ) )
{ {
if ( $$r[0] eq $attr->{id} ) foreach my $r (@knownIDs)
{ {
$curReadingName = $$r[1]; if ( $$r[0] eq $attr->{id} )
$curReadingType = $$r[2]; {
$curCol = 0; $curReadingName = $$r[1];
$curTextPos = 0; $curReadingType = $$r[2];
last; last;
}
} }
} }
}; };
if ($tagname eq "td" && $curReadingType != 0) { if ($tagname eq "td") {
$curCol++; $curCol++;
$curTextPos = 0; $curTextPos = 0;
}; };
@ -142,7 +186,7 @@ use vars qw($readingFnAttributes);
use vars qw(%defs); use vars qw(%defs);
my $MODUL = "PROPLANTA"; my $MODUL = "PROPLANTA";
my $PROPLANTA_VERSION = "0.01"; my $PROPLANTA_VERSION = "1.01";
######################################## ########################################