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

36_LaCrosse.pm: Removed battery2 reading and prevent warnings when receiving truncated data

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9678 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
hcs-svn
2015-10-25 21:44:41 +00:00
parent 8a61ad84f8
commit ddab27aceb
1 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
fhem/FHEM/36_LaCrosse.pm
View File

@@ -180,14 +180,14 @@ sub LaCrosse_Parse($$) {
if( $msg =~ m/^OK 9/ ) { if( $msg =~ m/^OK 9/ ) {
# Temperature sensor - Format: # Temperature sensor - Format:
# 0 1 3 3 4 # 0 1 2 3 4
# ---------------------- # -------------------------
# OK 9 56 1 4 156 37 ID = 56 T: 18.0 H: 37 no NewBatt # OK 9 56 1 4 156 37 ID = 56 T: 18.0 H: 37 no NewBatt
# OK 9 49 1 4 182 54 ID = 49 T: 20.6 H: 54 no NewBatt # OK 9 49 1 4 182 54 ID = 49 T: 20.6 H: 54 no NewBatt
# OK 9 55 129 4 192 56 ID = 55 T: 21.6 H: 56 WITH NewBatt # OK 9 55 129 4 192 56 ID = 55 T: 21.6 H: 56 WITH NewBatt
# OK 9 2 1 4 212 106 ID = 2 T: 23.6 H: -- Channel: 1 # OK 9 2 1 4 212 106 ID = 2 T: 23.6 H: -- Channel: 1
# OK 9 2 130 4 225 125 ID = 2 T: 24.9 H: -- Channel: 2 # OK 9 2 130 4 225 125 ID = 2 T: 24.9 H: -- Channel: 2
# OK 9 ID XXX XXX XXX XXX # OK 9 ID XXX XXX XXX XXX
# | | | | | | | # | | | | | | |
@@ -201,6 +201,8 @@ sub LaCrosse_Parse($$) {
@bytes = split( ' ', substr($msg, 5) ); @bytes = split( ' ', substr($msg, 5) );
return "" if(@bytes != 5);
$addr = sprintf( "%02X", $bytes[0] ); $addr = sprintf( "%02X", $bytes[0] );
$battery_new = ($bytes[1] & 0x80) >> 7; $battery_new = ($bytes[1] & 0x80) >> 7;
$battery_low = ($bytes[4] & 0x80) >> 7; $battery_low = ($bytes[4] & 0x80) >> 7;
@@ -244,6 +246,8 @@ sub LaCrosse_Parse($$) {
@bytes = split( ' ', substr($msg, 5) ); @bytes = split( ' ', substr($msg, 5) );
return "" if(@bytes < 14);
$addr = sprintf( "%02X", $bytes[0] ); $addr = sprintf( "%02X", $bytes[0] );
$typeNumber = $bytes[1]; $typeNumber = $bytes[1];
@@ -405,23 +409,23 @@ sub LaCrosse_Parse($$) {
if(!defined($rhash->{"previousT$channel"}) if(!defined($rhash->{"previousT$channel"})
|| (defined($rhash->{"previousT$channel"}) || (defined($rhash->{"previousT$channel"})
&& abs($rhash->{"previousH$channel"} - $humidity) <= AttrVal( $rname, "filterThreshold", 10 ) && abs($rhash->{"previousH$channel"} - $humidity) <= AttrVal( $rname, "filterThreshold", 10 )
&& abs($rhash->{"previousT$channel"} - $temperature) <= AttrVal( $rname, "filterThreshold", 10 ) )){ && abs($rhash->{"previousT$channel"} - $temperature) <= AttrVal( $rname, "filterThreshold", 10 ) )) {
# Calculate average # Calculate average
if( AttrVal( $rname, "doAverage", 0 ) && defined($rhash->{"previousT$channel"}) && $temperature != 0xFFFF ) { if (AttrVal( $rname, "doAverage", 0 ) && defined($rhash->{"previousT$channel"}) && $temperature != 0xFFFF) {
$temperature = ($rhash->{"previousT$channel"}*3+$temperature)/4; $temperature = ($rhash->{"previousT$channel"} * 3 + $temperature) / 4;
} }
if( AttrVal( $rname, "doAverage", 0 ) && defined($rhash->{"previousH$channel"}) && $humidity != 0xFF ) { if (AttrVal( $rname, "doAverage", 0 ) && defined($rhash->{"previousH$channel"}) && $humidity != 0xFF) {
$humidity = ($rhash->{"previousH$channel"}*3+$humidity)/4; $humidity = ($rhash->{"previousH$channel"} * 3 + $humidity) / 4;
} }
# Handle resolution # Handle resolution
if(my $resolution = AttrVal( $rname, "resolution", 0 )) { if (my $resolution = AttrVal( $rname, "resolution", 0 )) {
if ($temperature != 0xFFFF) { if ($temperature != 0xFFFF) {
$temperature = int($temperature*10 / $resolution + 0.5) * $resolution / 10; $temperature = int($temperature * 10 / $resolution + 0.5) * $resolution / 10;
} }
if ($humidity != 0xFF) { if ($humidity != 0xFF) {
$humidity = int($humidity*10 / $resolution + 0.5) * $resolution / 10; $humidity = int($humidity * 10 / $resolution + 0.5) * $resolution / 10;
} }
} }
@@ -431,7 +435,10 @@ sub LaCrosse_Parse($$) {
} }
# Battery state # Battery state
readingsBulkUpdate($rhash, "battery$channel", $battery_low?"low":"ok"); if (defined ($rhash->{READINGS}{battery2})) {
delete $rhash->{READINGS}{battery2}
}
readingsBulkUpdate($rhash, "battery", $battery_low? "low" : "ok");
# Calculate dewpoint # Calculate dewpoint
my $dewpoint; my $dewpoint;