From f3017ac5d0a286ebffa01f981cb0afa2687bce4d Mon Sep 17 00:00:00 2001 From: phenning <> Date: Mon, 2 May 2022 07:04:23 +0000 Subject: [PATCH] 36_Shelly.pm: Bugfix git-svn-id: https://svn.fhem.de/fhem/trunk@26017 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/36_Shelly.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/36_Shelly.pm b/fhem/FHEM/36_Shelly.pm index 1e8abe38e..e12db068a 100644 --- a/fhem/FHEM/36_Shelly.pm +++ b/fhem/FHEM/36_Shelly.pm @@ -39,7 +39,7 @@ use vars qw{%attr %defs}; sub Log($$); #-- globals on start -my $version = "4.0"; +my $version = "4.01"; #-- these we may get on request my %gets = ( @@ -1115,7 +1115,7 @@ sub Shelly_proc1G { } ############################################################################################################################# #-- 1st generation: we have a shelly1, shelly1pm, shellypro4, shelly2, shelly25, shellyplug or shellyem switch type device - if( ($model =~ /shelly1.*/) || ($model eq "shellyuni") || ($model eq "shellyplug") || ($model =~ /shelly(pro)?4/) || ($model =~ /shellyem.?/) || (($model =~ /shelly2.*/) && ($mode eq "relay")) ){ + if( ($model =~ /shelly1.*/) || ($model eq "shellyuni") || ($model eq "shellyplug") || ($model =~ /shelly(pro)?4/) || ($model =~ /shelly.?em/) || (($model =~ /shelly2.*/) && ($mode eq "relay")) ){ for( my $i=0;$i<$channels;$i++){ $subs = (($channels == 1) ? "" : "_".$i); $ison = $jhash->{'relays'}[$i]{'ison'}; @@ -1136,13 +1136,13 @@ sub Shelly_proc1G { readingsBulkUpdateIfChanged($hash,"voltage",$voltage); } - my $metern = ($model =~ /shellyem.?/)?"emeters":"meters"; + my $metern = ($model =~ /shelly.?em/)?"emeters":"meters"; for( my $i=0;$i<$meters;$i++){ $subs = ($meters == 1) ? "" : "_".$i; $power = $jhash->{$metern}[$i]{'power'}; $energy = int($jhash->{$metern}[$i]{'total'}/6)/10; readingsBulkUpdateIfChanged($hash,"power".$subs,$power); - if ($model =~ /shellyem.?/) { + if ($model =~ /shelly.?em/) { my $voltage = $jhash->{$metern}[$i]{'voltage'}; readingsBulkUpdateIfChanged($hash,'voltage'.$subs,$voltage); my $reactivePower = $jhash->{$metern}[$i]{'reactive'};