FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 02:10:32 +00:00
Code Issues Releases Wiki Activity

CUL_TX Prefix changed to TX as autoloading confuses it with FHTTK

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1030 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-09-30 15:47:20 +00:00
parent 4037aa0f86
commit d35b2da7a6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/00_CUL.pm
View File

@ -57,12 +57,12 @@ my %matchListSlowRF = (
"6:CUL_WS" => "^K.....", "6:CUL_WS" => "^K.....",
"7:CUL_EM" => "^E0.................\$", "7:CUL_EM" => "^E0.................\$",
"8:HMS" => "^810e04....(1|5|9).a001", "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.", "A:CUL_RFR" => "^[0-9A-F]{4}U.",
"B:CUL_HOERMANN"=> "^R..........", "B:CUL_HOERMANN"=> "^R..........",
"C:ESA2000" => "^S................................\$", "C:ESA2000" => "^S................................\$",
"D:CUL_IR" => "^I............", "D:CUL_IR" => "^I............",
"E:CUL_TX" => "^t..........", "E:CUL_TX" => "^TX[A-F0-9]{10}",
); );
my %matchListHomeMatic = ( my %matchListHomeMatic = (
"1:CUL_HM" => "^A......................", "1:CUL_HM" => "^A......................",
@ -886,7 +886,7 @@ CUL_Parse($$$$$)
} elsif($fn eq "A" && $len >= 21) { # AskSin/BidCos/HomeMatic } elsif($fn eq "A" && $len >= 21) { # AskSin/BidCos/HomeMatic
; ;
} elsif($fn eq "t" && $len >= 5) { # TX3 } elsif($fn eq "t" && $len >= 5) { # TX3
; $dmsg = "TX".substr($dmsg,1); # t.* is occupied by FHTTK
} else { } else {
Log GetLogLevel($name,2), "$name: unknown message $dmsg"; Log GetLogLevel($name,2), "$name: unknown message $dmsg";
return; return;

3
fhem/FHEM/14_CUL_TX.pm
View File

@ -12,7 +12,7 @@ CUL_TX_Initialize($)
{ {
my ($hash) = @_; my ($hash) = @_;
$hash->{Match} = "^t.........."; $hash->{Match} = "^TX.........."; # Need TX to avoid FHTTK
$hash->{DefFn} = "CUL_TX_Define"; $hash->{DefFn} = "CUL_TX_Define";
$hash->{UndefFn} = "CUL_TX_Undef"; $hash->{UndefFn} = "CUL_TX_Undef";
$hash->{ParseFn} = "CUL_TX_Parse"; $hash->{ParseFn} = "CUL_TX_Parse";
@ -56,6 +56,7 @@ sub
CUL_TX_Parse($$) CUL_TX_Parse($$)
{ {
my ($hash, $msg) = @_; my ($hash, $msg) = @_;
$msg = substr($msg, 1);
# Msg format: taTHHXYZXY, see http://www.f6fbb.org/domo/sensors/tx3_th.php # Msg format: taTHHXYZXY, 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