diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 9a382ab2a..c919a40f6 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -279,9 +279,9 @@ sub CUL_HM_updateConfig($){ && $hash->{helper}{fkt} =~ m/^(vdCtrl|virtThSens)$/){ my $vId = substr($id."01",0,8); $hash->{helper}{virtTC} = "00"; - $hash->{helper}{vd}{msgRed}= 0 if(!defined $hash->{helper}{vd}{msgRed}); - $hash->{helper}{vd}{next} = ReadingsVal($name,".next",gettimeofday()) - if (!defined $hash->{helper}{vd}{next}); + $hash->{helper}{vd}{msgRed}= 0 if(!defined $hash->{helper}{vd}{msgRed}); + $hash->{helper}{vd}{msgCnt}= ReadingsVal($name,".msgCnt",0) if(!defined $hash->{helper}{vd}{msgCnt}); + $hash->{helper}{vd}{next} = ReadingsVal($name,".next",gettimeofday())if(!defined $hash->{helper}{vd}{next}); CUL_HM_Set($hash,$name,"valvePos",ReadingsVal($name,"valvePosTC","")); CUL_HM_Set($hash,$name,"virtTemp",ReadingsVal($name,"temperature","")); @@ -3339,7 +3339,7 @@ sub CUL_HM_Set($@) { elsif($cmd eq "sysTime") { ################################################## $state = ""; my $s2000 = sprintf("%02X", CUL_HM_secSince2000()); - CUL_HM_PushCmdStack($hash,"++A03F$id${dst}0204$s2000"); + CUL_HM_PushCmdStack($hash,"++803F$id${dst}0204$s2000"); } elsif($cmd =~ m/^(valvePos|virtTemp|virtHum)$/) { ########################### my $valu = $a[2]; @@ -5749,6 +5749,7 @@ sub CUL_HM_procQs($){#process non-wakeup queues && ReadingsVal($ioName,"cond","") =~ m /^(ok|Overload-released|init)$/ && $q eq "qReqStat") ||( CUL_HM_autoReadReady($ioName) + && !$defs{$devN}{cmdStack} && $q eq "qReqConf")){ my $dq = $defs{$devN}{helper}{q}; my @chns = split(",",$dq->{$q}); diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index b1d1c0ca8..255e9dc3c 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -416,8 +416,8 @@ sub HMinfo_tempListTmpl(@) { ################################################## foreach my $eN(HMinfo_getEntities("d")){#search for devices and select correct channel my $md = AttrVal($eN,"model",""); my $chN; #tempList channel name - if ($md =~ m/(HM-CC-RT-DN-BoM|HM-CC-RT-DN)/) {$chN = $defs{$eN}{channel_04};} - elsif ($md =~ m/(ROTO_ZEL-STG-RM-FWT|HM-CC-TC)/){$chN = $defs{$eN}{channel_02};} + if ($md =~ m/(HM-CC-RT-DN-BoM|HM-CC-RT-DN)/){$chN = $defs{$eN}{channel_04};} + elsif ($md =~ m/(ROTO_ZEL-STG-RM-FWT|-TC)/) {$chN = $defs{$eN}{channel_02};} next if (!$chN || !$defs{$chN} || $chN !~ m/$filter/); push @el,$chN; } @@ -1107,11 +1107,11 @@ sub HMinfo_loadConfig($@) {#################################################### push @entryNF,$eN; next; } - if ($cmd1 eq "setreading"){ + if ($cmd1 eq "setreading"){ $defs{$eN}{READINGS}{$cmd}{VAL} = $param; $defs{$eN}{READINGS}{$cmd}{TIME} = "from archive"; } - elsif ($cmd eq "peerBulk"){ + elsif($cmd eq "peerBulk"){ next if(!$param); $param =~ s/ //g; if ($param !~ m/00000000/){