diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm index 171f51567..22e02f01b 100644 --- a/fhem/FHEM/33_readingsGroup.pm +++ b/fhem/FHEM/33_readingsGroup.pm @@ -387,7 +387,7 @@ readingsGroup_2html($) $txt = "$txt" if( $show_links ); $ret .= "
$txt
" if( $first || $multi == 1 ); - $ret .= "$devStateIcon" if( $devStateIcon ); + $ret .= "$devStateIcon" if( $devStateIcon ); $ret .= "
$v
" if( !$devStateIcon ); $ret .= "
$t
" if( $show_time && $t ); @@ -503,6 +503,19 @@ readingsGroup_Notify($$) next if( $regex && $regex =~ m/^\?/ ); next if( defined($regex) && $reading !~ m/^$regex$/); + my $value = $value; + if( $value_format ) { + my $value_format = lookup2($value_format,$dev->{NAME},$reading,$value); + + if( !defined($value_format) ) { + $value = ""; + } elsif( $value_format =~ m/%/ ) { + $value = sprintf( $value_format, $value ); + } elsif( $value_format ) { + $value = $value_format; + } + } + my $devStateIcon; if( $valueIcon ) { my $n = $h->{NAME}; @@ -519,23 +532,10 @@ readingsGroup_Notify($$) } } - CommandTrigger( "", "$name $n.$reading.icon: $devStateIcon" ) if( $devStateIcon ); + CommandTrigger( "", "$name $n.$reading: $devStateIcon" ) if( $devStateIcon ); next if( $devStateIcon ); } - my $value = $value; - if( $value_format ) { - my $value_format = lookup2($value_format,$dev->{NAME},$reading,$value); - - if( !defined($value_format) ) { - $value = ""; - } elsif( $value_format =~ m/%/ ) { - $value = sprintf( $value_format, $value ); - } elsif( $value_format ) { - $value = $value_format; - } - } - CommandTrigger( "", "$name $dev->{NAME}.$reading: $value" ); } }