FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-08 05:15:10 +00:00
Code Issues Releases Wiki Activity

systime without ack, config only if queue is empty

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4952 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-02-16 14:20:33 +00:00
parent 759ef78def
commit 887f7a380b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/10_CUL_HM.pm
View File

@ -279,9 +279,9 @@ sub CUL_HM_updateConfig($){
&& $hash->{helper}{fkt} =~ m/^(vdCtrl|virtThSens)$/){ && $hash->{helper}{fkt} =~ m/^(vdCtrl|virtThSens)$/){
my $vId = substr($id."01",0,8); my $vId = substr($id."01",0,8);
$hash->{helper}{virtTC} = "00"; $hash->{helper}{virtTC} = "00";
$hash->{helper}{vd}{msgRed}= 0 if(!defined $hash->{helper}{vd}{msgRed}); $hash->{helper}{vd}{msgRed}= 0 if(!defined $hash->{helper}{vd}{msgRed});
$hash->{helper}{vd}{next} = ReadingsVal($name,".next",gettimeofday()) $hash->{helper}{vd}{msgCnt}= ReadingsVal($name,".msgCnt",0) if(!defined $hash->{helper}{vd}{msgCnt});
if (!defined $hash->{helper}{vd}{next}); $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,"valvePos",ReadingsVal($name,"valvePosTC",""));
CUL_HM_Set($hash,$name,"virtTemp",ReadingsVal($name,"temperature","")); CUL_HM_Set($hash,$name,"virtTemp",ReadingsVal($name,"temperature",""));
@ -3339,7 +3339,7 @@ sub CUL_HM_Set($@) {
elsif($cmd eq "sysTime") { ################################################## elsif($cmd eq "sysTime") { ##################################################
$state = ""; $state = "";
my $s2000 = sprintf("%02X", CUL_HM_secSince2000()); 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)$/) { ########################### elsif($cmd =~ m/^(valvePos|virtTemp|virtHum)$/) { ###########################
my $valu = $a[2]; my $valu = $a[2];
@ -5749,6 +5749,7 @@ sub CUL_HM_procQs($){#process non-wakeup queues
&& ReadingsVal($ioName,"cond","") =~ m /^(ok|Overload-released|init)$/ && ReadingsVal($ioName,"cond","") =~ m /^(ok|Overload-released|init)$/
&& $q eq "qReqStat") && $q eq "qReqStat")
||( CUL_HM_autoReadReady($ioName) ||( CUL_HM_autoReadReady($ioName)
&& !$defs{$devN}{cmdStack}
&& $q eq "qReqConf")){ && $q eq "qReqConf")){
my $dq = $defs{$devN}{helper}{q}; my $dq = $defs{$devN}{helper}{q};
my @chns = split(",",$dq->{$q}); my @chns = split(",",$dq->{$q});

8
fhem/FHEM/98_HMinfo.pm
View File

@ -416,8 +416,8 @@ sub HMinfo_tempListTmpl(@) { ##################################################
foreach my $eN(HMinfo_getEntities("d")){#search for devices and select correct channel foreach my $eN(HMinfo_getEntities("d")){#search for devices and select correct channel
my $md = AttrVal($eN,"model",""); my $md = AttrVal($eN,"model","");
my $chN; #tempList channel name my $chN; #tempList channel name
if ($md =~ m/(HM-CC-RT-DN-BoM|HM-CC-RT-DN)/) {$chN = $defs{$eN}{channel_04};} 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};} elsif ($md =~ m/(ROTO_ZEL-STG-RM-FWT|-TC)/) {$chN = $defs{$eN}{channel_02};}
next if (!$chN || !$defs{$chN} || $chN !~ m/$filter/); next if (!$chN || !$defs{$chN} || $chN !~ m/$filter/);
push @el,$chN; push @el,$chN;
} }
@ -1107,11 +1107,11 @@ sub HMinfo_loadConfig($@) {####################################################
push @entryNF,$eN; push @entryNF,$eN;
next; next;
} }
if ($cmd1 eq "setreading"){ if ($cmd1 eq "setreading"){
$defs{$eN}{READINGS}{$cmd}{VAL} = $param; $defs{$eN}{READINGS}{$cmd}{VAL} = $param;
$defs{$eN}{READINGS}{$cmd}{TIME} = "from archive"; $defs{$eN}{READINGS}{$cmd}{TIME} = "from archive";
} }
elsif ($cmd eq "peerBulk"){ elsif($cmd eq "peerBulk"){
next if(!$param); next if(!$param);
$param =~ s/ //g; $param =~ s/ //g;
if ($param !~ m/00000000/){ if ($param !~ m/00000000/){