diff --git a/FHEM/00_CUL.pm b/FHEM/00_CUL.pm index cfb876003..2d04a3c1d 100755 --- a/FHEM/00_CUL.pm +++ b/FHEM/00_CUL.pm @@ -57,12 +57,12 @@ my %matchListSlowRF = ( "6:CUL_WS" => "^K.....", "7:CUL_EM" => "^E0.................\$", "8:HMS" => "^810e04....(1|5|9).a001", - "9:CUL_FHTTK" => "^T........", + "9:CUL_FHTTK" => "^T[A-F0-9]{8}", "A:CUL_RFR" => "^[0-9A-F]{4}U.", "B:CUL_HOERMANN"=> "^R..........", "C:ESA2000" => "^S................................\$", "D:CUL_IR" => "^I............", - "E:CUL_TX" => "^t..........", + "E:CUL_TX" => "^TX[A-F0-9]{10}", ); my %matchListHomeMatic = ( "1:CUL_HM" => "^A......................", @@ -886,7 +886,7 @@ CUL_Parse($$$$$) } elsif($fn eq "A" && $len >= 21) { # AskSin/BidCos/HomeMatic ; } elsif($fn eq "t" && $len >= 5) { # TX3 - ; + $dmsg = "TX".substr($dmsg,1); # t.* is occupied by FHTTK } else { Log GetLogLevel($name,2), "$name: unknown message $dmsg"; return; diff --git a/FHEM/14_CUL_TX.pm b/FHEM/14_CUL_TX.pm index 054148215..d8ad878b1 100644 --- a/FHEM/14_CUL_TX.pm +++ b/FHEM/14_CUL_TX.pm @@ -12,7 +12,7 @@ CUL_TX_Initialize($) { my ($hash) = @_; - $hash->{Match} = "^t.........."; + $hash->{Match} = "^TX.........."; # Need TX to avoid FHTTK $hash->{DefFn} = "CUL_TX_Define"; $hash->{UndefFn} = "CUL_TX_Undef"; $hash->{ParseFn} = "CUL_TX_Parse"; @@ -56,6 +56,7 @@ sub CUL_TX_Parse($$) { my ($hash, $msg) = @_; + $msg = substr($msg, 1); # Msg format: taTHHXYZXY, see http://www.f6fbb.org/domo/sensors/tx3_th.php my @a = split("", $msg); my $id2 = hex($a[4]) & 1; #meaning unknown