From a5fb12ab808a8565fcabb8e37d5f28972493ce3e Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Sat, 8 Apr 2017 11:42:26 +0000 Subject: [PATCH] 98_powerMap: improve number extraction git-svn-id: https://svn.fhem.de/fhem/trunk@13931 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_powerMap.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/98_powerMap.pm b/fhem/FHEM/98_powerMap.pm index f76cf9d03..19fedd273 100644 --- a/fhem/FHEM/98_powerMap.pm +++ b/fhem/FHEM/98_powerMap.pm @@ -816,6 +816,8 @@ sub powerMap_Notify($$) { # recalculate CHANGEDWITHSTATE # for target device in deviceEvents() $dev_hash->{CHANGEDWITHSTATE} = []; + + last; } } } @@ -1346,8 +1348,7 @@ sub powerMap_power($$$;$) { if ( $event =~ /^([A-Za-z\d_\.\-\/]+):\s+(.*)$/ ) { my ( $reading, $val ) = ( $1, $2 ); - my $num = $val; - $num =~ s/[^-\.\d]//g; + my $num = ( $val =~ /(-?\d+(\.\d+)?)/ ? $1 : $val ); my $valueAliases = { initialized => '0',