Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for missing nibble subs

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1543 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
wherzig 2012-05-07 20:32:19 +00:00
parent 40eb2111ed
commit 8a358616e6
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
FHEM/42_RFXMETER.pm
View File

@ -69,6 +69,24 @@ RFXMETER_Define($$)
return undef; return undef;
} }
#########################################
# From xpl-perl/lib/xPL/Util.pm:
sub RFXMETER_hi_nibble {
($_[0]&0xf0)>>4;
}
sub RFXMETER_lo_nibble {
$_[0]&0xf;
}
sub RFXMETER_nibble_sum {
my $c = $_[0];
my $s = 0;
foreach (0..$_[0]-1) {
$s += RFXMETER_hi_nibble($_[1]->[$_]);
$s += RFXMETER_lo_nibble($_[1]->[$_]);
}
$s += RFXMETER_hi_nibble($_[1]->[$_[0]]) if (int($_[0]) != $_[0]);
return $s;
}
##################################### #####################################
sub sub
RFXMETER_Undef($$) RFXMETER_Undef($$)
@ -95,13 +113,13 @@ sub parse_RFXmeter {
my $device = sprintf "%02x", $bytes->[0]; my $device = sprintf "%02x", $bytes->[0];
Log 4, "RFXMETER: device=$device"; Log 4, "RFXMETER: device=$device";
my $type = hi_nibble($bytes->[5]); my $type = RFXMETER_hi_nibble($bytes->[5]);
#Log 1, "RFXMETER: type=$type"; #Log 1, "RFXMETER: type=$type";
my $check = lo_nibble($bytes->[5]); my $check = RFXMETER_lo_nibble($bytes->[5]);
#Log 1, "RFXMETER: check=$check"; #Log 1, "RFXMETER: check=$check";
my $nibble_sum = nibble_sum(5.5, $bytes); my $nibble_sum = RFXMETER_nibble_sum(5.5, $bytes);
my $parity = 0xf^($nibble_sum&0xf); my $parity = 0xf^($nibble_sum&0xf);
unless ($parity == $check) { unless ($parity == $check) {
#warn "RFXMeter parity error $parity != $check\n"; #warn "RFXMeter parity error $parity != $check\n";