From 9c977444b53117b989339c9a1a085a85846d4a03 Mon Sep 17 00:00:00 2001 From: loredo Date: Sun, 5 Feb 2017 14:17:41 +0000 Subject: [PATCH] 98_powerMap: fix sorting order git-svn-id: https://svn.fhem.de/fhem/trunk@13336 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_powerMap.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/98_powerMap.pm b/fhem/FHEM/98_powerMap.pm index c798b65d5..cf4dfb0bf 100644 --- a/fhem/FHEM/98_powerMap.pm +++ b/fhem/FHEM/98_powerMap.pm @@ -134,7 +134,7 @@ my %powerMap_tmpl = ( HMCCUDEV => { ccutype => { 'HM-LC-Dim1TPBU-FM' => { - stateHM => { + hmstate => { unreachable => 0, working => 101, up => 101, @@ -144,7 +144,7 @@ my %powerMap_tmpl = ( }, }, 'HM-LC-Dim1T-FM' => { - stateHM => { + hmstate => { unreachable => 0, working => 23.5, up => 23.5, @@ -154,14 +154,14 @@ my %powerMap_tmpl = ( }, }, 'HM-LC-Sw2-PB-FM' => { - stateHM => { + hmstate => { unreachable => 0, off => 0.25, on => 100.25, }, }, 'HM-LC-Bl1PBU-FM' => { - stateHM => { + hmstate => { unreachable => 0, working => 121, up => 121, @@ -170,7 +170,7 @@ my %powerMap_tmpl = ( }, }, 'HM-LC-Bl1-SM' => { - stateHM => { + hmstate => { unreachable => 0, working => 121, up => 121, @@ -1398,7 +1398,11 @@ sub powerMap_power($$$;$) { elsif ( looks_like_number($num) ) { my ( $val1, $val2 ); - foreach ( sort keys %{ $powerMap->{$reading} } ) { + foreach ( + sort { $powerMap->{$reading}{$a} <=> $powerMap->{$reading}{$b} } + keys( %{ $powerMap->{$reading} } ) + ) + { next unless ( looks_like_number($_) ); $val1 = $_ if ( $_ < $num ); $val2 = $_ if ( $_ > $num );