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

FBAHA: adapt for new clientId (by me@fhem, Forum #25398)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6766 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2014-10-14 18:37:52 +00:00
parent 7c1e84f56b
commit f6b1008bf3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/00_FBAHA.pm
View File

@@ -174,9 +174,11 @@ sub
FBAHA_configInd($$)
{
my ($data, $onlyId) = @_;
#my $off = 288; #for old Client Id
my $off = 304;
my @answer;
while(length($data) >= 288) {
while(length($data) >= $off) {
my $id = hex(substr($data, 0, 4));
my $act = hex(substr($data, 4, 2));
my $typ = hex(substr($data, 8, 8));
@@ -191,7 +193,7 @@ FBAHA_configInd($$)
my %ll = (7=>"powerMeter",9=>"switch");
$lsn = join ",", map { $ll{$_} if((1 << $_) & $lsn) } sort keys %ll;
my $dlen = hex(substr($data, 280, 8))*2; # DATA MSG
my $dlen = hex(substr($data, $off-8, 8))*2; # DATA MSG
push @answer, "NAME:$nam, ID:$id, $act, TYPE:$typ PROP:$lsn"
if(!$onlyId || $onlyId == $id);
@@ -203,10 +205,10 @@ FBAHA_configInd($$)
push @answer, " MANUF:$mnf";
push @answer, " UniqueID:$idf";
push @answer, " Firmware:$frm";
push @answer, substr($data, 288+$dlen);
push @answer, substr($data, $off, $dlen);
return @answer;
}
$data = substr($data, 288+$dlen); # rest
$data = substr($data, $off+$dlen); # rest
}
return @answer;
}