FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 05:16:45 +00:00
Code Issues Releases Wiki Activity

MAX: fix bit error, add reading MAXLAN_errorInCommand

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4230 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre 2013-11-15 20:02:24 +00:00
parent f87e491acf
commit a38448a4e6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/00_MAXLAN.pm
View File

@ -627,15 +627,17 @@ MAXLAN_Parse($$)
$bindata = decode_base64($args[0]) if(@args > 0); $bindata = decode_base64($args[0]) if(@args > 0);
#The L command consists of blocks of states (one for each device) #The L command consists of blocks of states (one for each device)
while(length($bindata)){ while(length($bindata)){
my ($len,$addr,$errframetype,$bits1) = unpack("CH6Ca",$bindata); my ($len,$addr,$errCmd,$bits1) = unpack("CH6H2a",$bindata);
$errCmd = uc($errCmd);
my $unkbit1 = vec($bits1,0,1); my $unkbit1 = vec($bits1,0,1);
my $initialized = vec($bits1,1,1); #I never saw this beeing 0 my $initialized = vec($bits1,1,1); #I never saw this beeing 0
my $answer = vec($bits1,2,1); #answer to what? my $answer = vec($bits1,2,1); #answer to what?
my $error = vec($bits1,3,1); # if 1 then see errframetype my $error = vec($bits1,3,1); # if 1 then see errframetype
my $valid = vec($bits1,4,1); #is the status following the common header valid my $valid = vec($bits1,4,1); #is the status following the common header valid
my $unkbit2 = vec($bits1,5,3); my $unkbit2 = vec($bits1,5,2);
my $unkbit3 = vec($bits1,7,1);
Log 5, "len $len, addr $addr, initialized $initialized, valid $valid, error $error, errframetype $errframetype, answer $answer, unkbit ($unkbit1,$unkbit2)"; Log 5, "len $len, addr $addr, initialized $initialized, valid $valid, error $error, errCmd $errCmd, answer $answer, unkbit ($unkbit1,$unkbit2,$unkbit3)";
my $payload = unpack("H*",substr($bindata,6,$len-6+1)); #+1 because the len field is not counted my $payload = unpack("H*",substr($bindata,6,$len-6+1)); #+1 because the len field is not counted
if($valid) { if($valid) {
@ -654,8 +656,6 @@ MAXLAN_Parse($$)
}else{ }else{
Log 2, "MAXLAN_Parse: Got status for unimplemented device type $shash->{type}"; Log 2, "MAXLAN_Parse: Got status for unimplemented device type $shash->{type}";
} }
} else {
Dispatch($hash, "MAX,1,Error,$addr,Error $errframetype in Msg type L", {});
} }
my $dhash = $modules{MAX}{defptr}{$addr}; my $dhash = $modules{MAX}{defptr}{$addr};
@ -663,7 +663,7 @@ MAXLAN_Parse($$)
readingsBeginUpdate($dhash); readingsBeginUpdate($dhash);
readingsBulkUpdate($dhash, "MAXLAN_initialized", $initialized); readingsBulkUpdate($dhash, "MAXLAN_initialized", $initialized);
readingsBulkUpdate($dhash, "MAXLAN_error", $error); readingsBulkUpdate($dhash, "MAXLAN_error", $error);
readingsBulkUpdate($dhash, "MAXLAN_errorType", $errframetype); readingsBulkUpdate($dhash, "MAXLAN_errorInCommand", $error ? (exists($msgId2Cmd{$errCmd}) ? $msgId2Cmd{$errCmd} : $errCmd) : "");
readingsBulkUpdate($dhash, "MAXLAN_valid", $valid); readingsBulkUpdate($dhash, "MAXLAN_valid", $valid);
readingsBulkUpdate($dhash, "MAXLAN_isAnswer", $answer); readingsBulkUpdate($dhash, "MAXLAN_isAnswer", $answer);
readingsEndUpdate($dhash, 1); readingsEndUpdate($dhash, 1);