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

collectord: Fix rssi addon data (thx to Micky, Forum: #54482)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14439 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2017-05-31 17:11:22 +00:00
parent 9de47c9e5d
commit 04f92b69b0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/contrib/PRESENCE/collectord
View File

@ -862,7 +862,7 @@ sub aggregateRooms
my ($hash) = @_; my ($hash) = @_;
my $previous = "absence"; my $previous = "absence";
my %rssi_results = ();
my @rooms; my @rooms;
my $key; my $key;
@ -914,13 +914,15 @@ sub aggregateRooms
elsif(@{$a} == 0 and keys(%{$h}) > 0) # new addon data style elsif(@{$a} == 0 and keys(%{$h}) > 0) # new addon data style
{ {
# check rssi # check rssi
if($rssi_available and exists($h->{$rssi_addon_data_key}) and $h->{$rssi_addon_data_key} =~ /^-?(?:\d+\.)\d+$/) if(exists($h->{$rssi_addon_data_key}) and $h->{$rssi_addon_data_key} =~ /^-?(?:\d+\.)?\d+$/)
{ {
if(!defined($highest_value) or (defined($highest_value) and $h->{$rssi_addon_data_key} > $highest_value)) if(!defined($highest_value) or (defined($highest_value) and $h->{$rssi_addon_data_key} > $highest_value))
{ {
$highest_value = $h->{rssi}; $highest_value = $h->{$rssi_addon_data_key};
$highest_key = $key; $highest_key = $key;
} }
$rssi_results{$key} = $h->{$rssi_addon_data_key};
} }
else else
{ {
@ -943,7 +945,10 @@ sub aggregateRooms
if(@rooms > 0) if(@rooms > 0)
{ {
return "present;rooms='".join(",",sort @rooms).(defined($hash->{$rooms[0]}{data}) ? "';".$hash->{$rooms[0]}{data} : ""); my $rssi_data = join(";", map { "rssi_".$_."='".$rssi_results{$_}."'" } map { s/\s+/_/g } grep {$rssi_results{$_}} keys %rssi_results);
return "present;room='".join(",",sort @rooms).
(defined($hash->{$rooms[0]}{data}) ? "';".$hash->{$rooms[0]}{data} : "").
(defined($rssi_data) ? ";".$rssi_data : "");
} }
else else
{ {