FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-30 18:12:28 +00:00
Code Issues Releases Wiki Activity

CUL_MAX: update message parsing

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2226 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre 2012-11-29 23:52:31 +00:00
parent 798c838204
commit ce47d95ed9
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fhem/FHEM/14_CUL_MAX.pm
View File

@ -48,7 +48,7 @@ CUL_MAX_Define($$)
AssignIoPort($hash); AssignIoPort($hash);
#This interface is shared with 00_MAXLAN.pm #This interface is shared with 00_MAXLAN.pm
$hash->{SendDeviceCmd} = \&MAXLAN_SendDeviceCmd; $hash->{SendDeviceCmd} = \&CUL_MAX_SendDeviceCmd;
return undef; return undef;
} }
@ -64,6 +64,12 @@ CUL_MAX_Undef($$)
################################### ###################################
my @culHmCmdFlags = ("WAKEUP", "WAKEMEUP", "BCAST", "Bit3", my @culHmCmdFlags = ("WAKEUP", "WAKEMEUP", "BCAST", "Bit3",
"BURST", "BIDI", "RPTED", "RPTEN"); "BURST", "BIDI", "RPTED", "RPTEN");
my %msgTypes = ( "02" => "Ack",
"30" => "ShutterContactState",
"60" => "HeatingThermostatState",
);
sub sub
CUL_MAX_Parse($$) CUL_MAX_Parse($$)
{ {
@ -76,7 +82,7 @@ CUL_MAX_Parse($$)
my $shash = $modules{CUL_MAX}{defptr}; my $shash = $modules{CUL_MAX}{defptr};
$rmsg =~ m/Z(..)(..)(..)(..)(......)(......)(..)(.*)/; $rmsg =~ m/Z(..)(..)(..)(..)(......)(......)(..)(.*)/;
my ($len,$msgcnt,$msgFlag,$msgType,$src,$dst,$zero,$payload) = ($1,$2,$3,$4,$5,$6,$7,$8); my ($len,$msgcnt,$msgFlag,$msgTypeRaw,$src,$dst,$zero,$payload) = ($1,$2,$3,$4,$5,$6,$7,$8);
Log 1, "CUL_MAX_Parse: len mismatch" if(2*hex($len)+3 != length($rmsg)); #+3 = +1 for 'Z' and +2 for len field in hex Log 1, "CUL_MAX_Parse: len mismatch" if(2*hex($len)+3 != length($rmsg)); #+3 = +1 for 'Z' and +2 for len field in hex
Log 1, "CUL_MAX_Parse zero = $zero" if($zero != 0); Log 1, "CUL_MAX_Parse zero = $zero" if($zero != 0);
@ -89,20 +95,22 @@ CUL_MAX_Parse($$)
$src = lc($src); $src = lc($src);
$dst = lc($dst); $dst = lc($dst);
Log 5, "CUL_MAX_Parse: len $len, msgcnt $msgcnt, msgflag $msgFlLong, msgType $msgType, src $src, dst $dst, payload $payload"; Log 5, "CUL_MAX_Parse: len $len, msgcnt $msgcnt, msgflag $msgFlLong, msgTypeRaw $msgTypeRaw, src $src, dst $dst, payload $payload";
if($msgType eq "30") { if(exists($msgTypes{$msgTypeRaw})) {
Dispatch($shash, "MAX,ShutterContactState,$src,$payload", {RAWMSG => $rmsg}); my $msgType = $msgTypes{$msgTypeRaw};
} elsif($msgType eq "60") { if($msgType eq "Ack") {
Dispatch($shash, "MAX,HeatingThermostatState,$src,$payload", {RAWMSG => $rmsg}); Log 5, "Got Ack";
} elsif($msgType eq "02") { #Ack } else {
Log 5, "Got Ack"; Dispatch($shash, "MAX,$msgType,$src,$payload", {RAWMSG => $rmsg});
}
} else { } else {
Log 2, "Got unhandled message type $msgType"; Log 2, "Got unhandled message type $msgTypeRaw";
} }
return undef; return undef;
} }
sub CUL_MAX_SendDeviceCmd($$) sub
CUL_MAX_SendDeviceCmd($$)
{ {
my ($hash,$payload) = @_; my ($hash,$payload) = @_;