mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kai's diff tuned and added

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1191 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2012-01-19 19:10:05 +00:00
parent eeaaaec733
commit 6366ccd411
1 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
FHEM/14_CUL_TX.pm
View File

@@ -58,7 +58,7 @@ CUL_TX_Parse($$)
{ {
my ($hash, $msg) = @_; my ($hash, $msg) = @_;
$msg = substr($msg, 1); $msg = substr($msg, 1);
# Msg format: taTHHXYZXY, see http://www.f6fbb.org/domo/sensors/tx3_th.php # Msg format: TXTHHXYZXY, see http://www.f6fbb.org/domo/sensors/tx3_th.php
my @a = split("", $msg); my @a = split("", $msg);
my $id2 = hex($a[4]) & 1; #meaning unknown my $id2 = hex($a[4]) & 1; #meaning unknown
my $id3 = (hex($a[3])<<3) + (hex($a[4])>>1); my $id3 = (hex($a[3])<<3) + (hex($a[4])>>1);
@@ -79,36 +79,51 @@ CUL_TX_Parse($$)
my $ll4 = GetLogLevel($name,4); my $ll4 = GetLogLevel($name,4);
Log $ll4, "CUL_TX $name $id3 ($msg)"; Log $ll4, "CUL_TX $name $id3 ($msg)";
my ($devtype, $val, $no); my ($msgtype, $val, $changedTxt);
my $valraw = ($a[5].$a[6].".".$a[7]); my $valraw = ($a[5].$a[6].".".$a[7]);
my $type = $a[2]; my $type = $a[2];
if($type eq "0") { if($type eq "0") {
$devtype = "temperature"; $msgtype = "temperature";
$val = sprintf("%2.1f", ($valraw - 50 + $def->{corr}) ); $val = sprintf("%2.1f", ($valraw - 50 + $def->{corr}) );
Log $ll4, "CUL_TX $devtype $name $id3 T: $val F: $id2"; Log $ll4, "CUL_TX $msgtype $name $id3 T: $val F: $id2";
$no = "temperature: $val"; $changedTxt = "temperature: $val";
} elsif ($type eq "E") { } elsif ($type eq "E") {
$devtype = "humidity"; $msgtype = "humidity";
$val = $valraw; $val = $valraw;
Log $ll4, "CUL_TX $devtype $name $id3 H: $val F: $id2"; Log $ll4, "CUL_TX $msgtype $name $id3 H: $val F: $id2";
$no = "humidity: $val"; $changedTxt = "humidity: $val";
} else { } else {
my $ll2 = GetLogLevel($name,4); my $ll2 = GetLogLevel($name,4);
Log $ll2, "CUL_TX $type $name $id3 ($msg) unknown type"; Log $ll2, "CUL_TX $type $name $id3 ($msg) unknown type";
return ""; return "";
}
my $state="";
my $t = ReadingsVal($name, "temperature", undef);
my $h = ReadingsVal($name, "humidity", undef);
if(defined($t) && defined($h)) {
$state="T: $t H: $h";
} elsif(defined($t)) {
$state="T: $t";
} elsif(defined($h)) {
$state="H: $h";
} }
my $tn = TimeNow(); my $tn = TimeNow();
$def->{STATE} = $no; $def->{STATE} = $state;
$def->{READINGS}{state}{TIME} = $tn; $def->{READINGS}{state}{TIME} = $tn;
$def->{READINGS}{state}{VAL} = $val; $def->{READINGS}{state}{VAL} = $state;
$def->{CHANGED}[0] = $no; $def->{CHANGED}[0] = $changedTxt;
$def->{READINGS}{$devtype}{VAL} = $val; $def->{READINGS}{$msgtype}{VAL} = $val;
$def->{READINGS}{$devtype}{TIME} = $tn; $def->{READINGS}{$msgtype}{TIME} = $tn;
DoTrigger($name, undef) if($init_done); DoTrigger($name, undef) if($init_done);
return $name; return $name;